X-Git-Url: https://juplo.de/gitweb/?p=website;a=blobdiff_plain;f=src%2Fmain%2Fwebapp%2Fless%2Fscreen%2Flayout.less;h=92cc19ac845bf2e1173c6e08a03f7dba1909e2c2;hp=e99be0446ca2ad68e1efd6ed2a20dfbba0081038;hb=687c0f2b0e183abdbfcd5e262d2ba7977d910a28;hpb=173a4c37630f1d30aacc1ab5af8d0f57adc234b3

diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less
index e99be044..92cc19ac 100644
--- a/src/main/webapp/less/screen/layout.less
+++ b/src/main/webapp/less/screen/layout.less
@@ -1,17 +1,22 @@
-@import '../variables.less';
-
 body
 {
-  padding: 1em 3em 1em 5em;
+  padding: 0 3em 0 5em;
+}
+
+#header
+{
+  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;
+  padding-right: 27em;
   margin-right: -24.375em;
 }
 .cols_2 > .content > .main
@@ -23,7 +28,7 @@ body
 }
 .cols_1 > .content > .marginal
 {
-  margin: 3em 0;
+  margin-top: 3em;
   background-color: @heller;
 }
 .cols_2 > .content > .marginal
@@ -49,28 +54,29 @@ body
 {
   margin-top: 0;
 }
-.cols_1 > .content > .marginal div.m
+.cols_1 > .content > .marginal aside.m
 {
   padding: 2em;
 }
-.content #nav
+#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 */
@@ -85,7 +91,6 @@ body { overflow-y: scroll; }
 #page
 {
   max-width: 62.375em; /** 608px + 390px (Marginalspalte) = ca. 1000px */
-  position: relative;
   margin: 0 auto;
 }
 
@@ -95,6 +100,10 @@ body { overflow-y: scroll; }
   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;