X-Git-Url: https://juplo.de/gitweb/?p=website;a=blobdiff_plain;f=src%2Fmain%2Fwebapp%2Fless%2Fscreen%2Flayout.less;h=bf77320feb006f8c268ed4958fc41104d290422e;hp=eee9b8612e51a39a81dc764865ade8919bc55208;hb=cea459bf2e32af5de46af1c61c8c69f415b19f40;hpb=5d1b0c41c6376bc85d7400436ea8f2e484915d8f

diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less
index eee9b861..bf77320f 100644
--- a/src/main/webapp/less/screen/layout.less
+++ b/src/main/webapp/less/screen/layout.less
@@ -1,22 +1,23 @@
-@import '../variables.less';
-
 body
 {
-  padding: 1em 3em 1em 5em;
+  padding: 0 3em 0 5em;
 }
 
-.fc.cols_2
+#header
 {
-  border-right: 24.375em solid @heller;
+  margin-left: -2.125em;
 }
+
 .content
 {
   position: relative;
+  height: 100%;
+  padding-bottom: 7.1875em; /** 115px (gemessene Gesamthöhe des Footers - mit Abstand und Margin) */
 }
 .cols_2 > .content
 {
-  padding: 0 27em 0 0;
-  margin: 0 -24.375em 0 0;
+  padding-right: 27em;
+  margin-right: -24.375em;
 }
 .cols_2 > .content > .main
 {
@@ -25,6 +26,18 @@ body
   position: relative;
   width: 100%;
 }
+.cols_1 > .content > .main
+{
+  margin-bottom: 7em;
+}
+.cols_1 > .content > .marginal aside.m
+{
+  margin: 3.5em 0 -999em 0;
+  padding: 2em 2em 995em 2em;
+  background-color: @heller;
+  position: relative;
+  top: -4.5em;
+}
 .cols_2 > .content > .marginal
 {
   float: left;
@@ -34,31 +47,39 @@ body
   width: 20.375em;
   background-color: @heller;
 }
-.cols_2 > .content > .marginal h1,
-.cols_2 > .content > .marginal h2,
-.cols_2 > .content > .marginal h3,
-.cols_2 > .content > .marginal h4
+.content > .marginal h1,
+.content > .marginal h2,
+.content > .marginal h3,
+.content > .marginal h4
 {
   color: @hintergrund;
 }
-.content #nav
+.content > .marginal h1:first-child,
+.content > .marginal h2:first-child,
+.content > .marginal h3:first-child,
+.content > .marginal h4:first-child
+{
+  margin-top: 0;
+}
+#nav
 {
   position: absolute;
   top: 0;
+  right: 0; /** Hier eigentlich nicht nötig, aber für Tablet-Style erforderrlich! */
   width: 100%;
 }
-.cols_2 > .content #nav
+.cols_2 #nav
 {
   position: relative;
   top: auto;
   right: auto;
   width: 22.375em; /** 358px = 326px + 32px*/
 }
-.cols_2 > .content #nav > #menu
+.cols_2 #menu
 {
   margin: 0 0 -2.125em 0; /** 0 0 -34px 0 */
 }
-.content.cols_1 #nav > #menu
+.cols_1 #menu
 {
   position: absolute;
   top: -7em; /** 112px */
@@ -72,7 +93,36 @@ body { overflow-y: scroll; }
 /** Center content, when screen is bigger than 1240 */
 #page
 {
-  position: relative;
-  max-width: 1000px;
+  max-width: 62.375em; /** 608px + 390px (Marginalspalte) = ca. 1000px */
   margin: 0 auto;
 }
+
+/** Faux-Column-Hack-Eigengewächs */
+#page.cols_2
+{
+  max-width: 38em; /** 608px + 390px (Marginalspalte) = ca. 1000px */
+  border-right: 24.375em solid @heller;
+}
+#header
+{
+  padding-top: 1em;
+}
+.cols_2 > #header
+{
+  margin-right: -24.375em;
+  background-color: @hintergrund;
+}
+.cols_2 > #breadcrumb
+{
+  right: -24.375em; /** Weil der Breadcrumb sonst an der Faux-Column umbricht! */
+}
+.cols_1 > #footer
+{
+  border-top: 1.5em solid @hintergrund;
+  background-color: @hintergrund;
+}
+.cols_2 > #footer
+{
+  margin-right: -24.375em;
+  background-color: @hintergrund;
+}