Update css formatting across all debian *.css files to be more consistent

Removed excessive white space, set consistent tab spacing, replaced named colours (white and black) with hex values (#fff and #000) as well as replacing padding and margin values with more compact versions where possible.

'font-awesome.css' & 'docbook.css' are the only css files not modified in this commit.

1 files changed, 284 insertions, 322 deletions

diff --git a/english/debian.css b/english/debian.css
index 36b0c537946..0abb2fa9e91 100644
--- a/english/debian.css
+++ b/english/debian.css
@@ -39,7 +39,6 @@
 */
 
 /* Reset */
-
 html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p,
 blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em,
 font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl,
@@ -56,7 +55,7 @@ tfoot, thead, tr, th, td {
 	vertical-align: baseline;
 }
 
-body            { line-height: 1; color: black; background: white; }
+body            { line-height: 1; color: #000; background: #fff; }
 ol, ul          { list-style: none; }
 table           { border-collapse: separate; border-spacing: 0; }
 blockquote, q   { quotes: "" ""; }
@@ -66,13 +65,12 @@ caption, th, td { text-align: left; font-weight: normal; }
 blockquote:before, blockquote:after, q:before, q:after { content: ""; }
 
 /* Main */
-
 body {
 	margin: 0;
 	font: normal 100% sans-serif;
 	line-height: 1.5;
 	color: #222;
-	background-color: white;
+	background-color: #fff;
 	background-image:url('Pics/gradient.png');
 	background-position: 0 0;
 	background-repeat: repeat-x;
@@ -92,29 +90,28 @@ body {
 }
 
 /* Header */
-
 #header {
-	margin:0;
-	padding:0 10px 0 52px;
+	margin: 0;
+	padding: 0 10px 0 52px;
 }
-#header a:link
-, #header a:visited
-, #second-nav a:link
-, #second-nav a:visited {
+#header a:link,
+#header a:visited,
+#second-nav a:link,
+#second-nav a:visited {
 	text-decoration: none;
 }
-#header a:hover
-, #second-nav a:hover {
+#header a:hover,
+#second-nav a:hover {
 	text-decoration: underline;
 }
 #breadcrumbs {
-	margin:0;
+	margin: 0;
 	font-size: 0.75em;
 	text-transform: lowercase;
 	line-height: 2;
 	background-color: transparent;
 	background-color: #f5f6f7;
-	border-bottom: 1px solid #d2d3d7 ;
+	border-bottom: 1px solid #d2d3d7;
 	min-height: 20px;
 }
 #breadcrumbs:before {
@@ -124,34 +121,34 @@ body {
 }
 p.section {
 	margin: 0;
-	padding: 0 5px 0 5px;
+	padding: 0 5px;
 	font-family:monospace;
 	line-height: 16px;
-	color:white;
+	color: #fff;
 	text-transform: uppercase;
 	letter-spacing: 0.08em;
 	position:absolute;
-	top: 0px;
-	left:52px;
+	top: 0;
+	left: 52px;
 	background-color: #c70036;
 }
 p.section a {
-	color: white;
+	color: #fff;
 	text-decoration: none;
 }
 p.section a:hover {
-	color:white;
+	color: #fff;
 	text-decoration: underline;
 }
 #navbar {
 	background-color: transparent;
-	list-style:none;
-	display:block;
-	border-bottom:1px solid #c70036;
-	text-indent:0;
+	list-style: none;
+	display: block;
+	border-bottom: 1px solid #c70036;
+	text-indent: 0;
 	padding: 0;
-	margin-top:0;
-	margin-bottom:0;
+	margin-top: 0;
+	margin-bottom: 0;
 }
 #navbar ul {
 	margin: 0;
@@ -166,8 +163,8 @@ p.section a:hover {
 	padding: 0;
 	margin: 0;
 }
-#navbar a:link
-, #navbar a:visited {
+#navbar a:link,
+#navbar a:visited {
 	padding: 1.75em 0.5em 0.25em 0.5em;
 	border-left: 1px solid transparent;
 	border-right: 1px solid transparent;
@@ -177,8 +174,8 @@ p.section a:hover {
 #navbar a:visited {
 	color: #54638c;
 }
