X-Git-Url: https://juplo.de/gitweb/?p=website;a=blobdiff_plain;f=src%2Fmain%2Fwebapp%2Fless%2Ftablet%2Flayout.less;h=44ab7d58d521b5a297bd39c904f46a767d2f20c5;hp=b4257b249377deabff40ed71c7667991e55a4047;hb=545c20e546e2c2083f66c33c9cf842951ac7db4d;hpb=b89d89ff6c29e6edab9b68c7ce4757b627148802

diff --git a/src/main/webapp/less/tablet/layout.less b/src/main/webapp/less/tablet/layout.less
index b4257b24..44ab7d58 100644
--- a/src/main/webapp/less/tablet/layout.less
+++ b/src/main/webapp/less/tablet/layout.less
@@ -1,7 +1,6 @@
 /** Seite gesamt (Abmessungen, Aussenabstände etc.) */
 
-body.menu,
-body.nomenu
+body
 {
   padding: 0;
 }
@@ -23,7 +22,7 @@ body.nomenu
 }
 .nomenu .content
 {
-  padding-bottom: 5em;
+  padding: 0 0 5em 0;
   @media (max-width: @maxsmalltablet)
   {
     padding-bottom: 4em;
@@ -33,22 +32,21 @@ body.nomenu
     padding-bottom: 3.25em;
   }
 }
-.menu .content.cf:before,
-.menu .content.cf:after
+.content.cf:before,
+.content.cf:after
 {
   clear: none;
   content: none;
   display: inline;
 }
-.menu .content > .main,
-.nomenu .content > .main
+.content > .main
 {
   float: none;
   width: auto;
   padding: 0 3em 0 5em;
   @media (max-width: @maxsmalltablet)
   {
-    padding: 0 2em 0 3.5em;
+    padding: 0 2em 0 3em;
   }
   @media (max-width: @maxsmallertablet)
   {
@@ -60,27 +58,21 @@ body.nomenu
   border-top: 1px solid @hintergrund;
   border-bottom: 1px solid @hintergrund;
 }
+.content > .marginal
+{
+  position: static;
+  width: 100%;
+}
 .menu .content > .marginal
 {
   margin: 3em 0 -994em -15em;
   padding: 2em 0 999em 0;
-  width: 100%;
-  position: static;
 }
 .nomenu .content > .marginal
 {
-  margin: 3em 0 -999em 0;
-  padding: 0 3em 999em 5em;
-  @media (max-width: @maxsmalltablet)
-  {
-    padding-left: 3.5em;
-    padding-right: 2em;
-  }
-  @media (max-width: @maxsmallertablet)
-  {
-    padding-left: 2.5em;
-    padding-right: 1em;
-  }
+  margin: 3em 0 -994em 0;
+  padding: 0 0 999em 0;
+  background-color: transparent;
 }
 
 
@@ -88,23 +80,23 @@ body.nomenu
 
 #header
 {
-  padding: 1em 3em 0 5em;
+  padding: 1em 3em 2em 5em;
   @media (max-width: @maxsmalltablet)
   {
     margin-left: -1.5em;
-    padding: .5em 2em 0 3.5em;
+    padding: .5em 2em 2em 3em;
   }
   @media (max-width: @maxsmallertablet)
   {
     margin-left: -1.2em;
-    padding: 1em 1em 0 2.5em;
+    padding: 1em 1em 2em 2.5em;
   }
 }
 
 
 /** Bereichsauswahl positionieren */
 
-.menu .content > .marginal > #nav
+.menu #nav
 {
   position: static;
   border-right: .125em solid @hintergrund;
@@ -116,26 +108,43 @@ body.nomenu
   @media (max-width: @maxsmallertablet)
   {
     margin-left: 17.5em;
+    #menu > li.about
+    {
+      display: inline-block;
+    }
   }
   width: auto;
 }
+.nomenu #nav
+{
+  position: absolute;
+  top: 0;
+  right: 0; /** Hier eigentlich nicht nötig, aber für Tablet-Style erforderrlich! */
+  width: 100%;
+}
+
 .nomenu #menu,
 .menu #menu
 {
   position: absolute;
   width: auto;
+  top: -9em;
   right: 3em;
   @media (max-width: @maxsmalltablet)
   {
-    top: -5.7em;
+    top: -7.7em;
     right: 2em;
   }
   @media (max-width: @maxsmallertablet)
   {
-    top: -4.5em;
+    top: -6.5em;
     right: 1em;
   }
 }
+#menu > li.about
+{
+  display: none;
+}
 #menu > li.m
 {
   @media (max-width: @maxsmalltablet)
@@ -202,7 +211,8 @@ body.nomenu
 
 /** Breadcrump positionieren */
 
-#breadcrumb
+.menu #breadcrumb,
+.nomenu #breadcrumb
 {
   left: 11.9em;
   right: 3em;
@@ -210,32 +220,47 @@ body.nomenu
   {
     font-size: 87.5%; /* 14px */
     top: 7.2em;
-    left: 10.3em;
+    left: 9.8em;
   }
   @media (max-width: @maxsmallertablet)
   {
-    display: none;
+    top: 5.8em;
+    left: 7em;
   }
 }
 
 
-/** Faux-Column-Hack für Marginalinhalte anpassen */
+/** Faux-Column-Hack für Marginalinhalte */
 
 .nomenu .content > .marginal aside.m
 {
-  margin: 3.5em -3em -999em -5em;
+  margin: 3.5em 0 -999em 0;
   padding: 2em 3em 995em 5em;
-  border-style: none;
+  background-color: @heller;
+  position: relative;
+  top: -4.5em;
+  @media (max-width: @maxsmalltablet)
+  {
+    padding-left: 3em;
+    padding-right: 2em;
+  }
+  @media (max-width: @maxsmallertablet)
+  {
+    padding-left: 2.5em;
+    padding-right: 1em;
+  }
 }
 .menu .content > .marginal > aside.m
 {
-  margin: 0 -12em 1em 17.5em;
+  margin: 0 -12em 1em 20em;
   @media (max-width: @maxsmalltablet)
   {
+    margin-left: 18.5em;
     margin-right: -13em;
   }
   @media (max-width: @maxsmallertablet)
   {
+    margin-left: 17.5em;
     margin-right: -14em;
   }
 }