changeset
fix broken layout - issue #620
Fri, 14 Mar 2025 08:09:00 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Fri, 14 Mar 2025 08:09:00 +0100
- changeset 365
- 0e03dcb631ee
- parent 364
- cf2e751fe6d9
- child 366
- b351e70ab325
fix broken layout - issue #620
--- a/build.gradle.kts Tue Mar 11 17:03:01 2025 +0100 +++ b/build.gradle.kts Fri Mar 14 08:09:00 2025 +0100 @@ -5,7 +5,7 @@ war } group = "de.uapcore" -version = "1.5.0" +version = "1.5.1" repositories { mavenCentral()
--- a/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf Tue Mar 11 17:03:01 2025 +0100 +++ b/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf Fri Mar 14 08:09:00 2025 +0100 @@ -24,6 +24,12 @@ --%> <%@ page contentType="text/html;charset=UTF-8" %> +<h3>Version 1.5.1</h3> + +<ul> + <li>Layout-Probleme, die mit Version 1.5.0 hinzugefügt wurden, behoben.</li> +</ul> + <h3>Version 1.5.0</h3> <ul>
--- a/src/main/webapp/WEB-INF/changelogs/changelog.jspf Tue Mar 11 17:03:01 2025 +0100 +++ b/src/main/webapp/WEB-INF/changelogs/changelog.jspf Fri Mar 14 08:09:00 2025 +0100 @@ -24,6 +24,12 @@ --%> <%@ page contentType="text/html;charset=UTF-8" %> +<h3>Version 1.5.1</h3> + +<ul> + <li>Fix layout problems introduced with version 1.5.0.</li> +</ul> + <h3>Version 1.5.0</h3> <ul>
--- a/src/main/webapp/WEB-INF/jsp/settings.jsp Tue Mar 11 17:03:01 2025 +0100 +++ b/src/main/webapp/WEB-INF/jsp/settings.jsp Fri Mar 14 08:09:00 2025 +0100 @@ -32,7 +32,7 @@ <form method="POST" id="settings-form"> <h2><fmt:message key="settings.language"/></h2> - <div class="flex-column"> + <div id="language-choice"> <c:forEach items="${viewmodel.languages}" var="l"> <label> <input type="radio" name="language" value="${l.language}"
--- a/src/main/webapp/WEB-INF/jsp/site.jsp Tue Mar 11 17:03:01 2025 +0100 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Fri Mar 14 08:09:00 2025 +0100 @@ -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="20250311"/> +<c:set scope="page" var="versionSuffix" value="20250313"/> <%-- Make the base href easily available at request scope --%> <c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}"/> @@ -94,7 +94,7 @@ </c:if> </head> <body> - <div id="body-area"> + <div id="page-area"> <div id="mainMenu"> <div class="menuEntry" <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> > @@ -132,16 +132,15 @@ <datalist id="search-box-list"></datalist> </div> </div> - <c:if test="${not empty navMenu}"> - <div id="sideMenu"> - <%@include file="../jspf/navmenu.jspf" %> - </div> - </c:if> - <c:if test="${empty navMenu}"> - <div id="sideMenuFiller"></div> - </c:if> - <div id="content-area"> - <c:import url="${contentPage}"/> + <div id="body-area"> + <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> </body>
--- a/src/main/webapp/lightpit.css Tue Mar 11 17:03:01 2025 +0100 +++ b/src/main/webapp/lightpit.css Fri Mar 14 08:09:00 2025 +0100 @@ -70,17 +70,19 @@ text-decoration: none; } -#body-area { - display: grid; - grid-template-columns: min-content auto; - grid-template-rows: max-content 1fr; +#page-area { + display: flex; + flex-flow: column nowrap; height: 100%; } +#body-area { + flex-grow: 1; + display: flex; + flex-flow: row nowrap; +} + #mainMenu { - grid-row: 1; - grid-column: 1 / span 2; - width: 100%; display: flex; flex-flow: row nowrap; border-image-source: linear-gradient(to right, #606060, rgba(60, 60, 60, .25)); @@ -91,8 +93,6 @@ } #sideMenu { - grid-row: 2; - grid-column: 1; min-width: 15vw; display: flex; flex-flow: column; @@ -104,11 +104,6 @@ background: #f7f7ff; } -#sideMenuFiller { - grid-row: 2; - grid-column: 1; -} - #mainMenu .menuEntry { font-size: 1.2rem; padding: .25em 1em .25em 1em; @@ -157,8 +152,7 @@ } #content-area { - grid-row: 2; - grid-column: 2; + flex-grow: 1; padding: 1.5em; }
--- a/src/main/webapp/settings.css Tue Mar 11 17:03:01 2025 +0100 +++ b/src/main/webapp/settings.css Fri Mar 14 08:09:00 2025 +0100 @@ -27,18 +27,18 @@ * */ -.flex-column { +#language-choice { display: flex; flex-basis: content; flex-direction: column; align-items: flex-start; } -input { +#language-choice input { margin: .5em; } -button { +#settings-form button { margin-top: 1.5em; }