-#navbar a:hover
-, #navbar a:visited:hover {
+#navbar a:hover,
+#navbar a:visited:hover {
 	background-color: #f5f6f7;
 	border-left: 1px solid  #d2d3d7;
 	border-right: 1px solid #d2d3d7;
@@ -200,13 +197,13 @@ ul.subnav li {
 	margin-right: 1em;
 }
 #searchbox {
-	text-align:left;
+	text-align: left;
 	line-height: 1;
 	margin: 0 10px 0 0.5em;
-	padding: 1px 0 1px 0;
+	padding: 1px 0;
 	position: absolute;
-	top:0;
-	right:0;
+	top: 0;
+	right: 0;
 	font-size: 0.75em;
 }
 #searchbox p {
@@ -214,13 +211,13 @@ ul.subnav li {
 	padding: 0;
 }
 #upperheader {
-	margin:0;
-	padding:0;
+	margin: 0;
+	padding: 0;
 }
 #logo {
 	position:absolute;
-	top:0;
-	left:0;
+	top: 0;
+	left: 0;
 	padding: 0;
 	background-color: transparent;
 	border: 1px solid transparent;
@@ -243,13 +240,12 @@ ul.subnav li {
 	overflow: auto;
 }
 #logo:hover {
-	border: 1px solid #d2d3d7 ;
+	border: 1px solid #d2d3d7;
 	border-top: 0;
 	background-color: #f5f6f7;
 }
 
 /* Links */
-
 a:link {
 	color: #0035c7;
 	text-decoration: underline;
@@ -265,16 +261,16 @@ a:visited:hover {
 	text-decoration: none;
 }
 a:active {
-	color:#c2c3c7;
+	color: #c2c3c7;
 }
 a img {
-	border:0;
+	border: 0;
 }
 a:link.rss_logo {
 	font-size: 0.75em;
 	float: right;
 	line-height: 10px;
-	color: #ffffff;
+	color: #fff;
 	background-color: #ff6600;
 	font-weight: bold;
 	font-family: sans-serif;
@@ -284,28 +280,22 @@ a:link.rss_logo {
 	margin-left: 0.25em;
 	border: 1px solid #ff6600;
 }
-
 a:link.rss_logo:hover {
 	background-color: white;
 	border: 1px solid #ff6600;
 	color: #ff6600;
 }
-
 a.rss_logo.generic {
 	background-color: #ff8800;
 }
-
 a.rss_logo.generic:hover {
 	background-color: #ee7700;
 }
-
 a.rss_logo::after {
 	content: none;
 }
 
-
 /* Secondnav */
-
 #second-nav {
 	width: 16em;
 	font-size: 0.75em;
@@ -313,22 +303,22 @@ a.rss_logo::after {
 	float: right;
 	top: 0;
 	right: 0;
-	margin: 3em 0 0 0;
+	margin: 3em 0 0;
 	padding: 0 0 0 1em;
-	border-left: 1px solid #d2d3d7 ;
+	border-left: 1px solid #d2d3d7;
 }
 #second-nav ul {
-	padding:0;
-	margin:0;
-	list-style:none;
+	padding: 0;
+	margin: 0;
+	list-style: none;
 }
 #second-nav ul ul {
 	margin-left: 1em;
 }
 #second-nav li {
 	font-weight: normal;
-	margin:0;
-	padding:0;
+	margin: 0;
+	padding: 0;
 }
 #second-nav p {
 	line-height: 2;
@@ -336,13 +326,12 @@ a.rss_logo::after {
 	margin: 0;
 }
 #second-nav h2 {
-	margin:0;
+	margin: 0;
 }
 
 /* Typography */
