From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 11 Jan 2014 11:46:56 +0000 (+0100)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=68e89a2f2828084bbe7a8fa15a16ae9626d4c74e;hp=-c

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
---

68e89a2f2828084bbe7a8fa15a16ae9626d4c74e
diff --combined html/html/themes/ipfire/include/css/style.css
index 9e40b946c,5ce21790b..27dded114
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@@ -54,7 -54,7 +54,7 @@@ table 
  	border-right: 1px solid grey;
  }
  
 -.tbl tr:first-child td:only-child {
 +.tbl tr:first-child td {
  	border-top: 1px solid grey;
  }
  
@@@ -124,7 -124,7 +124,7 @@@ h1, h2, h3, h4, h5, h6 
  	text-align: left;
  }
  
- h2, h3, h4, h5, h6 {
+ h1 {
  	color: #66000F;
  }
  
@@@ -223,7 -223,7 +223,7 @@@ iframe 
  
  #main_inner .post h2 {
  	border-bottom: dotted 1px #e1e1e1;
- 	font-size: 0.8em;
+ 	font-size: 1.6em;
  	margin-bottom: 1em;
  }