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

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

diff --cc html/html/themes/ipfire/include/css/style.css
index 27dded11435a7e5de4c6dac08c7390cb7d837e3d,e33c6e15c4760c194f57cb3b246eefe6f4271ace..9f3e25b7a49c9d7fc828f1833973d7a03c477d38
--- 1/html/html/themes/ipfire/include/css/style.css
--- 2/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;
  }
 -.tbl tr:first-child td:only-child {
+ 
+ /* 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 {
+       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;
+ }