-
 p {
-	margin: 1.5em 0 1.5em 0;
+	margin: 1.5em 0;
 }
 strong {
 	font-weight: bold;
@@ -358,52 +347,46 @@ sup {
 	font-size: 0.75em;
 	vertical-align:top;
 }
-h1
-, h2
-, h3
-, h4
-, h5
-, h6 {
+h1, h2, h3, h4, h5, h6 {
 	font-weight: 600;
-	color: black;
+	color: #000;
 }
 h1 {
 	font-weight: normal;
 	font-size: 1.8em;
 	line-height: 0.83333;
-	margin: 0.83333em 0 0.83333em 0;
+	margin: 0.83333em 0;
 }
 h2 {
 	font-size: 1.4em;
 	font-weight: normal;
 	line-height: 1.0714286;
-	margin: 1.0714286em 0 1.0714286em 0;
+	margin: 1.0714286em 0;
 }
 h3 {
 	font-size: 1.125em;
 	line-height: 1.333em;
-	margin: 1.333em 0 0 0;
+	margin: 1.333em 0 0;
 }
 h4 {
 	font-weight: normal;
 	font-style: italic;
-	margin: 1.5em 0 1.5em 0;
+	margin: 1.5em 0;
 	color: #444;
 }
 h5 {
 	font-style: italic;
 	font-size: 0.75em;
-	margin: 2em 0 2em 0;
+	margin: 2em 0;
 }
 ol,ul {
 	padding-left: 1.5em;
-	margin-left:0;
-	margin: 1.5em 0 1.5em 0;
+	margin-left: 0;
+	margin: 1.5em 0;
 }
 ol>ol, ul>ul, li>ol, li>ul {
 	margin: 0;
 }
-
 ol {
 	list-style-type: decimal;
 }
@@ -412,38 +395,38 @@ ul {
 }
 th {
 	font-weight: bold;
-	margin: 1.5em 0 1.5em 0;
+	margin: 1.5em 0;
 }
 hr {
 	border: none;
 	background-color: #bbb;
 	height: 1px;
-	margin: 1.4375em 0 1.5em 0;
+	margin: 1.4375em 0 1.5em;
 }
 pre {
-	margin: 1.5em 0 1.5em 0;
+	margin: 1.5em 0;
 	overflow: auto;
 	font-family: monospace;
 	white-space: pre;
-	color: black;
+	color: #000;
 }
 tt, kbd, code {
 	font-family: monospace;
 	/* see https://lists.debian.org/debian-www/2011/08/msg00181.html */
 	/* white-space: pre; */
-	color: black;
+	color: #000;
 }
 var {
 	font-family: monospace;
 	font-style: italic;
-	color: black;
+	color: #000;
 }
 dt {
-	margin: 1.5em 0 0 0;
+	margin: 1.5em 0 0;
 	font-weight: bold;
 }
 dd {
-	margin:  0 0 0 1.5em;
+	margin: 0 0 0 1.5em;
 }
 blockquote {
 	font-size: 0.75em;
@@ -466,19 +449,19 @@ acronym, abbr {
 	line-height:1.833;
 	padding: 0;
 	max-width: 62%;
-	margin: 2em 0 2em 0;
+	margin: 2em 0;
 }
 .toc li {
 	border-top: dotted grey;
 	border-width: 1px;
-	padding: 0.0833em 0 0.0833em 0;
+	padding: 0.0833em 0;
  }
 .toc a {
-	display:block;
+	display: block;
 	text-decoration: none;
 }
 .toc a:hover {
-	display:block;
+	display: block;
 	background-color: #f0f0f4;
 	text-decoration: underline;
 }
@@ -486,41 +469,39 @@ acronym, abbr {
 	margin: 0;
 	border-top: dotted grey;
 	border-width: 1px;
-	padding: 0.0833em 0 0.0833em 0;
+	padding: 0.0833em 0;
 }
 
 /* Sitemap */
-
 .card {
-	clear:both;
-	margin:1.5em 0 1.5em 0;
+	clear: both;
+	margin: 1.5em 0;
 	background-position: 0 -50px;
 	background-repeat: repeat-x;
-	padding:0;
+	padding: 0;
 }
 .card ul {
 }
 .card ul li {
-	list-style:none;
+	list-style: none;
 }
 .card h2 {
 }
 .lefthalf {
-	float:left;
+	float: left;
 }
 .righthalf {
-	margin-left:50%;
+	margin-left: 50%;
 }
 .lefthalf ul {
-	margin-top:0;
+	margin-top: 0;
 }
 
 /* Footer */
-
 #footer {
 	font-size: 0.75em;
 	border: 1px solid #dfdfe0;
-	padding:1em;
+	padding: 1em;
 	background-color: #f5f6f7;
 	margin: 0 10px 0 52px;
 	line-height: 1.5em;
@@ -532,11 +513,11 @@ acronym, abbr {
 	margin-left: 0;
 }
 #footer p {
-	margin: 1em 0 1em 0;
+	margin: 1em 0;
 }
 #footer hr {
 	border-top: 1px solid #d2d3d7;
-	border-bottom: 1px solid white;
+	border-bottom: 1px solid #fff;
 	height: 0;
 }
 #footer .editbar li {
@@ -550,70 +531,70 @@ acronym, abbr {
 }
 #footermap {
 	list-style:none;
-	margin: 0 0 0 0;
+	margin: 0;
 	padding: 0;
-	width:100%;
+	width: 100%;
 	overflow: hidden;
 	border: 0;
 }
