From: Kai Moritz Date: Wed, 29 Jan 2014 14:11:12 +0000 (+0100) Subject: Aufteilung für den Inhalt von Seiten ohne Menü umgesetzt X-Git-Tag: thymeroot-2.0.0~126 X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=32afc29655610caab0fe85a6c9dfe1f9a9476f0f;p=website Aufteilung für den Inhalt von Seiten ohne Menü umgesetzt --- diff --git a/src/main/webapp/WEB-INF/templates/html-head.jsp b/src/main/webapp/WEB-INF/templates/html-head.jsp index 61870cd5..9c78f015 100644 --- a/src/main/webapp/WEB-INF/templates/html-head.jsp +++ b/src/main/webapp/WEB-INF/templates/html-head.jsp @@ -10,6 +10,7 @@ /less/variables.less - /less/screen/typo.less - /less/screen/layout.less /less/screen/head.less /less/screen/menu.less + /less/screen/footer-sticky.less + /less/screen/typo.less + /less/screen/layout.less /less/screen/marginal.less /less/screen/footer.less - /less/screen/footer-sticky.less /less/tablet/typo.less /less/tablet/layout.less - /less/tablet/head.less /less/tablet/menu.less /less/tablet/footer.less + /less/tablet/head.less /less/tablet/404.less @@ -40,6 +40,7 @@ /less/phone/head.less /less/phone/menu.less /less/phone/footer.less + /less/phone/packs.less /less/phone/404.less @@ -54,6 +55,7 @@ /less/phone/head.less /less/phone/menu.less /less/phone/footer.less + /less/phone/packs.less /less/phone/404.less /less/tiny/layout.less /less/tiny/404.less @@ -68,6 +70,16 @@ + /less/variables.less + /less/screen/head.less + /less/screen/menu.less + /less/screen/footer-sticky.less + /less/screen/typo.less + /less/screen/layout.less + /less/screen/marginal.less + /less/screen/footer.less + /less/screen/faux-column.less + /less/screen/content.less /js/html5shiv.js diff --git a/src/main/webapp/less/base.less b/src/main/webapp/less/base.less index fb944862..360752ce 100644 --- a/src/main/webapp/less/base.less +++ b/src/main/webapp/less/base.less @@ -8,5 +8,6 @@ @import 'base/prettify.less'; @import 'base/marginal.less'; @import 'base/footer.less'; +@import 'base/packs.less'; @import 'base/formulare.less'; @import 'base/404.less'; diff --git a/src/main/webapp/less/base/packs.less b/src/main/webapp/less/base/packs.less new file mode 100644 index 00000000..5d335bbc --- /dev/null +++ b/src/main/webapp/less/base/packs.less @@ -0,0 +1,27 @@ +.pack +{ + margin: 3% 0; + overflow: hidden; +} +.pack > .left, +.pack > .right +{ + width: 42%; + padding: 0 3% 999em 3%; + margin: 0 0 -999em 0; + background-color: @sehrhell; +} +.pack > .left +{ + float: left; +} +.pack > .right +{ + float: right; +} +.single +{ + padding: 3%; + margin: 3% 0; + background-color: @sehrhell; +} diff --git a/src/main/webapp/less/phone/packs.less b/src/main/webapp/less/phone/packs.less new file mode 100644 index 00000000..b87a5637 --- /dev/null +++ b/src/main/webapp/less/phone/packs.less @@ -0,0 +1,10 @@ +.pack > .left, +.pack > .right +{ + @media (max-width: 410px) + { + width: 94%; + padding-bottom: 0; + margin: 3% 0; + } +} diff --git a/src/main/webapp/less/screen.less b/src/main/webapp/less/screen.less index 29f8e788..040c3c80 100644 --- a/src/main/webapp/less/screen.less +++ b/src/main/webapp/less/screen.less @@ -6,10 +6,8 @@ { @import 'screen/typo.less'; @import 'screen/layout.less'; - @import 'screen/head.less'; @import 'screen/marginal.less'; @import 'screen/footer.less'; - @import 'screen/footer-sticky.less'; @media (max-width: @maxtablet) { @import 'tablet/typo.less'; @@ -21,6 +19,7 @@ @media (min-width: @maxtablet + 1) { @import 'screen/faux-column.less'; + @import 'screen/content.less'; } @media (max-width: @maxtablet) @@ -36,6 +35,7 @@ @import 'phone/head.less'; @import 'phone/menu.less'; @import 'phone/footer.less'; + @import 'phone/packs.less'; @import 'phone/404.less'; } diff --git a/src/main/webapp/less/screen/content.less b/src/main/webapp/less/screen/content.less new file mode 100644 index 00000000..35786c32 --- /dev/null +++ b/src/main/webapp/less/screen/content.less @@ -0,0 +1,26 @@ +.mcontent +{ + position: relative; + padding: 0 24.375em 0 0; +} +.mcontent > .mmain +{ + float: left; + min-height: 1em; + position: relative; + width: 100%; + border-right: .125em solid @normal; +} +.mcontent > .mmarginal +{ + float: left; + margin: 0 -27em 0 -.125em; + padding: 0 2em 1.0625em 2em; + position: relative; + width: 20.375em; + border-left: .125em solid @normal; +} +.mcontent > .mmain > * +{ + margin-right: 5%; +}