From 9c8ed63ab79a598b43a0e43768e851af9ce884f7 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Wed, 29 Jan 2014 16:19:43 +0100 Subject: [PATCH] Marginal-Inhalt im Desktop-Layout jetzt vor sehr hellem Hintergrund --- src/main/webapp/less/screen.less | 2 +- src/main/webapp/less/screen/layout.less | 18 ------------------ src/main/webapp/less/screen/marginal.less | 23 +++++++++++++++++++++++ src/main/webapp/less/tablet/layout.less | 6 ++++-- 4 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 src/main/webapp/less/screen/marginal.less diff --git a/src/main/webapp/less/screen.less b/src/main/webapp/less/screen.less index 040c3c80..24381972 100644 --- a/src/main/webapp/less/screen.less +++ b/src/main/webapp/less/screen.less @@ -6,7 +6,6 @@ { @import 'screen/typo.less'; @import 'screen/layout.less'; - @import 'screen/marginal.less'; @import 'screen/footer.less'; @media (max-width: @maxtablet) { @@ -19,6 +18,7 @@ @media (min-width: @maxtablet + 1) { @import 'screen/faux-column.less'; + @import 'screen/marginal.less'; @import 'screen/content.less'; } diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less index 4afea4ae..9e962735 100644 --- a/src/main/webapp/less/screen/layout.less +++ b/src/main/webapp/less/screen/layout.less @@ -205,21 +205,3 @@ body.menu { margin-top: 0; } - - -/** Faux-Column-Hack für Marginalinhalte auf Seiten ohne Menü */ - -.nomenu .content > .marginal aside.m -{ - margin: 3.5em 0 -999em 0; - padding: 2em 2em 995em 2em; - background-color: @heller; - position: relative; - top: -4.5em; -} -.nomenu #footer -{ - /** Hintergrund des Faux-Column-Hack für Marginal-Inhalte überlagern */ - border-top: 1.5em solid @hintergrund; - background-color: @hintergrund; -} diff --git a/src/main/webapp/less/screen/marginal.less b/src/main/webapp/less/screen/marginal.less new file mode 100644 index 00000000..d8e812d1 --- /dev/null +++ b/src/main/webapp/less/screen/marginal.less @@ -0,0 +1,23 @@ +/** Faux-Column-Hack für Marginalinhalte auf Seiten ohne Menü */ + +.nomenu .content > .marginal aside.m +{ + margin: 3.5em 0 -999em 0; + padding: 2em 2em 995em 2em; + background-color: @sehrhell; + position: relative; + top: -4.5em; +} +.nomenu .content > .marginal h1, +.nomenu .content > .marginal h2, +.nomenu .content > .marginal h3, +.nomenu .content > .marginal h4 +{ + color: @normal; +} +.nomenu #footer +{ + /** Hintergrund des Faux-Column-Hack für Marginal-Inhalte überlagern */ + border-top: 1.5em solid @hintergrund; + background-color: @hintergrund; +} diff --git a/src/main/webapp/less/tablet/layout.less b/src/main/webapp/less/tablet/layout.less index b4257b24..b8407e0c 100644 --- a/src/main/webapp/less/tablet/layout.less +++ b/src/main/webapp/less/tablet/layout.less @@ -219,13 +219,15 @@ body.nomenu } -/** Faux-Column-Hack für Marginalinhalte anpassen */ +/** Faux-Column-Hack für Marginalinhalte */ .nomenu .content > .marginal aside.m { margin: 3.5em -3em -999em -5em; padding: 2em 3em 995em 5em; - border-style: none; + background-color: @heller; + position: relative; + top: -4.5em; } .menu .content > .marginal > aside.m { -- 2.20.1