From 40f9a579c5324f56a938e262fe8c708228cf6c83 Mon Sep 17 00:00:00 2001
From: Kai Moritz <km@juplo.de>
Date: Sat, 13 Sep 2014 20:52:19 +0200
Subject: [PATCH] =?utf8?q?=C3=9Cberschriftengr=C3=B6=C3=9Fen=20=C3=BCberar?=
 =?utf8?q?beitet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/less/base/typo.less        | 37 ++++++++++++++++------
 src/main/webapp/less/phone/packs.less      |  5 ++-
 src/main/webapp/less/phone/typo.less       |  1 -
 src/main/webapp/less/screen.less           |  3 +-
 src/main/webapp/less/screen/layout.less    | 20 ++----------
 src/main/webapp/less/screen/onecolumn.less | 11 +++++++
 src/main/webapp/less/screen/packs.less     |  6 ++--
 src/main/webapp/less/screen/typo.less      |  8 -----
 src/main/webapp/thymeleaf/contact.html     |  2 +-
 src/main/webapp/thymeleaf/index.html       |  2 +-
 10 files changed, 48 insertions(+), 47 deletions(-)
 create mode 100644 src/main/webapp/less/screen/onecolumn.less
 delete mode 100644 src/main/webapp/less/screen/typo.less

diff --git a/src/main/webapp/less/base/typo.less b/src/main/webapp/less/base/typo.less
index 48ffdc78..8e5e6031 100644
--- a/src/main/webapp/less/base/typo.less
+++ b/src/main/webapp/less/base/typo.less
@@ -11,28 +11,27 @@ body
 h1, h2, h3, h4, h5, h6
 {
   .bpreplay;
-  color: @normal;
-  margin: 1em 0 .5em 0; /** 16px 0 8px 0 */
+  color: @schrifthell;
+  line-height: 1.25em;
+  margin: 1.125em 0 .25em 0; /** Margin Top für h1 auf Marginalspalte abgestimmt! */
 }
 h1
 {
-  font-size: 125%; /** 20 px */
-  line-height: 1em; /** 20px */
-  padding: 0 0 .4em 0; /** 0 0 8px 0 */
-  margin: 1em 0 .3em 0; /** 20px 0 6px 0 */
+  font-size: 137.5%; /** 22 px */
+  color: @normal;
+  padding: 0 0 .25em 0; /** 0 0 5px 0 */
 }
 h2
 {
-  font-size: 112.5%; /** 18px */
+  font-size: 125%; /** 20 px */
 }
 h3
 {
-  /** font-size: 16px */
-  /** line-height: 24px */
+  font-size: 112.5%; /** 18px */
 }
 h4
 {
-  font-size: 87.5%; /** 14px */
+  /** font-size: 16px */
 }
 h1 a, h2 a, h3 a, h4 a
 {
@@ -130,6 +129,24 @@ a:visited
   border-bottom: 1px dotted @nochdunkler;
 }
 
