From: Kai Moritz Date: Sat, 13 Sep 2014 18:53:02 +0000 (+0200) Subject: Mehrspaltige Darstellung in Haupt-Contentbereich überarbeitet X-Git-Tag: thymeroot-2.0.0~94 X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=351e86a9d261f56630181dfb2d15eb7337bfd682;p=website Mehrspaltige Darstellung in Haupt-Contentbereich überarbeitet --- diff --git a/src/main/webapp/less/base.less b/src/main/webapp/less/base.less index 360752ce..fb944862 100644 --- a/src/main/webapp/less/base.less +++ b/src/main/webapp/less/base.less @@ -8,6 +8,5 @@ @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 deleted file mode 100644 index 0936a2ff..00000000 --- a/src/main/webapp/less/base/packs.less +++ /dev/null @@ -1,40 +0,0 @@ -.pack -{ - overflow: hidden; -} -.pack > .p.left, -.pack > .p.right -{ - width: 48%; - padding: 0 0 999em 0; - margin: 0 0 -999em 0; -} -.pack.bg > .p.left, -.pack.bg > .p.right -{ - width: 42%; - padding-left: 3%; - padding-right: 3%; - background-color: @sehrhell; -} -.pack > .p.left -{ - float: left; -} -.pack > .p.right -{ - float: right; -} -.pack > .p img.p -{ - width: 91.9118%; -} -.single -{ - padding: 3%; - margin: 3% 0; -} -.single.bg -{ - background-color: @sehrhell; -} diff --git a/src/main/webapp/less/phone/packs.less b/src/main/webapp/less/phone/packs.less index b87a5637..687fe70a 100644 --- a/src/main/webapp/less/phone/packs.less +++ b/src/main/webapp/less/phone/packs.less @@ -1,10 +1,12 @@ -.pack > .left, -.pack > .right +.pack > .p.left, +.pack > .p.right, +.pack.bg > .p.left, +.pack.bg > .p.right, +.single, +.single.bg { - @media (max-width: 410px) - { - width: 94%; - padding-bottom: 0; - margin: 3% 0; - } + float: none; + width: auto; + padding: 3%; + margin: 0 0 3% 0; } diff --git a/src/main/webapp/less/screen.less b/src/main/webapp/less/screen.less index 7102445c..5a81cba0 100644 --- a/src/main/webapp/less/screen.less +++ b/src/main/webapp/less/screen.less @@ -2,6 +2,7 @@ @import 'screen/menu.less'; @import 'screen/footer-sticky.less'; @import 'screen/wip.less'; +@import 'screen/packs.less'; @media (min-width: (@minscreen)) { @@ -21,6 +22,10 @@ @import 'screen/faux-column.less'; @import 'screen/marginal.less'; @import 'screen/content.less'; + @media (max-width: 1079px) + { + @import 'phone/packs.less'; + } } @media (max-width: (@maxtablet)) diff --git a/src/main/webapp/less/screen/packs.less b/src/main/webapp/less/screen/packs.less new file mode 100644 index 00000000..ed92ec80 --- /dev/null +++ b/src/main/webapp/less/screen/packs.less @@ -0,0 +1,37 @@ +.pack +{ + overflow: hidden; +} +.pack > .p.left, +.pack > .p.right +{ + width: 42%; + padding: 3% 3% 999em 3%; + margin: 0 0 -999em 0; +} +.pack.bg > .p.left, +.pack.bg > .p.right +{ + background-color: @sehrhell; +} +.pack > .p.left +{ + float: left; +} +.pack > .p.right +{ + float: right; +} +.pack > .p img.p +{ + width: 91.9118%; +} +.single +{ + padding: 3%; + margin: 3% 0; +} +.single.bg +{ + background-color: @sehrhell; +} diff --git a/src/main/webapp/thymeleaf/index.html b/src/main/webapp/thymeleaf/index.html index 020e746b..e0256ebf 100644 --- a/src/main/webapp/thymeleaf/index.html +++ b/src/main/webapp/thymeleaf/index.html @@ -29,7 +29,7 @@
-

hibernate4-maven-plugin

+

hibernate4-maven-plugin

Lorem ipsum dolor sit amet, @@ -44,7 +44,7 @@

-

fix-swf

+

fix-swf

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim @@ -54,7 +54,7 @@

-

accelerator

+

accelerator

Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla @@ -64,7 +64,7 @@

-

jquery.openx

+

jquery.openx

Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla @@ -73,7 +73,7 @@

-

Regex-Lab

+

Regex-Lab

Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. @@ -82,7 +82,7 @@

-

jquery.openx

+

jquery.openx

Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla @@ -91,7 +91,7 @@

-

Regex-Lab

+

Regex-Lab

Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.