cf"> + " onload="prettyPrint()"> +

juplo

Java bits from nerds for nerds diff --git a/src/main/webapp/WEB-INF/views/impressum.jsp b/src/main/webapp/WEB-INF/views/impressum.jsp index 23a6b599..47f43be2 100644 --- a/src/main/webapp/WEB-INF/views/impressum.jsp +++ b/src/main/webapp/WEB-INF/views/impressum.jsp @@ -4,7 +4,7 @@ <%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %> <%@taglib uri="http://www.springframework.org/tags" prefix="s"%> - +

Home

diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 9b8f5313..63afd669 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -2,7 +2,7 @@ <%@page pageEncoding="UTF-8"%> <%@page session="false" %> <%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %> - +

Home

diff --git "a/src/main/webapp/WEB-INF/views/test/fast-leer-kein-men\303\274-aber-marginalinhalt.jsp" "b/src/main/webapp/WEB-INF/views/test/fast-leer-kein-men\303\274-aber-marginalinhalt.jsp" index 1ec6f7b0..c3605f5c 100644 --- "a/src/main/webapp/WEB-INF/views/test/fast-leer-kein-men\303\274-aber-marginalinhalt.jsp" +++ "b/src/main/webapp/WEB-INF/views/test/fast-leer-kein-men\303\274-aber-marginalinhalt.jsp" @@ -6,7 +6,7 @@ - +

Navigation

diff --git "a/src/main/webapp/WEB-INF/views/test/fast-leer-kein-men\303\274.jsp" "b/src/main/webapp/WEB-INF/views/test/fast-leer-kein-men\303\274.jsp" index eff79b05..dcfc3857 100644 --- "a/src/main/webapp/WEB-INF/views/test/fast-leer-kein-men\303\274.jsp" +++ "b/src/main/webapp/WEB-INF/views/test/fast-leer-kein-men\303\274.jsp" @@ -6,7 +6,7 @@ - +

Navigation

