From: Kai Moritz <kai@juplo.de>
Date: Sat, 14 Dec 2013 17:31:01 +0000 (+0100)
Subject: Faux-Column-Hack gegen ein Eigengewächs ersetzt, das ohne Grafik auskommt
X-Git-Tag: thymeroot-2.0.0~166
X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=5d1b0c41c6376bc85d7400436ea8f2e484915d8f;p=website

Faux-Column-Hack gegen ein Eigengewächs ersetzt, das ohne Grafik auskommt
---

diff --git a/src/main/webapp/WEB-INF/templates/html5page.jsp b/src/main/webapp/WEB-INF/templates/html5page.jsp
index 15aabc3c..3deb5080 100644
--- a/src/main/webapp/WEB-INF/templates/html5page.jsp
+++ b/src/main/webapp/WEB-INF/templates/html5page.jsp
@@ -40,19 +40,21 @@
         <a class="hide" href="#navigation">Jump to navigation</a>
         <div class="b"></div>
       </div>
-      <div class="content <t:getAsString name="contentclass"/> cf">
-        <section id="content" class="main">
-          <h1><t:getAsString name="title"/></h1>
-          <t:insertAttribute name="maincontent"/>
-        </section>
-        <div class="marginal">
-          <nav id="nav">
-            <hr />
-            <a id="navigation"></a>
-            <t:insertAttribute name="navigation"/>
-            <hr />
-          </nav>
-          <t:insertAttribute name="marginalcontent" ignore="true"/>
+      <div class="fc <t:getAsString name="contentclass"/>">
+        <div class="content cf">
+          <section id="content" class="main">
+            <h1><t:getAsString name="title"/></h1>
+            <t:insertAttribute name="maincontent"/>
+          </section>
+          <div class="marginal">
+            <nav id="nav">
+              <hr />
+              <a id="navigation"></a>
+              <t:insertAttribute name="navigation"/>
+              <hr />
+            </nav>
+            <t:insertAttribute name="marginalcontent" ignore="true"/>
+          </div>
         </div>
       </div>
       <footer id="footer">
diff --git a/src/main/webapp/img/bg.gif b/src/main/webapp/img/bg.gif
deleted file mode 100644
index acdcfb1e..00000000
Binary files a/src/main/webapp/img/bg.gif and /dev/null differ
diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less
index 2af6cd6f..eee9b861 100644
--- a/src/main/webapp/less/screen/layout.less
+++ b/src/main/webapp/less/screen/layout.less
@@ -5,25 +5,27 @@ body
   padding: 1em 3em 1em 5em;
 }
 
+.fc.cols_2
+{
+  border-right: 24.375em solid @heller;
+}
 .content
 {
   position: relative;
 }
-.content.cols_2
+.cols_2 > .content
 {
   padding: 0 27em 0 0;
-  background-image: url('../../img/bg.gif');
-  background-repeat: repeat-y;
-  background-position: right top;
+  margin: 0 -24.375em 0 0;
 }
-.content.cols_2 > .main
+.cols_2 > .content > .main
 {
   float: left;
   min-height: 1em;
   position: relative;
   width: 100%;
 }
-.content.cols_2 > .marginal
+.cols_2 > .content > .marginal
 {
   float: left;
   margin: 0 -27em 0 2.625em;
@@ -45,14 +47,14 @@ body
   top: 0;
   width: 100%;
 }
-.content.cols_2 #nav
+.cols_2 > .content #nav
 {
   position: relative;
   top: auto;
   right: auto;
   width: 22.375em; /** 358px = 326px + 32px*/
 }
-.content.cols_2 #nav > #menu
+.cols_2 > .content #nav > #menu
 {
   margin: 0 0 -2.125em 0; /** 0 0 -34px 0 */
 }