From: Kai Moritz Date: Thu, 23 Jan 2014 00:36:35 +0000 (+0100) Subject: Marginal-Box auf fast leeren einspaltigen Seiten korrigiert X-Git-Tag: thymeroot-2.0.0~132 X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=cea459bf2e32af5de46af1c61c8c69f415b19f40;p=website Marginal-Box auf fast leeren einspaltigen Seiten korrigiert --- diff --git a/src/main/webapp/WEB-INF/templates/marginalcontent.jsp b/src/main/webapp/WEB-INF/templates/marginalcontent.jsp index 29f67bd2..e8c225cb 100644 --- a/src/main/webapp/WEB-INF/templates/marginalcontent.jsp +++ b/src/main/webapp/WEB-INF/templates/marginalcontent.jsp @@ -13,3 +13,9 @@ culpa qui officia deserunt mollit anim id est laborum.

+ diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less index 92cc19ac..bf77320f 100644 --- a/src/main/webapp/less/screen/layout.less +++ b/src/main/webapp/less/screen/layout.less @@ -26,10 +26,17 @@ body position: relative; width: 100%; } -.cols_1 > .content > .marginal +.cols_1 > .content > .main { - margin-top: 3em; + 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 { @@ -54,10 +61,6 @@ body { margin-top: 0; } -.cols_1 > .content > .marginal aside.m -{ - padding: 2em; -} #nav { position: absolute; @@ -113,6 +116,11 @@ body { overflow-y: scroll; } { 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; diff --git a/src/main/webapp/less/tablet/footer.less b/src/main/webapp/less/tablet/footer.less index ffe16955..bfb951d6 100644 --- a/src/main/webapp/less/tablet/footer.less +++ b/src/main/webapp/less/tablet/footer.less @@ -1,20 +1,30 @@ .cols_1 > #footer { - padding: 2em 3em 1.5em 5em; + padding: 0 3em 1.5em 5em; @media (max-width: @maxsmalltablet) { - padding: 1.5em 2em 1em 3em; + padding: 0 2em 1em 3em; } @media (max-width: @maxsmallertablet) { - padding: 1em 1em .75em 2.5em; + padding: 0 1em .75em 2.5em; } background-color: @heller; } .cols_1 > #footer > #footerlinks { position: static; - border-style: none; + margin: -.125em; + padding-top: 1.5em; + @media (max-width: @maxsmalltablet) + { + padding-top: 1em; + } + @media (max-width: @maxsmallertablet) + { + padding-top: .5em; + } + border-top: .125em solid @hintergrund; } .cols_1 > #footer > #footerlinks > li.f { diff --git a/src/main/webapp/less/tablet/layout.less b/src/main/webapp/less/tablet/layout.less index ddaa34af..b6f70820 100644 --- a/src/main/webapp/less/tablet/layout.less +++ b/src/main/webapp/less/tablet/layout.less @@ -63,8 +63,9 @@ body } .cols_1 > .content > .marginal aside.m { - padding: 2em 0; - border-bottom: .125em solid @hintergrund; + margin: 3.5em -3em -999em -5em; + padding: 2em 3em 995em 5em; + border-style: none; } .cols_2 > .content > .marginal { @@ -73,9 +74,13 @@ body width: 100%; position: static; } +.cols_1 > #footer +{ + border-style: none; +} .cols_2 > .content > .marginal > aside.m { - margin: 0 -12em 0 17.5em; + margin: 0 -12em 1em 17.5em; @media (max-width: @maxsmalltablet) { margin-right: -13em;