+h2 a,
+h3 a,
+h4 a
+{
+  color: @schrifthell;
+}
+h2 a:focus,
+h2 a:active,
+h3 a:focus,
+h3 a:active,
+h4 a:focus,
+h4 a:active
+{
+  color: @normal;
+  border-bottom: 1px solid @normal;
+}
+
+ 
 .logo
 {
   .bpreplay;
diff --git a/src/main/webapp/less/phone/packs.less b/src/main/webapp/less/phone/packs.less
index 687fe70a..0114499a 100644
--- a/src/main/webapp/less/phone/packs.less
+++ b/src/main/webapp/less/phone/packs.less
@@ -5,8 +5,7 @@
 .single,
 .single.bg
 {
-  float: none;
   width: auto;
-  padding: 3%;
-  margin: 0 0 3% 0;
+  padding-bottom: 1.5em;
+  margin: 0 0 1.5em 0;
 }
diff --git a/src/main/webapp/less/phone/typo.less b/src/main/webapp/less/phone/typo.less
index 109c47c7..ba61db5a 100644
--- a/src/main/webapp/less/phone/typo.less
+++ b/src/main/webapp/less/phone/typo.less
@@ -1,5 +1,4 @@
 h1
 {
   font-size: 150%; /** 24 px */
-  margin-top: 0;
 }
diff --git a/src/main/webapp/less/screen.less b/src/main/webapp/less/screen.less
index 2736a1f4..ba58223e 100644
--- a/src/main/webapp/less/screen.less
+++ b/src/main/webapp/less/screen.less
@@ -7,7 +7,6 @@
 
 @media (min-width: (@minscreen))
 {
-  @import 'screen/typo.less';
   @import 'screen/layout.less';
   @import 'screen/footer.less';
   @media (max-width: (@maxtablet))
@@ -26,7 +25,7 @@
   @import 'screen/content.less';
   @media (max-width: 1079px)
   {
-    @import 'phone/packs.less';
+    @import 'screen/onecolumn.less';
   }
 }
 
diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less
index 1bfbeaf2..9771f834 100644
--- a/src/main/webapp/less/screen/layout.less
+++ b/src/main/webapp/less/screen/layout.less
@@ -56,7 +56,6 @@ body
 
 .nomenu .content > .marginal
 {
-  padding-top: 2em;
   background-color: @sehrhell;
 }
 
@@ -106,7 +105,7 @@ body
 {
   position: relative;
   width: 200%;
-  top: -9em; /** 136px */
+  top: -8em; /** 136px */
   right: 100%;
   text-align: right;
   list-style-type: none;
@@ -114,13 +113,9 @@ body
   padding: 0;
   border-style: none;
 }
-.nomenu #menu
-{
-  top: -11em; /** 2em mehr wegen 2em margin-top der Marginalspalte auf .nomenu-Seiten */
-}
 .onecolumn #menu
 {
-  top: -15.125em;
+  top: -15.5625em; /** -249px -- warum auch immer... */
 }
 #menu > li.m
 {
@@ -195,14 +190,3 @@ body
 {
   display: none;
 }
-
-
-/** Marginal-Inhalte anpassen... */
-
-.content > .marginal h1:first-child,
-.content > .marginal h2:first-child,
-.content > .marginal h3:first-child,
-.content > .marginal h4:first-child
-{
-  margin-top: 0;
-}
diff --git a/src/main/webapp/less/screen/onecolumn.less b/src/main/webapp/less/screen/onecolumn.less
new file mode 100644
index 00000000..0114499a
--- /dev/null
+++ b/src/main/webapp/less/screen/onecolumn.less
@@ -0,0 +1,11 @@
+.pack > .p.left,
+.pack > .p.right,
+.pack.bg > .p.left,
+.pack.bg > .p.right,
+.single,
+.single.bg
+{
+  width: auto;
+  padding-bottom: 1.5em;
+  margin: 0 0 1.5em 0;
+}
diff --git a/src/main/webapp/less/screen/packs.less b/src/main/webapp/less/screen/packs.less
index ed92ec80..8c09844e 100644
--- a/src/main/webapp/less/screen/packs.less
+++ b/src/main/webapp/less/screen/packs.less
@@ -6,8 +6,8 @@
 .pack > .p.right
 {
   width: 42%;
-  padding: 3% 3% 999em 3%;
-  margin: 0 0 -999em 0;
+  padding: 0 3% 999em 3%;
+  margin: 0 0 -998em 0;
 }
 .pack.bg > .p.left,
 .pack.bg > .p.right
@@ -28,7 +28,7 @@
 }
 .single
 {
-  padding: 3%;
+  padding: 0 3% 1em 3%;
   margin: 3% 0;
 }
 .single.bg
diff --git a/src/main/webapp/less/screen/typo.less b/src/main/webapp/less/screen/typo.less
deleted file mode 100644
index 7ee77c03..00000000
--- a/src/main/webapp/less/screen/typo.less
+++ /dev/null
@@ -1,8 +0,0 @@
-h1
-{
-  font-size: 187.5%; /** 30 px */
-  /** line-height: 1em;  ** 30px */
-  /** padding: 0 0 .4em 0; ** 0 0 12px 0 */
-  /** margin: 1em 0 .3em 0; ** 30px 0 9px 0 */
-  margin-top: 0;
-}
diff --git a/src/main/webapp/thymeleaf/contact.html b/src/main/webapp/thymeleaf/contact.html
index 19bbf225..7faea163 100644
--- a/src/main/webapp/thymeleaf/contact.html
+++ b/src/main/webapp/thymeleaf/contact.html
@@ -38,7 +38,7 @@
           <img class="p" src="../img/kai-moritz.jpg" th:src="@{/img/kai-moritz.jpg}" alt="Portrait"/>
         </div>
         <article class="p right">
-          <header><h1><t:getAsString name="title"/></h1></header>
+          <header><h1>Contact</h1></header>
           <h2>Address</h2>
           <p>
             Kai Moritz<br />
diff --git a/src/main/webapp/thymeleaf/index.html b/src/main/webapp/thymeleaf/index.html
index d1cd8ae2..d1ebe608 100644
--- a/src/main/webapp/thymeleaf/index.html
+++ b/src/main/webapp/thymeleaf/index.html
@@ -102,7 +102,7 @@
     <div layout:fragment="marginalcontent">
       <aside class="m">
         <div class="widget widget_recent_entries">
-          <h2 class="widgettitle">Recent Posts</h2>
+          <h1 class="widgettitle">Recent Posts</h1>
           <ul>
             <li>
               <a href="blog/article.html" th:href="@{/blog/article.html}" title="Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources">Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources</a>
-- 
2.20.1