-ul#footermap-cola a
-, ul#footermap-colb a
-, ul#footermap-colc a
-, ul#footermap-cold a
-, ul#footermap-cole a {
+ul#footermap-cola a,
+ul#footermap-colb a,
+ul#footermap-colc a,
+ul#footermap-cold a,
+ul#footermap-cole a {
 	padding-left: 0;
 }
-ul#footermap-cola
-, ul#footermap-colb
-, ul#footermap-colc
-, ul#footermap-cold
-, ul#footermap-cole {
-	float:left;
+ul#footermap-cola,
+ul#footermap-colb,
+ul#footermap-colc,
+ul#footermap-cold,
+ul#footermap-cole {
+	float: left;
 	width: 19%;
 	min-width: 11em;
-	height: 15em;		/* Update when adding items */
-	margin:0 1% 0 0;
-	padding: 2em 0 0 0;
+	height: 15em;	/* Update when adding items */
+	margin: 0 1% 0 0;
+	padding: 2em 0 0;
 	list-style: none;
 }
 ul#footermap-cole {
 	width: 18.9%;
-	margin-right:0;
+	margin-right: 0;
 }
 #footermap-wrap {
-	padding:2em;
-	border-top: 1px solid white;
+	padding: 2em;
+	border-top: 1px solid #fff;
 }
 #footermap a {
 	margin: 0;
 }
 #footermap ul{
 	list-style: none;
-	padding:0;
+	padding: 0;
 }
 #footermap li {
-	text-indent:0;
+	text-indent: 0;
 	background-color: transparent;
-	font-weight:bold;
+	font-weight: bold;
 }
 #footermap li ul {
 	margin: 0;
 	padding: 0;
 }
 #footermap li li {
-	margin:0;
-	text-indent:0;
-	padding:0;
-	font-weight:normal;
-	border:0;
-	background-image:none;
-	background-color:transparent;
+	margin: 0;
+	text-indent: 0;
+	padding: 0;
+	font-weight: normal;
+	border: 0;
+	background-image: none;
+	background-color: transparent;
 }
 #serverselect {
 }
-#serverselect input
-, #serverselect option
-, #serverselect select {
+#serverselect input,
+#serverselect option, 
+#serverselect select {
 }
 #serverselect ul {
 	display: inline;
@@ -622,103 +603,98 @@ ul#footermap-cole {
 #serverselect li {
 	list-style: none;
 	display: inline;
-	padding:0 1em 0 1em;
-	margin:0;
+	padding: 0 1em;
+	margin: 0;
 }
 #serverselect form p {
-	margin:0;
-	padding:0;
+	margin: 0;
+	padding: 0;
 	line-height: 1;
 }
 .lcol50 {
 	float: left;
 	width: 49%;
-	font-size:0.75em;
-	margin:0 0 0 0;
-	padding:0 0.5em 0 0;
+	font-size: 0.75em;
+	margin: 0;
+	padding: 0 0.5em 0 0;
 }
 .lcol50 h2 {
-	margin-top:0;
+	margin-top: 0;
 }
 .rcol50 {
 	margin:0 0 0 51%;
-	padding:0;
-	font-size:0.75em;
+	padding: 0;
+	font-size: 0.75em;
 }
 #pageLang {
