From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 11 Jan 2014 12:08:27 +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=30491c6ac70ce55d4bfbcec5aee6096808b3c193

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

Conflicts:
	html/html/themes/ipfire/include/css/style.css
---

30491c6ac70ce55d4bfbcec5aee6096808b3c193
diff --cc html/html/themes/ipfire/include/css/style.css
index 27dded114,e33c6e15c..9f3e25b7a
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@@ -318,3 -261,61 +261,61 @@@ input.text 
  #cssmenu .has-sub ul li:hover a {
  	background: #dddddd;
  }
+ 
+ /* This decorates all tables with class="tbl" */
+ 
+ table {
+ 	*border-collapse: collapse; /* IE7 and lower */
+ 	border-spacing: 0;
+ }
+ 
+ .tbl th {
+ 	color: #000000;
+ 	border-top: 1px solid lightgrey;
+ 	border-bottom: 1px solid lightgrey;
+ 	background: #cccccc;
+ }
+ 
+ .tbl th:first-child {
+ 	border-left: 1px solid lightgrey;
+ 	border-top: 1px solid lightgrey;
+ 	border-bottom: 1px solid lightgrey;
+ }
+ 
+ .tbl th:last-child {
+ 	border-right: 1px solid lightgrey;
+ 	border-top: 1px solid lightgrey;
+ 	border-bottom: 1px solid lightgrey;
+ }
+ 
+ .tbl th:only-child {
+ 	border: 1px solid lightgrey;
+ }
+ 
+ .tbl tr td:first-child {
+ 	border-left: 1px solid lightgrey;
+ }
+ 
+ .tbl tr td:last-child {
+ 	border-right: 1px solid lightgrey;
+ }
+ 
 -.tbl tr:first-child td:only-child {
++.tbl tr:first-child td {
+ 	border-top: 1px solid lightgrey;
+ }
+ 
+ .tbl tr:last-child td:only-child {
+ 	border-bottom: 1px solid lightgrey;
+ }
+ 
+ .tbl tr:last-child td:first-child {
+ 	border-bottom: 1px solid lightgrey;
+ }
+ 
+ .tbl tr:last-child td:last-child {
+ 	border-bottom: 1px solid lightgrey;
+ }
+ 
+ .tbl tr:last-child td {
+ 	border-bottom: 1px solid lightgrey;
+ }