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

diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less
index 4ef2bbe5..bf77320f 100644
--- a/src/main/webapp/less/screen/layout.less
+++ b/src/main/webapp/less/screen/layout.less
@@ -1,10 +1,13 @@
-@import '../variables.less';
-
 body
 {
   padding: 0 3em 0 5em;
 }
 
+#header
+{
+  margin-left: -2.125em;
+}
+
 .content
 {
   position: relative;
@@ -23,10 +26,17 @@ body
   position: relative;
   width: 100%;
 }
-.cols_1 > .content > .marginal
+.cols_1 > .content > .main
+{
+  margin-bottom: 7em;
+}
+.cols_1 > .content > .marginal aside.m
 {
-  margin-top: 3em;
+  margin: 3.5em 0 -999em 0;
+  padding: 2em 2em 995em 2em;
   background-color: @heller;
+  position: relative;
+  top: -4.5em;
 }
 .cols_2 > .content > .marginal
 {
@@ -51,29 +61,25 @@ body
 {
   margin-top: 0;
 }
-.cols_1 > .content > .marginal div.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 */
@@ -91,24 +97,6 @@ body { overflow-y: scroll; }
   margin: 0 auto;
 }
 
-/** Make the footer sticky */
-html, body
-{
-  height: 100%;
-}
-#page
-{
-  position: relative;
-  min-height: 100%;
-}
-#footer
-{
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-
 /** Faux-Column-Hack-Eigengewächs */
 #page.cols_2
 {
@@ -128,6 +116,11 @@ html, body
 {
   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;