From da3a0336ed5634a7b8a24fee83d1b3665222db8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20K=C3=A4stle?= <sven.kaestle@gmx.de>
Date: Sat, 30 Jun 2018 15:44:34 +0200
Subject: [PATCH] feat: Limit Page size to viewport height and add scrollbar to
list
---
.../webapp/assets/css/annotationStyle.css | 19 +++++++-
.../webapp/pages/annotation_document.html | 48 ++++++++++---------
2 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css b/gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css
index 11deadfe..dc6ea121 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css
@@ -1,18 +1,24 @@
+body, html {
+ height: 100vh;
+ width: 100vw;
+}
ol {
padding: 0px;
margin: 0px;
list-style-type: none;
}
-.mainpage {
+.content-mainpage {
display: flex;
box-sizing: border-box;
font-family: Arial;
height: 100%;
+ overflow-y: hidden;
}
.rightcolumn {
float: right;
width: 25%;
display: inline-block;
+ overflow: scroll;
/* background-color: blue; */
}
.leftcolumn {
@@ -121,4 +127,15 @@ ol {
.annotation-footer-date {
flex: 1
}
+.container-fluid-content {
+ display: flex;
+ flex-flow: column;
+ height: 100%;
+}
+.content-header {
+ display: flex;
+}
+.full-height {
+ height: 100%;
+}
diff --git a/gemeinsamforschen/src/main/webapp/pages/annotation_document.html b/gemeinsamforschen/src/main/webapp/pages/annotation_document.html
index cebdda99..d9c45b67 100644
--- a/gemeinsamforschen/src/main/webapp/pages/annotation_document.html
+++ b/gemeinsamforschen/src/main/webapp/pages/annotation_document.html
@@ -33,7 +33,7 @@
</head>
<body>
- <div id="wrapper">
+ <div id="wrapper" class="full-height">
<div id="sidebar-wrapper">
<ul class="sidebar-nav">
<li class="sidebar-brand"><a href="#">overview</a></li>
@@ -44,30 +44,34 @@
<li><a href="#">Logout</a></li>
</ul>
</div>
- <div class="page-content-wrapper">
- <div class="container-fluid">
- <h1>gemeinsam Forschen
- <a href="#">
+ <div class="page-content-wrapper full-height">
+ <div class="container-fluid full-height">
+ <div class="container-fluid-content">
+ <div class="content-header">
+ <h1>gemeinsam Forschen
+ <a href="#">
<span class="glyphicon glyphicon-envelope"
style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
- </a>
- <a href="#">
- <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
- </a>
- </h1>
- </div>
- <div class="mainpage">
- <div class="leftcolumn">
- <div class="leftcontent ">
- <div class="text context-menu-one" id="documentText">
- Style never met and those among great. At no or september sportsmen he perfectly happiness attending. Depending listening delivered off new she procuring satisfied sex existence. Person plenty answer to exeter it if. Law use assistance especially resolution cultivated did out sentiments unsatiable. Way necessary had intention happiness but september delighted his curiosity. Furniture furnished or on strangers neglected remainder engrossed. Shot what able cold new the see hold. Friendly as an betrayed formerly he. Morning because as to society behaved moments. Put ladies design mrs sister was. Play on hill felt john no gate. Am passed figure to marked in. Prosperous middletons is ye inhabiting as assistance me especially. For looking two cousins regular amongst.
- </div>
+ </a>
+ <a href="#">
+ <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
+ </a>
+ </h1>
</div>
- </div>
- <div class="rightcolumn">
- <div class="rightcontent">
- <ol id="annotations">
- </ol>
+ <div class="content-mainpage">
+ <div class="leftcolumn">
+ <div class="leftcontent ">
+ <div class="text context-menu-one" id="documentText">
+ Style never met and those among great. At no or september sportsmen he perfectly happiness attending. Depending listening delivered off new she procuring satisfied sex existence. Person plenty answer to exeter it if. Law use assistance especially resolution cultivated did out sentiments unsatiable. Way necessary had intention happiness but september delighted his curiosity. Furniture furnished or on strangers neglected remainder engrossed. Shot what able cold new the see hold. Friendly as an betrayed formerly he. Morning because as to society behaved moments. Put ladies design mrs sister was. Play on hill felt john no gate. Am passed figure to marked in. Prosperous middletons is ye inhabiting as assistance me especially. For looking two cousins regular amongst.
+ </div>
+ </div>
+ </div>
+ <div class="rightcolumn">
+ <div class="rightcontent">
+ <ol id="annotations">
+ </ol>
+ </div>
+ </div>
</div>
</div>
</div>
--
GitLab