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;hp=-c

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 --combined 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
@@@ -2,7 -2,7 +2,7 @@@
  /* This controls the width of the fixed width layouts */
  
  .fixed {
- 	width: 910px !important;
+ 	width: 960px !important;
  }
  
  /* Basic Stuff */
@@@ -16,64 -16,6 +16,6 @@@ html 
  	height: 100%;
  }
  
- /* 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 grey;
- 	border-bottom: 1px solid grey;
- 	background: #cccccc;
- }
- 
- .tbl th:first-child {
- 	border-left: 1px solid grey;
- 	border-top: 1px solid grey;
- 	border-bottom: 1px solid grey;
- }
- 
- .tbl th:last-child {
- 	border-right: 1px solid grey;
- 	border-top: 1px solid grey;
- 	border-bottom: 1px solid grey;
- }
- 
- .tbl th:only-child {
- 	border: 1px solid grey;
- }
- 
- .tbl tr td:first-child {
- 	border-left: 1px solid grey;
- }
- 
- .tbl tr td:last-child {
- 	border-right: 1px solid grey;
- }
- 
- .tbl tr:first-child td {
- 	border-top: 1px solid grey;
- }
- 
- .tbl tr:last-child td:only-child {
- 	border-bottom: 1px solid grey;
- }
- 
- .tbl tr:last-child td:first-child {
- 	border-bottom: 1px solid grey;
- }
- 
- .tbl tr:last-child td:last-child {
- 	border-bottom: 1px solid grey;
- }
- 
- .tbl tr:last-child td {
- 	border-bottom: 1px solid grey;
- }
- 
  body {
  	/* SVG as background image (IE9/Chrome/Safari/Opera) */
  	background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2ODQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMTAwJSIgeTE9IjEwMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgo8c3RvcCBzdG9wLWNvbG9yPSIjMDAwMDAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjODgwNDAwIiBvZmZzZXQ9IjU3JSIvPgo8L2xpbmVhckdyYWRpZW50Pgo8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2c2ODQpIiAvPgo8L3N2Zz4=);
@@@ -113,7 -55,7 +55,7 @@@
  	background-attachment: fixed;
  
  	font-size: 9pt;
- 	font-family: "trebuchet ms", helvetica, sans-serif;
+ 	font-family: "DejaVu Sans", Helvetica, sans-serif;
  }
  
  
@@@ -180,6 -122,7 +122,7 @@@ iframe 
  	color: #fff;
  	font-size: 3.6em;
  	font-weight: bold;
+ 	padding-top: 0.2em;
  	padding-left: 1.7em;
  }
  
@@@ -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;
+ }