diff --git a/src/main/webapp/less/phone/layout.less b/src/main/webapp/less/phone/layout.less index 026583e7..4cfe1042 100644 --- a/src/main/webapp/less/phone/layout.less +++ b/src/main/webapp/less/phone/layout.less @@ -12,7 +12,7 @@ { margin: 0 1em 0 2.5em; } -.cols_2 > .content > .main +.menu .content > .main { border-top-style: none; margin-top: -.4375em; /** -8px + 1px (fÃ¼r den entfernten Rahmen) -- nur damit es exakt so positioniert ist, wie im Tablet-Layout */ diff --git a/src/main/webapp/less/screen/footer.less b/src/main/webapp/less/screen/footer.less index 02f72ad0..97b8b69c 100644 --- a/src/main/webapp/less/screen/footer.less +++ b/src/main/webapp/less/screen/footer.less @@ -2,7 +2,7 @@ { padding: 2em 0; } -.cols_1 > #footer +.nomenu #footer { padding-top: 0; } diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less index bf77320f..a4fd785e 100644 --- a/src/main/webapp/less/screen/layout.less +++ b/src/main/webapp/less/screen/layout.less @@ -14,23 +14,23 @@ body height: 100%; padding-bottom: 7.1875em; /** 115px (gemessene GesamthÃ¶he des Footers - mit Abstand und Margin) */ } -.cols_2 > .content +.menu .content { padding-right: 27em; margin-right: -24.375em; } -.cols_2 > .content > .main +.menu .content > .main { float: left; min-height: 1em; position: relative; width: 100%; } -.cols_1 > .content > .main +.nomenu .content > .main { margin-bottom: 7em; } -.cols_1 > .content > .marginal aside.m +.nomenu .content > .marginal aside.m { margin: 3.5em 0 -999em 0; padding: 2em 2em 995em 2em; @@ -38,7 +38,7 @@ body position: relative; top: -4.5em; } -.cols_2 > .content > .marginal +.menu .content > .marginal { float: left; margin: 0 -27em 0 2.625em; @@ -68,18 +68,18 @@ body right: 0; /** Hier eigentlich nicht nÃ¶tig, aber fÃ¼r Tablet-Style erforderrlich! */ width: 100%; } -.cols_2 #nav +.menu #nav { position: relative; top: auto; right: auto; width: 22.375em; /** 358px = 326px + 32px*/ } -.cols_2 #menu +.menu #menu { margin: 0 0 -2.125em 0; /** 0 0 -34px 0 */ } -.cols_1 #menu +.nomenu #menu { position: absolute; top: -7em; /** 112px */ @@ -98,7 +98,7 @@ body { overflow-y: scroll; } } /** Faux-Column-Hack-EigengewÃ¤chs */ -#page.cols_2 +.menu #page { max-width: 38em; /** 608px + 390px (Marginalspalte) = ca. 1000px */ border-right: 24.375em solid @heller; @@ -107,21 +107,21 @@ body { overflow-y: scroll; } { padding-top: 1em; } -.cols_2 > #header +.menu #header { margin-right: -24.375em; background-color: @hintergrund; } -.cols_2 > #breadcrumb +.menu #breadcrumb { right: -24.375em; /** Weil der Breadcrumb sonst an der Faux-Column umbricht! */ } -.cols_1 > #footer +.nomenu #footer { border-top: 1.5em solid @hintergrund; background-color: @hintergrund; } -.cols_2 > #footer +.menu #footer { margin-right: -24.375em; background-color: @hintergrund; diff --git a/src/main/webapp/less/tablet/footer.less b/src/main/webapp/less/tablet/footer.less index bfb951d6..7e6567b4 100644 --- a/src/main/webapp/less/tablet/footer.less +++ b/src/main/webapp/less/tablet/footer.less @@ -1,4 +1,4 @@ -.cols_1 > #footer +.nomenu #footer { padding: 0 3em 1.5em 5em; @media (max-width: @maxsmalltablet) @@ -11,7 +11,7 @@ } background-color: @heller; } -.cols_1 > #footer > #footerlinks +.nomenu #footer > #footerlinks { position: static; margin: -.125em; @@ -26,38 +26,38 @@ } border-top: .125em solid @hintergrund; } -.cols_1 > #footer > #footerlinks > li.f +.nomenu #footer > #footerlinks > li.f { line-height: 1em; margin: 0 1em 0 0; padding: 0; } -.cols_1 > #footer > #footerlinks > li.f > a.f +.nomenu #footer > #footerlinks > li.f > a.f { color: @hintergrund; border-color: @hintergrund; } -.cols_1 > #footer > #footerlinks > li#copyright +.nomenu #footer > #footerlinks > li#copyright { position: static; float: right; font-size: 137.5%; margin: 0; } -.cols_2 > #footer > #footerlinks +.menu #footer > #footerlinks { position: static; border-style: none; margin: 4em 0 0 2em; } -.cols_2 > #footer > #footerlinks > li.f +.menu #footer > #footerlinks > li.f { line-height: 1em; display: block; margin: 0 0 .25em 0; color: @hintergrund; } -.cols_2 > #footer > #footerlinks > li#copyright +.menu #footer > #footerlinks > li#copyright { line-height: 1em; font-size: 137.5%; @@ -79,12 +79,12 @@ background-color: @heller; text-align: right; } -.cols_2 > #footer > #footerlinks a.f +.menu #footer > #footerlinks a.f { color: @hintergrund; border-color: @hintergrund; } -.cols_2 > #footer > #footerlinks a.f:hover +.menu #footer > #footerlinks a.f:hover { color: @hintergrund; border-color: @hintergrund; diff --git a/src/main/webapp/less/tablet/layout.less b/src/main/webapp/less/tablet/layout.less index b6f70820..935e7ef1 100644 --- a/src/main/webapp/less/tablet/layout.less +++ b/src/main/webapp/less/tablet/layout.less @@ -7,7 +7,7 @@ body overflow: hidden; } -.cols_1 > .content +.nomenu .content { padding-bottom: 5em; @media (max-width: @maxsmalltablet) @@ -19,15 +19,15 @@ body padding-bottom: 3.25em; } } -.cols_2 > .content.cf:before, -.cols_2 > .content.cf:after +.menu .content.cf:before, +.menu .content.cf:after { clear: none; content: none; display: inline; } -.cols_1 > .content > .main, -.cols_2 > .content > .main +.nomenu .content > .main, +.menu .content > .main { float: none; width: auto; @@ -46,7 +46,7 @@ body border-top: 1px solid @hintergrund; border-bottom: 1px solid @hintergrund; } -.cols_1 > .content > .marginal +.nomenu .content > .marginal { margin: 3em 0 -999em 0; padding: 0 3em 999em 5em; @@ -61,24 +61,24 @@ body padding-right: 1em; } } -.cols_1 > .content > .marginal aside.m +.nomenu .content > .marginal aside.m { margin: 3.5em -3em -999em -5em; padding: 2em 3em 995em 5em; border-style: none; } -.cols_2 > .content > .marginal +.menu .content > .marginal { margin: 3em 0 -994em -15em; padding: 2em 0 999em 0; width: 100%; position: static; } -.cols_1 > #footer +.nomenu #footer { border-style: none; } -.cols_2 > .content > .marginal > aside.m +.menu .content > .marginal > aside.m { margin: 0 -12em 1em 17.5em; @media (max-width: @maxsmalltablet) @@ -90,7 +90,7 @@ body margin-right: -14em; } } -.cols_2 > .content > .marginal > #nav +.menu .content > .marginal > #nav { position: static; border-right: .125em solid @hintergrund; @@ -123,22 +123,22 @@ body } } -#page.cols_2 +.menu #page { max-width: none; border-right-style: none; } -.cols_2 > #header +.menu #header { margin-right: 0; border-right-style: none; } -.cols_2 > .content +.menu .content { margin: 0; padding: 0; } -.cols_2 > #footer +.menu #footer { position: static; float: right; diff --git a/src/main/webapp/less/tablet/navigation.less b/src/main/webapp/less/tablet/navigation.less index facae8fc..30d30a6d 100644 --- a/src/main/webapp/less/tablet/navigation.less +++ b/src/main/webapp/less/tablet/navigation.less @@ -3,8 +3,8 @@ left: 11.9em; right: 3em; } -.cols_1 #menu, -.cols_2 #menu +.nomenu #menu, +.menu #menu { position: absolute; width: auto; @@ -17,8 +17,8 @@ @media (max-width: @maxsmalltablet) { - .cols_1 #menu, - .cols_2 #menu + .nomenu #menu, + .menu #menu { top: -5.7em; right: 2em; @@ -48,8 +48,8 @@ @media (max-width: @maxsmallertablet) { - .cols_1 #menu, - .cols_2 #menu + .nomenu #menu, + .menu #menu { top: -4.5em; right: 1em; -- 2.20.1

juplo

Navigation

Section-Menu

Navigation

Section-Menu