projects / website / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5d1b0c4)
Faux-Column-Hack gekürzt: der Zentrierungs-DIV kan mitverwendet werden
authorKai Moritz <km@feder-software.de>
Mon, 16 Dec 2013 17:27:16 +0000 (18:27 +0100)
committerKai Moritz <kai@juplo.de>
Tue, 19 Jan 2016 16:45:35 +0000 (17:45 +0100)
src/main/webapp/WEB-INF/templates/html5page.jsp patch | blob | history
src/main/webapp/less/screen/footer.less patch | blob | history
src/main/webapp/less/screen/layout.less patch | blob | history

diff --git a/src/main/webapp/WEB-INF/templates/html5page.jsp b/src/main/webapp/WEB-INF/templates/html5page.jsp
index 3deb508..3617d67 100644 (file)
--- a/src/main/webapp/WEB-INF/templates/html5page.jsp
+++ b/src/main/webapp/WEB-INF/templates/html5page.jsp
@@ -26,7 +26,7 @@
     <![endif]-->
   </head>
   <body onload="prettyPrint()">
-    <div id="page">
+    <div id="page" class="<t:getAsString name="contentclass"/>">
       <header id="header">
         <a href="/" title="Home" id="logo">juplo</a>
         <span id="slogan"><strong>Java</strong> bits from nerds for nerds</span>
@@ -40,21 +40,19 @@
         <a class="hide" href="#navigation">Jump to navigation</a>
         <div class="b"></div>
       </div>
-      <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 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>
       <footer id="footer">
diff --git a/src/main/webapp/less/screen/footer.less b/src/main/webapp/less/screen/footer.less
index 922e92a..baedc49 100644 (file)
--- a/src/main/webapp/less/screen/footer.less
+++ b/src/main/webapp/less/screen/footer.less
@@ -2,7 +2,7 @@
 
 #footer
 {
-  margin: 2em 0;
+  padding: 2em 0;
 }
 #footer > hr
 {
diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less
index eee9b86..cad786e 100644 (file)
--- a/src/main/webapp/less/screen/layout.less
+++ b/src/main/webapp/less/screen/layout.less
@@ -5,10 +5,6 @@ body
   padding: 1em 3em 1em 5em;
 }
 
-.fc.cols_2
-{
-  border-right: 24.375em solid @heller;
-}
 .content
 {
   position: relative;
@@ -16,7 +12,7 @@ body
 .cols_2 > .content
 {
   padding: 0 27em 0 0;
-  margin: 0 -24.375em 0 0;
+  margin-right: -24.375em;
 }
 .cols_2 > .content > .main
 {
@@ -72,7 +68,28 @@ body { overflow-y: scroll; }
 /** Center content, when screen is bigger than 1240 */
 #page
 {
+  max-width: 62.375em; /** 608px + 390px (Marginalspalte) = ca. 1000px */
   position: relative;
-  max-width: 1000px;
   margin: 0 auto;
 }
+
+/** Faux-Column-Hack-Eigengewächs */
+#page.cols_2
+{
+  max-width: 38em; /** 608px + 390px (Marginalspalte) = ca. 1000px */
+  border-right: 24.375em solid @heller;
+}
+.cols_2 > #header
+{
+  margin-right: -24.375em;
+  background-color: @hintergrund;
+}
+.cols_2 > #breadcrumb
+{
+  right: -24.375em; /** Weil der Breadcrumb sonst an der Faux-Column umbricht! */
+}
+.cols_2 > #footer
+{
+  margin-right: -24.375em;
+  background-color: @hintergrund;
+}
Unnamed repository; edit this file 'description' to name the repository.