X-Git-Url: https://juplo.de/gitweb/?p=website;a=blobdiff_plain;f=src%2Fmain%2Fwebapp%2Fless%2Fscreen%2Flayout.less;h=4e6c331f187a54fef0070cc96285da7b6a46c81b;hp=cad786e4b7a67036ce49491e0c29a8f7fca0cc14;hb=fd86a57c93eea4668d9c748aed9ab301a1d99082;hpb=2da8db26a61aba0d44731e70d14672755b90f553

diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less
index cad786e4..4e6c331f 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
@@ -21,6 +26,11 @@ body
   position: relative;
   width: 100%;
 }
+.cols_1 > .content > .marginal
+{
+  margin-top: 3em;
+  background-color: @heller;
+}
 .cols_2 > .content > .marginal
 {
   float: left;
@@ -30,17 +40,29 @@ 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 > .marginal h1:first-child,
+.content > .marginal h2:first-child,
+.content > .marginal h3:first-child,
+.content > .marginal h4:first-child
+{
+  margin-top: 0;
+}
+.cols_1 > .content > .marginal aside.m
+{
+  padding: 2em;
+}
 .content #nav
 {
   position: absolute;
   top: 0;
+  right: 0; /** Hier eigentlich nicht nötig, aber für Tablet-Style erforderrlich! */
   width: 100%;
 }
 .cols_2 > .content #nav
@@ -69,7 +91,6 @@ body { overflow-y: scroll; }
 #page
 {
   max-width: 62.375em; /** 608px + 390px (Marginalspalte) = ca. 1000px */
-  position: relative;
   margin: 0 auto;
 }
 
@@ -79,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;