rough styling of headings (#9)

2 files changed, 34 insertions, 17 deletions

diff --git a/css/basic.css b/css/basic.css
index 793f5cca0..c3ea29ebe 100755
--- a/css/basic.css
+++ b/css/basic.css
@@ -37,8 +37,7 @@ body {
 h1, h2, h3, h4, h5, h6,
 caption, legend {
     font-family: Arial, sans-serif;
-    font-weight: normal;
-    color: #000;/* @todo: style.ini */
+    font-weight: bold;
     background-color: inherit;
     padding: 0;
     line-height: 1.2;
@@ -47,17 +46,39 @@ caption, legend {
 
 h1 {
     font-size: 2em;
-    margin: 0 0 0.444em;
-    letter-spacing: -0.035em;
-    /*2 lines below makes ascenders of h1 be at the top of block*/
+    margin: -.222em 0 0.444em;
+    /*2 lines below makes ascenders of h1 be at the top of block
     line-height: 0.75;
     padding-bottom: 0.3em;
+    letter-spacing: -0.035em;
+    margin: 0 0 0.444em;
+    */
+}
+h2 {
+    font-size: 1.5em;
+    margin: 0 0 0.666em;
+    /*
+    border-bottom: 1px dashed #888;
+    margin: 0 0 .444em -1px;
+    padding: 0 0 .222em 1px;
+    */
+}
+h3 {
+    font-size: 1.125em;
+    margin: 0 0 0.888em;
+}
+h4 {
+    font-size: 1em;
+    margin: 0 0 1.0em;
+}
+h5 {
+    font-size: .875em;
+    margin: 0 0 1.1428em;
+}
+h6 {
+    font-size: .75em;
+    margin: 0 0 1.333em;
 }
-h2 { font-size: 1.5em;   margin: 0 0 0.666em; }
-h3 { font-size: 1.125em; margin: 0 0 0.888em; }
-h4 { font-size: 1em;     margin: 0 0 1.0em; }
-h5 { font-size: .875em;  margin: 0 0 1.1428em; }
-h6 { font-size: .75em;   margin: 0 0 1.333em; }
 /* bottom margin = 1 / font-size */
 
 
diff --git a/css/design.css b/css/design.css
index d32bc711b..47b5990b0 100755
--- a/css/design.css
+++ b/css/design.css
@@ -28,16 +28,13 @@
     padding-top: 10px;
 }
 #dokuwiki__header h1 {
-    margin-bottom: 0;
+    margin: 0;
     font-size: 1.5em;
-    /*
-    text-shadow: 1px 1px 0px #fff;
-    */
+    font-weight: normal;
 }
 #dokuwiki__header h1 a {
     text-decoration: none;
-    /* @todo: style.ini */
-    color: #000;
+    color: __text__;
     background-color: inherit;
 }
 #dokuwiki__header h1 a:hover,
@@ -46,7 +43,6 @@
 }
 #dokuwiki__header p.claim {
     margin-bottom: 0;
-    /*color: __text_neu__;*/
     font-size: 0.875em;
 }