From 351e86a9d261f56630181dfb2d15eb7337bfd682 Mon Sep 17 00:00:00 2001
From: Kai Moritz <km@juplo.de>
Date: Sat, 13 Sep 2014 20:53:02 +0200
Subject: [PATCH] =?utf8?q?Mehrspaltige=20Darstellung=20in=20Haupt-Contentb?=
 =?utf8?q?ereich=20=C3=BCberarbeitet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/less/base.less                 |  1 -
 src/main/webapp/less/phone/packs.less          | 18 ++++++++++--------
 src/main/webapp/less/screen.less               |  5 +++++
 .../webapp/less/{base => screen}/packs.less    |  7 ++-----
 src/main/webapp/thymeleaf/index.html           | 14 +++++++-------
 5 files changed, 24 insertions(+), 21 deletions(-)
 rename src/main/webapp/less/{base => screen}/packs.less (82%)

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/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/base/packs.less b/src/main/webapp/less/screen/packs.less
similarity index 82%
rename from src/main/webapp/less/base/packs.less
rename to src/main/webapp/less/screen/packs.less
index 0936a2ff..ed92ec80 100644
--- a/src/main/webapp/less/base/packs.less
+++ b/src/main/webapp/less/screen/packs.less
@@ -5,16 +5,13 @@
 .pack > .p.left,
 .pack > .p.right
 {
-  width: 48%;
-  padding: 0 0 999em 0;
+  width: 42%;
+  padding: 3% 3% 999em 3%;
   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
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 @@
     <main class="main" layout:fragment="maincontent">
       <div class="pack bg cf">
         <div class="p left">
-          <h2>hibernate4-maven-plugin</h2>
+          <h1>hibernate4-maven-plugin</h1>
           <p>
             <strong>Lorem ipsum</strong> dolor
             <a href="projects/typo.html" th:href="@{/projects/typo.html}">sit amet</a>,
@@ -44,7 +44,7 @@
           </p>
         </div>
         <div class="p right">
-          <h2>fix-swf</h2>
+          <h1>fix-swf</h1>
           <p>
             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 @@
         </div>
       </div>
       <div class="single">
-        <h2>accelerator</h2>
+        <h1>accelerator</h1>
         <p>
           Duis aute irure dolor in
           reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
@@ -64,7 +64,7 @@
       </div>
       <div class="pack bg cf">
         <div class="p right">
-          <h2>jquery.openx</h2>
+          <h1>jquery.openx</h1>
           <p>
             Duis aute irure dolor in
             reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
@@ -73,7 +73,7 @@
           </p>
         </div>
         <div class="p left">
-          <h2>Regex-Lab</h2>
+          <h1>Regex-Lab</h1>
           <p>
             Excepteur sint occaecat cupidatat non proident, sunt in
             culpa qui officia deserunt mollit anim id est laborum.
@@ -82,7 +82,7 @@
       </div>
       <div class="pack cf">
         <div class="p left">
-          <h2>jquery.openx</h2>
+          <h1>jquery.openx</h1>
           <p>
             Duis aute irure dolor in
             reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
@@ -91,7 +91,7 @@
           </p>
         </div>
         <div class="p right">
-          <h2>Regex-Lab</h2>
+          <h1>Regex-Lab</h1>
           <p>
             Excepteur sint occaecat cupidatat non proident, sunt in
             culpa qui officia deserunt mollit anim id est laborum.
-- 
2.20.1