-	position: relative;	/*  establish a containing box. needed for
-				    langContainer */
+	position: relative;	/* establish a containing box. needed for langContainer */
 }
 form#pageLang {
 	display: inline;
 }
 
 /* Extras */
-
 input:focus {
-	background-color:#FFFFCB;
-
+	background-color:#ffffcb;
 }
 .hidecss {
 	display: none;
 }
 .clear {
-	clear:both
+	clear: both;
 }
 #clear {
-	clear:both;
-	border:0;
-	height:1px;
-	display:block;
+	clear: both;
+	border: 0;
+	height: 1px;
+	display: block;
 }
 .quicklist {
 	list-style: none;
 	font-size: 0.75em;
-	margin: 2em 0 2em 0;
-	padding:0;
-	text-indent:0;
+	margin: 2em 0;
+	padding: 0;
+	text-indent: 0;
 	line-height: 2em;
 }
 .quicklist li  {
-	display:inline;
+	display: inline;
 }
 .item p{
 	margin: 0;
 }
-.item h2
-, .item p
-, .item ul{
-	margin-right: 10px
+.item h2,
+.item p,
+.item ul{
+	margin-right: 10px;
 }
-.item h2
-, .item h3
-, .item h4
-, .item h5 {
+.item h2,
+.item h3,
+.item h4,
+.item h5 {
 	margin-top: 0;
 }
 .line {
 	padding: 0;
 	width: auto;
 	overflow: hidden;
-	}
+}
 div.downloads {
 	border-top: 0.17em solid #339900;
-	margin: 1.33em 0 0 0;
+	margin: 1.33em 0 0;
 }
 .downloads ul.downlist {
-	margin:0;
+	margin: 0;
 }
 div.downloads .col50 {
 	border-top: 0.15em solid #339900;
 }
 ul.downlist {
 	padding-left: 30px;
-	text-indent:0;
+	text-indent: 0;
 	background: url('Pics/emblem-downloads.png') no-repeat 0 0.15em;
 	min-height: 23px;
-	/*
-	 * border-top: 0.17em solid #339900;
-	 */
+/*border-top: 0.17em solid #339900; */
 }
 ul.quicklist.downlist {
 	border-top: 0.17em solid #339900;
@@ -740,26 +716,26 @@ ul.downlist li a {
 	white-space: nowrap;
 }
 
-div.tip
-, div.important
-, div.warning
-, div.note
-, div.trans-note {
-	padding:0 2em 0 4em;
+div.tip,
+div.important,
+div.warning,
+div.note,
+div.trans-note {
+	padding: 0 2em 0 4em;
 	margin: 1.85em 0 1.85em 0;
 	background-repeat: no-repeat;
 	background-position: 0.5em 0.5em;
 	font-size: 0.75em;
 	line-height: 2em;
-	background-color:#FFFFCB;
-	border:0.15em solid #CCCCA3;
+	background-color: #ffffcb;
+	border: 0.15em solid #cccca3;
 }
-div.tip p
-, div.important p
-, div.warning p
-, div.note p
-, div.trans-note p {
-	margin: 1em 0 1em 0;
+div.tip p,
+div.important p,
+div.warning p,
+div.note p,
+div.trans-note p {
+	margin: 1em 0;
 }
 div.tip {
 	background-image: url('Pics/admon-tip.png');
@@ -770,32 +746,30 @@ div.important{
 div.warning {
 	background-image: url('Pics/admon-warning.png');
 }
-div.note
-, div.trans-note  {
+div.note, div.trans-note  {
 	background-image: url('Pics/admon-note.png');
 }
 
 /* Layout Elements */
-
-.col50
-, .cardleft
-, .cardright {
-	width:47.5%;
+.col50, 
+.cardleft,
+.cardright {
+	width: 47.5%;
 	float: left;
 	padding-bottom: 1.5em;
 }
-.lastcol
-, .cardright {
+.lastcol,
+.cardright {
 	margin: auto;
 	width: 47.5%;
-	float:left;
+	float: left;
 	padding-right: 0;
 	margin-left: 5%;
 }
-.lastcol h2
-, .lastcol p
-, .lastcol ul {
-	margin-right:0;
+.lastcol h2,
+.lastcol p,
+.lastcol ul {
+	margin-right: 0;
 }
 .cardleft h2 {
 	margin-right: 1em;
@@ -807,7 +781,7 @@ div.note
 	margin-left: 1em;
 }
 .votemenu a {
-	display:block;
+	display: block;
 }
 table.vote td, table.vote th {
 	padding-right: 1.5em;
@@ -816,7 +790,7 @@ table.vote td, table.vote th {
 	margin-right: 14em;
 }
 div.tabular table, table.tabular, table.vendors {
-/*	border-bottom: 1px solid #a9abb3;
+/*border-bottom: 1px solid #a9abb3;
 	border-top: 1px solid #a9abb3; */
 	border-bottom: 0.15em solid #666;
 	border-top: 0.15em solid #666;
@@ -824,9 +798,8 @@ div.tabular table, table.tabular, table.vendors {
 	margin-bottom: 4em;
 	margin-top: -0.169em;
 	text-align: left;
-	width: 80%
+	width: 80%;
 }
-
 table td {
 	padding-right: 1.5em;
 	padding-bottom: 0.5em;
@@ -844,12 +817,13 @@ table th {
 	padding-top: 0.5em;
 	line-height: 1.5em;
 }
-
 div.tabular table td, table.tabular td, table.vendors td {
 	border-top: dotted grey;
 	border-width: 1px;
 }
-div.tabular table > td:first-child, table.tabular > td:first-child, table.vendors  > td:first-child {
+div.tabular table > td:first-child,
+table.tabular > td:first-child,
+table.vendors > td:first-child {
 	background-image: none;
 }
 #pageLang p, #pageLang form {
@@ -860,37 +834,36 @@ div.tabular table > td:first-child, table.tabular > td:first-child, table.vendor
 	margin-right: 1em;
 }
 #langSelector {
-/*	color: #0035c7; */
-/*	text-decoration: underline; */
+/*color: #0035c7;
+	text-decoration: underline; */
 }
 #langSelector:hover {
-/*	cursor: pointer; */
-/*	text-decoration: none; */
+/*cursor: pointer;
+	text-decoration: none; */
 }
 #langContainer {
 	padding-top: 0.5em;
-/*	background-color: #f5f6f7;
-	background-color: white;
+/*background-color: #f5f6f7;
+	background-color: #fff;
 	background-image:url('Pics/gradient-flipped.png');
 	background-position: bottom;
 	background-repeat: repeat-x;
 	display: none;
 	position: absolute;
 	left: -1em;
-	padding: 0.5em 1em 1em 1em;
+	padding: 0.5em 1em 1em;
 	margin-right: -1em;
 	border-bottom: 1px solid #dfdfe0;
-	min-width: 100%; */     /* make it reach the right edge if only a few
-				   languages are available */
+	min-width: 100%; */	/* make it reach the right edge if only a few languages are available */
 }
 #langContainer a {
 	margin-right: 1em;
 }
 #pageLang:hover #langContainer {
-    display: block;
+	display: block;
 }
 .partnerlogo {
-    max-width: 200px;
+	max-width: 200px;
 }
 
 /* for l10n-arabic */
@@ -898,116 +871,106 @@ div.tabular table > td:first-child, table.tabular > td:first-child, table.vendor
 	direction: rtl;
 	text-align: right;
 }
-
 ul.nodecoration {
 	list-style: none;
 	padding: 0;
 }
 
-
-/*
- * For form
- */
-
+/* For form */
 .action-block-form {
-    margin-left: 4em;
+	margin-left: 4em;
 }
 
-
-/*
- * For small screens
- */
-
+/* For small screens */
 @media only screen and (max-width: 38em) {
-
-    div#header {
-        margin: 0 2px 0 2px;
-        padding: 0;
-    }
-    div#logo {
-        position: relative;
-        top: 0;
-        height: auto;
-        margin: 0;
-        padding: 0;
-        min-height: 0;
-    }
-    div#logo a {
-        height: auto;
-        height: 61px;
-    }
-    div#logo a img {
-        margin: 0;
-        padding: 0;
-        display: block;
-    }
-    #upperheader p.section {
-        left: 70px;
-        top: 0;
-    }
-    div#searchbox {
-        position: relative;
-        margin: -31px 0 0 60px;
-        float: right;
-        bottom: 0;
-        padding: 0;
-    }
-    div#searchbox input[name="P"] {
-        width: 200px;
-    }
-    div#navbar {
-        display: block;
-        position: relative;
-        clear: both;
-    }
-    #navbar ul {
-        min-height: 1.5em;
-        display: block;
-    }
-    #navbar li {
-        display: inline;
-        float: none;
-        margin: 0;
-        padding: 0;
-    }
-    div#navbar a:link, div#navbar a:visited {
-        display: inline;
-        margin: 0 1.5em 0 0;
-        padding: 0.25em 0 0.25em 0;
-        border: 0;
-        background-color: transparent;
-    }
-    div#content {
-        margin: 0 2px 0 2px;
-    }
-    ul.toc {
-        max-width: none;
-    }
-    div#maincol {
-        margin-right: 0;
-    }
-    div.tip, div.important, div.warning, div.note, div.trans-note {
-        overflow: hidden;
-    }
-    div.trans-note {
-        position: relative;
-        top: 0;
-        right: 0;
-        left: 0;
-        margin: 0;
-        background-image: none;
-        padding: 0;
-        padding-left: 1em;
-    }
-    div#second-nav {
-        margin-left: 1em;
-        width: auto;
-    }
-    div#footer {
-        margin-left: 10px;
-        padding-left: 0;
-        padding-right: 0;
-    }
+	div#header {
+		margin: 0 2px;
+		padding: 0;
+	}
+	div#logo {
+		position: relative;
+		top: 0;
+		height: auto;
+		margin: 0;
+		padding: 0;
+		min-height: 0;
+	}
+	div#logo a {
+		height: auto;
+		height: 61px;
+	}
+	div#logo a img {
+		margin: 0;
+		padding: 0;
+		display: block;
+	}
+	#upperheader p.section {
+		left: 70px;
+		top: 0;
+	}
+	div#searchbox {
+		position: relative;
+		margin: -31px 0 0 60px;
+		float: right;
+		bottom: 0;
+		padding: 0;
+	}
+	div#searchbox input[name="P"] {
+		width: 200px;
+	}
+	div#navbar {
+		display: block;
+		position: relative;
+		clear: both;
+	}
+	#navbar ul {
+		min-height: 1.5em;
+		display: block;
+	}
+	#navbar li {
+		display: inline;
+		float: none;
+		margin: 0;
+		padding: 0;
+	}
+	div#navbar a:link, div#navbar a:visited {
+		display: inline;
+		margin: 0 1.5em 0 0;
+		padding: 0.25em 0;
+		border: 0;
+		background-color: transparent;
+	}
+	div#content {
+		margin: 0 2px;
+	}
+	ul.toc {
+		max-width: none;
+	}
+	div#maincol {
+		margin-right: 0;
+	}
+	div.tip, div.important, div.warning, div.note, div.trans-note {
+		overflow: hidden;
+	}
+	div.trans-note {
+		position: relative;
+		top: 0;
+		right: 0;
+		left: 0;
+		margin: 0;
+		background-image: none;
+		padding: 0;
+		padding-left: 1em;
+	}
+	div#second-nav {
+		margin-left: 1em;
+		width: auto;
+	}
+	div#footer {
+		margin-left: 10px;
+		padding-left: 0;
+		padding-right: 0;
+	}
 }
 
 /* aside used for pics aside text */
@@ -1015,17 +978,16 @@ aside {
 	float: right;
 	width: 30%;
 	margin: 0 1.5%;
-        padding-left: 10px;
-        padding-right: 10px;
+	padding-left: 10px;
+	padding-right: 10px;
 	font-style: italic;
 	background-color: #d2d3d7;
 }
-
 aside.light {
 	float: right;
 	width: 20%;
-        margin: 0 1.5%;
+	margin: 0 1.5%;
 	padding: 15px;
 	text-align: center;
-        background-color: #ffffff;
+	background-color: #fff;
 }