changeset
#104 changes base layout from fixed to grid
Mon, 09 Aug 2021 16:57:56 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Mon, 09 Aug 2021 16:57:56 +0200
- changeset 217
- a5ad7cd5d000
- parent 216
- 6357d2fd84f2
- child 218
- 0e4a9b6f7a12
#104 changes base layout from fixed to grid
--- a/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf Mon Aug 09 16:28:42 2021 +0200 +++ b/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf Mon Aug 09 16:57:56 2021 +0200 @@ -32,6 +32,7 @@ <li>Im Vorgangseditor kann nun direkt ein Kommentar hinterlassen werden.</li> <li>Verbesserte Vorgangsansicht.</li> <li>Sortierreihenfolge der Versionen in der Übersicht an die Sortierreihenfolge im Seitenmenü angeglichen.</li> + <li>Das Seitenmenü benutzt nur noch so viel Platz, wie es braucht.</li> <li>Duplikate in Komponenten- und Versionslisten behoben.</li> <li>Fehler beim Laden der Versionsinformationen für bestehende Vorgänge behoben.</li> <li>Fehler behoben, bei dem vorbereitete Datenbankabfragen nicht geschlossen wurden.</li>
--- a/src/main/webapp/WEB-INF/changelogs/changelog.jspf Mon Aug 09 16:28:42 2021 +0200 +++ b/src/main/webapp/WEB-INF/changelogs/changelog.jspf Mon Aug 09 16:57:56 2021 +0200 @@ -32,6 +32,7 @@ <li>Adds possibility to leave a comment when editing an issue.</li> <li>Improves Issue View.</li> <li>Changes sort order of versions in the versions overview to be the same as in the left menu.</li> + <li>Removes unused width from the left menu.</li> <li>Fixes duplicates in the components and versions lists.</li> <li>Fixes issue form not loaded with the correct version info.</li> <li>Fixes leaking prepared statements.</li>
--- a/src/main/webapp/WEB-INF/jsp/site.jsp Mon Aug 09 16:28:42 2021 +0200 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Mon Aug 09 16:57:56 2021 +0200 @@ -31,7 +31,7 @@ <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%-- Version suffix for forcing browsers to update the CSS / JS files --%> -<c:set scope="page" var="versionSuffix" value="20210809"/> +<c:set scope="page" var="versionSuffix" value="20210809b"/> <%-- Make the base href easily available at request scope --%> <c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}"/> @@ -90,41 +90,41 @@ </c:if> </head> <body> -<div id="mainMenu"> - <div class="menuEntry" - <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> > - <a href="projects/"> - <fmt:message key="menu.projects"/> - </a> - </div> - <div class="menuEntry" - <c:if test="${fn:startsWith(requestPath, '/users/')}">data-active</c:if> > - <a href="users/"> - <fmt:message key="menu.users"/> - </a> + <div id="body-area"> + <div id="mainMenu"> + <div class="menuEntry" + <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> > + <a href="projects/"> + <fmt:message key="menu.projects"/> + </a> + </div> + <div class="menuEntry" + <c:if test="${fn:startsWith(requestPath, '/users/')}">data-active</c:if> > + <a href="users/"> + <fmt:message key="menu.users"/> + </a> + </div> + <div class="menuEntry" + <c:if test="${fn:startsWith(requestPath, '/language/')}">data-active</c:if> > + <a href="language/"> + <fmt:message key="menu.languages"/> + </a> + </div> + <div class="menuEntry" + <c:if test="${fn:startsWith(requestPath, '/about/')}">data-active</c:if> > + <a href="about/"> + <fmt:message key="menu.about"/> + </a> + </div> + </div> + <c:if test="${not empty navMenu}"> + <div id="sideMenu"> + <%@include file="../jspf/navmenu.jspf" %> + </div> + </c:if> + <div id="content-area"> + <c:import url="${contentPage}"/> + </div> </div> - <div class="menuEntry" - <c:if test="${fn:startsWith(requestPath, '/language/')}">data-active</c:if> > - <a href="language/"> - <fmt:message key="menu.languages"/> - </a> - </div> - <div class="menuEntry" - <c:if test="${fn:startsWith(requestPath, '/about/')}">data-active</c:if> > - <a href="about/"> - <fmt:message key="menu.about"/> - </a> - </div> -</div> -<div> - <c:if test="${not empty navMenu}"> - <div id="sideMenu"> - <%@include file="../jspf/navmenu.jspf" %> - </div> - </c:if> - <div id="content-area" <c:if test="${not empty navMenu}">class="sidebar-spacing"</c:if>> - <c:import url="${contentPage}"/> - </div> -</div> </body> </html>
--- a/src/main/webapp/lightpit.css Mon Aug 09 16:28:42 2021 +0200 +++ b/src/main/webapp/lightpit.css Mon Aug 09 16:57:56 2021 +0200 @@ -64,6 +64,7 @@ color: #1c204e; margin: 0; padding: 0; + height: 100vh; } body { @@ -83,9 +84,16 @@ text-decoration: none; } +#body-area { + display: grid; + grid-template-columns: max-content auto; + grid-template-rows: max-content 1fr; + height: 100%; +} + #mainMenu { - position: fixed; - z-index: 2; + grid-row: 1; + grid-column: 1 / span 2; width: 100%; display: flex; flex-flow: row wrap; @@ -93,35 +101,21 @@ border-image-slice: 1; border-bottom-style: solid; border-bottom-width: thin; + font-size: 1.2rem; + background: #e0e0e5; } #sideMenu { + grid-row: 2; + grid-column: 1; display: flex; - z-index: 1; flex-flow: column; - position: fixed; - height: 100%; - width: 40ch; /* adjust with sidebar-spacing.margin-left */ - padding-top: 2.25rem; color: #3060f8; border-image-source: linear-gradient(to bottom, #606060, rgba(60, 60, 60, .25)); border-image-slice: 1; border-right-style: solid; border-right-width: thin; -} - -#content-area.sidebar-spacing { - margin-left: 40ch; /* adjust with sideMenu.width */ -} - -#mainMenu { - font-size: 1.2rem; - background: #e0e0e5; -} - -#sideMenu { background: #f7f7ff; - overflow-x: scroll; } #mainMenu .menuEntry { @@ -132,6 +126,7 @@ } #sideMenu .menuEntry { + padding-right: 1em; padding-top: .25em; padding-bottom: .25em; border-bottom-style: solid; @@ -160,7 +155,9 @@ } #content-area { - padding: 2.75rem 1em 1em; + grid-row: 2; + grid-column: 2; + padding: 1.5em; } button, a.button {
