From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 5 Feb 2011 10:54:20 +0000 (+0100)
Subject: move some files around
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=9299914bca023cf6a69a825e93a5c083c431b4ba;p=mirror%2Fdsa-wiki.git

move some files around
---

diff --git a/input/debian.css b/input/debian.css
new file mode 100644
index 0000000..fcef8be
--- /dev/null
+++ b/input/debian.css
@@ -0,0 +1,832 @@
+/*
+	http://www.debian.org Stylesheet
+
+	Copyright 2011 Kalle Söderman
+
+	This stylesheet is free software; you can redistribute it and/or modify it
+	under the terms of the GNU General Public License, version 2, as published by
+	the Free Software Foundation.
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY
+	WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+	PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License along with
+	this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
+	Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+	The license text can also be found at http://www.gnu.org/copyleft/gpl.html and
+	/usr/share/common-licenses/GPL-2 on Debian GNU/Linux.  
+*/
+	
+/*	
+	Font size table (Browser default 16px)
+
+	pixels      relative
+	--------------------
+	36px        2.25em
+	31px        0.5161em
+	24px        1.5em
+	21px        1.3125em
+	18px        1.125em
+	16px        1em
+	14px        0.875em
+	12px        0.75em
+	11px        0.6875em
+	10px        0.625em
+	9px         0.5625em
+	--------------------
+*/
+
+/* 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,
+dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody,
+tfoot, thead, tr, th, td { 
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-weight: inherit;
+	font-style: inherit;
+	font-size: 100%;
+	font-family: inherit;
+	vertical-align: baseline;
+}
+
+body            { line-height: 1; color: black; background: white; }
+ol, ul          { list-style: none; }
+table           { border-collapse: separate; border-spacing: 0; }
+blockquote, q   { quotes: "" ""; }
+html            { background-color: transparent; }
+:focus          { outline: 0; }
+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-image:url('Pics/gradient.png');
+	background-position: 0 0;
+	background-repeat: repeat-x;
+	/* Uncomment to show baseline grid 
+	background-image: url('24grid.png');
+	background-position: 30px 9px; 
+	*/
+}
+#content {
+	margin: 0 10px 0 52px;
+}
+#inner {
+	position: relative;
+}
+#maincol {
+	margin: 0 15em 1.5em 0;
+}
+
+/* Header */
+
+#header {
+	margin:0;
+	padding:0 10px 0 52px; 
+}
+#header a:link
+, #header a:visited
+, #second-nav a:link
+, #second-nav a:visited {
+	text-decoration: none;
+}
+#header a:hover
+, #second-nav a:hover {
+	text-decoration: underline;
+}
+#breadcrumbs {
+	margin:0;
+	font-size: 0.75em;
+	text-transform: lowercase;
+	line-height: 2;
+	background-color: transparent;
+	background-color: #f5f6f7;
+	border-bottom: 1px solid #d2d3d7 ;
+	min-height: 20px;
+}
+#breadcrumbs:before {
+	content: "/";
+	margin-left: 0.5em;
+	margin-right: 0.5em;
+}
+p.section {
+	margin: 0;
+	padding: 0 5px 0 5px;
+	font-family:monospace;
+	line-height: 16px;
+	color:white;
+	text-transform: uppercase;
+	letter-spacing: 0.08em;
+	position:absolute;
+	top: 0px;
+	left:52px;
+	background-color: #c70036;
+}
+p.section a {
+	color: white;
+	text-decoration: none;
+}
+p.section a:hover {
+	color:white;
+	text-decoration: underline;
+}
+#navbar {
+	background-color: transparent;
+	list-style:none;
+	display:block;
+	border-bottom:1px solid #c70036;
+	text-indent:0;
+	padding: 0;
+	margin-top:0;
+	margin-bottom:0;
+}
+#navbar ul {
+	margin: 0;
+	padding: 0;
+	clear: both;
+	overflow: hidden;
+	min-height: 45px;
+}
+#navbar li {
+	list-style: none;
+	float: left;
+	padding: 0;
+	margin: 0;
+}
+#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;
+	display: block;
+	text-decoration: none;
+}
+#navbar a:visited {
+	color: #54638c;
+}
+#navbar a:hover
+, #navbar a:visited:hover {
+	background-color: #f5f6f7;
+	border-left: 1px solid  #d2d3d7;
+	border-right: 1px solid #d2d3d7;
+	text-decoration: underline;
+}
+ul.subnav {
+	list-style: none;
+	margin-left: 0;
+	padding-left: 0;
+	margin-top: 0;
+}
+ul.subnav li {
+	display: inline;
+	margin-right: 1em;
+}
+#searchbox {
+	text-align:left;
+	line-height: 1;
+	margin: 0 10px 0 0.5em;
+	padding: 1px 0 1px 0;
+	position: absolute;
+	top:0;
+	right:0;
+	font-size: 0.75em;
+}
+#searchbox p {
+	margin: 0;
+	padding: 0;
+}
+#upperheader {
+	margin:0;
+	padding:0;
+}
+#logo {
+	position:absolute;
+	top:0;
+	left:0;
+	padding: 0;
+	background-color: transparent;
+	border: 1px solid transparent;
+	border-top: 0;
+	width: 50px;
+	height: 5.07em;
+	min-height: 65px;
+}
+#logo a {
+	display: block;
+	position: relative;
+	padding: 0;
+	height: 100%;
+	min-height: 65px;
+}
+#logo img {
+	margin-top: 5px;
+	position: absolute;
+	bottom: 0.3em;
+	overflow: auto;
+}
+#logo:hover {
+	border: 1px solid #d2d3d7 ;
+	border-top: 0;
+	background-color: #f5f6f7;
+}
+
+/* Links */
+
+a:link {
+	color: #0035c7;
+	text-decoration: underline;
+}
+a:visited {
+	color: #54638c;
+}
+a:link:hover {
+	text-decoration: none;
+	color: #00207a;
+}
+a:visited:hover {
+	text-decoration: none;
+}
+a:active {
+	color:#c2c3c7;
+}
+a img {
+	border:0;
+}
+a.rss_logo {
+	font-size: 0.75em;
+	float: right;
+	width: 35px;
+	line-height: 10px;
+	color: #ffffff;
+	background-color: #ff6600;
+	font-weight: bold;
+	font-family: sans-serif;
+	text-align: center;
+	text-decoration: none;
+	padding: 0.25em;
+	margin-left: 0.25em;
+	border: 1px solid #ff6600;
+}
+
+a.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;
+}
+
+
+/* Secondnav */
+
+#second-nav {
+	width: 16em;
+	font-size: 0.75em;
+	line-height: 1.5;
+	float: right;
+	top: 0;
+	right: 0;
+	margin: 3em 0 0 0;
+	padding: 0 0 0 1em;
+	border-left: 1px solid #d2d3d7 ;
+}
+#second-nav ul {
+	padding:0;
+	margin:0;
+	list-style:none;
+}
+#second-nav ul ul {
+	margin-left: 1em;
+}
+#second-nav li {
+	font-weight: normal;
+	margin:0;
+	padding:0;
+}
+#second-nav p {
+	line-height: 2;
+	font-weight: bold;
+	margin: 0;
+}
+#second-nav h2 {
+	margin:0;
+}
+
+/* Typography */
+
+p {
+	margin: 1.5em 0 1.5em 0;
+}
+strong {
+	font-weight: bold;
+}
+em {
+	font-style: italic;
+	color: #444;
+}
+small {
+	font-size: 0.75em;
+}
+sup {
+	font-size: 0.75em;
+	vertical-align:top;
+}
+h1
+, h2
+, h3
+, h4
+, h5
+, h6 {
+	font-weight: 600;
+	color: black;
+}
+h1 {
+	font-weight: normal;
+	font-size: 1.8em;
+	line-height: 0.83333;
+	margin: 0.83333em 0 0.83333em 0;
+}
+h2 {
+	font-size: 1.4em;
+	font-weight: normal;
+	line-height: 1.0714286;
+	margin: 1.0714286em 0 1.0714286em 0;
+}
+h3 {
+	font-size: 1.125em;
+	line-height: 1.333em;
+	margin: 1.333em 0 0 0;
+}
+h4 {
+	font-weight: normal;
+	font-style: italic;
+	margin: 1.5em 0 1.5em 0;
+	color: #444;
+}
+h5 {
+	font-style: italic;
+	font-size: 0.75em;
+	margin: 2em 0 2em 0;
+}
+ol,ul {
+	padding-left: 1.5em;
+	margin-left:0;
+	margin: 1.5em 0 1.5em 0;
+}
+ol>ol, ul>ul, li>ol, li>ul {
+	margin: 0;
+}
+
+ol {
+	list-style-type: decimal;
+}
+ul {
+	list-style-type: disc;
+}
+th {
+	font-weight: bold;
+	margin: 1.5em 0 1.5em 0;
+}
+hr {
+	border: none;
+	background-color: #bbb;
+	height: 1px;
+	margin: 1.4375em 0 1.5em 0;
+}
+pre {
+	margin: 1.5em 0 1.5em 0;
+	overflow: auto;
+	font-family: monospace;
+	white-space: pre;
+	color: black;
+}
+tt, code {
+	font-family: monospace;
+	white-space: pre;
+	color: black;
+}
+dt {
+	margin: 1.5em 0 0 0;
+	font-weight: bold;
+}
+dd {
+	margin:  0 0 0 1.5em;
+}
+blockquote {
+	font-size: 0.75em;
+	margin: 2em;
+	line-height: 2;
+}
+cite {
+	font-style: italic;
+	color: #444;
+}
+acronym, abbr {
+	text-transform: uppercase;
+	font-size: 0.9em;
+}
+.toc {
+	font-size: 0.75em;
+	list-style:none;
+	background-image: url('Pics/greydot.png');
+	background-position: bottom left;
+	background-repeat: repeat-x;
+	line-height:1.833;
+	padding: 0;
+	max-width: 62%;
+	margin: 2em 0 2em 0;
+}
+.toc li {
+	background-image: url('Pics/greydot.png');
+	background-position: top left;
+	background-repeat: repeat-x;
+	padding: 0.0833em 0 0.0833em 0;
+ }
+.toc a {
+	display:block;
+	text-decoration: none;
+}
+.toc a:hover {
+	display:block;
+	background-color: #f0f0f4;
+	text-decoration: underline;
+}
+.toc dt {
+	margin: 0;
+	background-image: url('Pics/greydot.png');
+	background-position: top left;
+	background-repeat: repeat-x;
+	padding: 0.0833em 0 0.0833em 0;
+}
+
+/* Sitemap */
+
+.card {
+	clear:both;
+	margin:1.5em 0 1.5em 0;
+	background-position: 0 -50px;
+	background-repeat: repeat-x;
+	padding:0;
+}
+.card ul {
+}
+.card ul li {
+	list-style:none;
+}
+.card h2 {
+}
+.lefthalf {
+	float:left;
+}
+.righthalf {
+	margin-left:50%;
+}
+.lefthalf ul {
+	margin-top:0;
+}
+
+/* Footer */
+
+#footer {
+	font-size: 0.75em;
+	border: 1px solid #dfdfe0;
+	padding:1em;
+	background-color: #f5f6f7;
+	margin: 0 10px 0 52px;
+	line-height: 1.5em;
+	border-left: 0;
+	border-right: 0;
+}
+#content #footer {
+	margin-left: 0;
+}
+#footer p {
+	margin: 1em 0 1em 0;
+}
+#footer hr {
+	border-top: 1px solid #d2d3d7;
+	border-bottom: 1px solid white;
+	height: 0;
+}
+#footer .editbar li {
+	display: inline;
+	margin-right: 2em;
+}
+#footer .info {
+}
+#fineprint {
+	margin-bottom: 1em;
+}
+#footermap {
+	list-style:none;
+	margin: 0 0 0 0;
+	padding: 0;
+	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 {
+	padding-left: 0;
+}
+ul#footermap-cola
+, ul#footermap-colb
+, ul#footermap-colc
+, ul#footermap-cold
+, ul#footermap-cole {
+	float:left;
+	width: 19%;
+	min-width: 11em;
+	height: 12em;		/* Update when adding items */
+	margin:0 1% 0 0;
+	padding: 2em 0 0 0;
+	list-style: none;
+}
+ul#footermap-cole {
+	width: 18.9%;
+	margin-right:0;
+}
+#footermap-wrap {
+	padding:2em;
+	border-top: 1px solid white;
+}
+#footermap a {
+	margin: 0;
+}
+#footermap ul{
+	list-style: none;
+	padding:0;
+}
+#footermap li {
+	text-indent:0;
+	background-color: transparent;
+	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;
+}
+#serverselect {
+}
+#serverselect input
+, #serverselect option 
+, #serverselect select {
+}
+#serverselect ul {
+	display: inline;
+	margin-left: 2em;
+}
+#serverselect li {
+	list-style: none;
+	display: inline;
+	padding:0 1em 0 1em;
+	margin:0;
+}
+#serverselect form p {
+	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;
+}
+.lcol50 h2 {
+	margin-top:0;
+}
+.rcol50 {
+	margin:0 0 0 51%;
+	padding:0;
+	font-size:0.75em;
+}
+form#pageLang {
+	display: inline;
+}
+
+/* Extras */
+
+input:focus {
+	background-color:#FFFFCB;
+	
+}
+.hidecss {
+	display: none;
+}
+.clear {
+	clear:both
+}
+#clear {
+	clear:both;
+	border:0;
+	height:1px;
+	display:block;
+}
+.quicklist:before {
+	content: "Quick Links: ";
+	font-weight: bold;
+}
+.quicklist {
+	list-style: none;
+	font-size: 0.75em;
+	margin: 2em 0 2em 0;
+	padding:0;
+	text-indent:0;
+	line-height: 2em;
+}
+.quicklist li  {
+	display:inline;
+}
+.item p{
+	margin: 0;
+}
+.item h2
+, .item p
+, .item ul{
+	margin-right: 10px 
+}
+.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; 
+}
+.downloads ul.downlist {
+	margin:0;
+}
+div.downloads .col50 { 
+	border-top: 0.15em solid #339900;
+}
+ul.downlist {
+	padding-left: 30px;
+	text-indent:0;
+	background: url('Pics/emblem-downloads.png') no-repeat 0 0.15em;
+	/* 
+	 * border-top: 0.17em solid #339900;
+	 */
+}
+ul.quicklist.downlist {
+	border-top: 0.17em solid #339900;
+	padding-top: 0.25em;
+	margin-top: 1.6em;
+}
+ul.downlist li {
+	display: inline;
+}
+ul.downlist li:after {
+	content: ', ';
+}
+ul.downlist li:last-child:after {
+	content: '';
+}
+div.tip
+, div.important
+, div.warning
+, div.note 
+, p.trans-note {
+	padding:0 2em 0 4em;
+	margin: 1.85em 0 1.85em 0;
+	background-repeat: no-repeat;
+	background-position: 0.5em 1em;
+	font-size: 0.75em;
+	line-height: 2em;
+	background-color:#FFFFCB;
+	border:0.15em solid #CCCCA3;
+}
+div.tip p
+, div.important p
+, div.warning p
+, div.note p {
+	margin: 1em 0 1em 0;
+}
+div.tip
+, p.trans-note {
+	background-image: url('Pics/admon-tip.png');
+}
+div.important{
+	background-image: url('Pics/admon-important.png');
+}
+div.warning {
+	background-image: url('Pics/admon-warning.png');
+}
+div.note {
+	background-image: url('Pics/admon-note.png');
+}
+
+/* Layout Elements */
+
+.col50
+, .cardleft
+, .cardright {
+	width:47.5%;
+	float: left;
+	padding-bottom: 1.5em;
+}
+.lastcol
+, .cardright {
+	margin: auto;
+	width: 47.5%;
+	float:left;
+	padding-right: 0;
+	margin-left: 5%;
+}
+.lastcol h2
+, .lastcol p
+, .lastcol ul {
+	margin-right:0;
+}
+.cardleft h2 {
+	margin-right: 1em;
+}
+.cardright div {
+	margin-left: 1.5em;
+}
+.cardright h2 {
+	margin-left: 1em;
+}
+.votemenu a {
+	display:block;
+}
+table.vote td, table.vote th {
+	padding-right: 1.5em;
+}
+#maincol.with-toolbox {
+	margin-right: 14em;
+}
+div.tabular table, table.tabular, table.vendors {
+/*	border-bottom: 1px solid #a9abb3;
+	border-top: 1px solid #a9abb3; */
+	border-bottom: 0.15em solid #666;
+	border-top: 0.15em solid #666;
+	width: auto;
+	font-size: 0.75em;
+	line-height: 2em;
+	margin-bottom: 4em;
+	margin-top: -0.169em;
+}
+table td {
+	padding-right: 1.5em;
+}
+div.tabular table tr, table.tabular tr, table.vendors tr {
+	width: 100%;
+}
+table th {
+	padding-right: 1.5em;
+}
+div.tabular table td, table.tabular td, table.vendors td {
+	background-image: url(Pics/greydot.png);
+	background-position: top left;
+	background-repeat: repeat-x;
+}
+div.tabular table > td:fist-child, table.tabular  > td:fist-child, table.vendors  > td:fist-child {
+	background-image: none;
+}
+#pageLang p, #pageLang form {
+	display: inline;
+}
+.inline  a {
+	float: left;
+	margin-right: 1em;
+}
diff --git a/underlay/debian.css b/underlay/debian.css
deleted file mode 100644
index fcef8be..0000000
--- a/underlay/debian.css
+++ /dev/null
@@ -1,832 +0,0 @@
-/*
-	http://www.debian.org Stylesheet
-
-	Copyright 2011 Kalle Söderman
-
-	This stylesheet is free software; you can redistribute it and/or modify it
-	under the terms of the GNU General Public License, version 2, as published by
-	the Free Software Foundation.
-
-	This program is distributed in the hope that it will be useful, but WITHOUT ANY
-	WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-	PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License along with
-	this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-	Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-	The license text can also be found at http://www.gnu.org/copyleft/gpl.html and
-	/usr/share/common-licenses/GPL-2 on Debian GNU/Linux.  
-*/
-	
-/*	
-	Font size table (Browser default 16px)
-
-	pixels      relative
-	--------------------
-	36px        2.25em
-	31px        0.5161em
-	24px        1.5em
-	21px        1.3125em
-	18px        1.125em
-	16px        1em
-	14px        0.875em
-	12px        0.75em
-	11px        0.6875em
-	10px        0.625em
-	9px         0.5625em
-	--------------------
-*/
-
-/* 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,
-dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody,
-tfoot, thead, tr, th, td { 
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	font-weight: inherit;
-	font-style: inherit;
-	font-size: 100%;
-	font-family: inherit;
-	vertical-align: baseline;
-}
-
-body            { line-height: 1; color: black; background: white; }
-ol, ul          { list-style: none; }
-table           { border-collapse: separate; border-spacing: 0; }
-blockquote, q   { quotes: "" ""; }
-html            { background-color: transparent; }
-:focus          { outline: 0; }
-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-image:url('Pics/gradient.png');
-	background-position: 0 0;
-	background-repeat: repeat-x;
-	/* Uncomment to show baseline grid 
-	background-image: url('24grid.png');
-	background-position: 30px 9px; 
-	*/
-}
-#content {
-	margin: 0 10px 0 52px;
-}
-#inner {
-	position: relative;
-}
-#maincol {
-	margin: 0 15em 1.5em 0;
-}
-
-/* Header */
-
-#header {
-	margin:0;
-	padding:0 10px 0 52px; 
-}
-#header a:link
-, #header a:visited
-, #second-nav a:link
-, #second-nav a:visited {
-	text-decoration: none;
-}
-#header a:hover
-, #second-nav a:hover {
-	text-decoration: underline;
-}
-#breadcrumbs {
-	margin:0;
-	font-size: 0.75em;
-	text-transform: lowercase;
-	line-height: 2;
-	background-color: transparent;
-	background-color: #f5f6f7;
-	border-bottom: 1px solid #d2d3d7 ;
-	min-height: 20px;
-}
-#breadcrumbs:before {
-	content: "/";
-	margin-left: 0.5em;
-	margin-right: 0.5em;
-}
-p.section {
-	margin: 0;
-	padding: 0 5px 0 5px;
-	font-family:monospace;
-	line-height: 16px;
-	color:white;
-	text-transform: uppercase;
-	letter-spacing: 0.08em;
-	position:absolute;
-	top: 0px;
-	left:52px;
-	background-color: #c70036;
-}
-p.section a {
-	color: white;
-	text-decoration: none;
-}
-p.section a:hover {
-	color:white;
-	text-decoration: underline;
-}
-#navbar {
-	background-color: transparent;
-	list-style:none;
-	display:block;
-	border-bottom:1px solid #c70036;
-	text-indent:0;
-	padding: 0;
-	margin-top:0;
-	margin-bottom:0;
-}
-#navbar ul {
-	margin: 0;
-	padding: 0;
-	clear: both;
-	overflow: hidden;
-	min-height: 45px;
-}
-#navbar li {
-	list-style: none;
-	float: left;
-	padding: 0;
-	margin: 0;
-}
-#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;
-	display: block;
-	text-decoration: none;
-}
-#navbar a:visited {
-	color: #54638c;
-}
-#navbar a:hover
-, #navbar a:visited:hover {
-	background-color: #f5f6f7;
-	border-left: 1px solid  #d2d3d7;
-	border-right: 1px solid #d2d3d7;
-	text-decoration: underline;
-}
-ul.subnav {
-	list-style: none;
-	margin-left: 0;
-	padding-left: 0;
-	margin-top: 0;
-}
-ul.subnav li {
-	display: inline;
-	margin-right: 1em;
-}
-#searchbox {
-	text-align:left;
-	line-height: 1;
-	margin: 0 10px 0 0.5em;
-	padding: 1px 0 1px 0;
-	position: absolute;
-	top:0;
-	right:0;
-	font-size: 0.75em;
-}
-#searchbox p {
-	margin: 0;
-	padding: 0;
-}
-#upperheader {
-	margin:0;
-	padding:0;
-}
-#logo {
-	position:absolute;
-	top:0;
-	left:0;
-	padding: 0;
-	background-color: transparent;
-	border: 1px solid transparent;
-	border-top: 0;
-	width: 50px;
-	height: 5.07em;
-	min-height: 65px;
-}
-#logo a {
-	display: block;
-	position: relative;
-	padding: 0;
-	height: 100%;
-	min-height: 65px;
-}
-#logo img {
-	margin-top: 5px;
-	position: absolute;
-	bottom: 0.3em;
-	overflow: auto;
-}
-#logo:hover {
-	border: 1px solid #d2d3d7 ;
-	border-top: 0;
-	background-color: #f5f6f7;
-}
-
-/* Links */
-
-a:link {
-	color: #0035c7;
-	text-decoration: underline;
-}
-a:visited {
-	color: #54638c;
-}
-a:link:hover {
-	text-decoration: none;
-	color: #00207a;
-}
-a:visited:hover {
-	text-decoration: none;
-}
-a:active {
-	color:#c2c3c7;
-}
-a img {
-	border:0;
-}
-a.rss_logo {
-	font-size: 0.75em;
-	float: right;
-	width: 35px;
-	line-height: 10px;
-	color: #ffffff;
-	background-color: #ff6600;
-	font-weight: bold;
-	font-family: sans-serif;
-	text-align: center;
-	text-decoration: none;
-	padding: 0.25em;
-	margin-left: 0.25em;
-	border: 1px solid #ff6600;
-}
-
-a.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;
-}
-
-
-/* Secondnav */
-
-#second-nav {
-	width: 16em;
-	font-size: 0.75em;
-	line-height: 1.5;
-	float: right;
-	top: 0;
-	right: 0;
-	margin: 3em 0 0 0;
-	padding: 0 0 0 1em;
-	border-left: 1px solid #d2d3d7 ;
-}
-#second-nav ul {
-	padding:0;
-	margin:0;
-	list-style:none;
-}
-#second-nav ul ul {
-	margin-left: 1em;
-}
-#second-nav li {
-	font-weight: normal;
-	margin:0;
-	padding:0;
-}
-#second-nav p {
-	line-height: 2;
-	font-weight: bold;
-	margin: 0;
-}
-#second-nav h2 {
-	margin:0;
-}
-
-/* Typography */
-
-p {
-	margin: 1.5em 0 1.5em 0;
-}
-strong {
-	font-weight: bold;
-}
-em {
-	font-style: italic;
-	color: #444;
-}
-small {
-	font-size: 0.75em;
-}
-sup {
-	font-size: 0.75em;
-	vertical-align:top;
-}
-h1
-, h2
-, h3
-, h4
-, h5
-, h6 {
-	font-weight: 600;
-	color: black;
-}
-h1 {
-	font-weight: normal;
-	font-size: 1.8em;
-	line-height: 0.83333;
-	margin: 0.83333em 0 0.83333em 0;
-}
-h2 {
-	font-size: 1.4em;
-	font-weight: normal;
-	line-height: 1.0714286;
-	margin: 1.0714286em 0 1.0714286em 0;
-}
-h3 {
-	font-size: 1.125em;
-	line-height: 1.333em;
-	margin: 1.333em 0 0 0;
-}
-h4 {
-	font-weight: normal;
-	font-style: italic;
-	margin: 1.5em 0 1.5em 0;
-	color: #444;
-}
-h5 {
-	font-style: italic;
-	font-size: 0.75em;
-	margin: 2em 0 2em 0;
-}
-ol,ul {
-	padding-left: 1.5em;
-	margin-left:0;
-	margin: 1.5em 0 1.5em 0;
-}
-ol>ol, ul>ul, li>ol, li>ul {
-	margin: 0;
-}
-
-ol {
-	list-style-type: decimal;
-}
-ul {
-	list-style-type: disc;
-}
-th {
-	font-weight: bold;
-	margin: 1.5em 0 1.5em 0;
-}
-hr {
-	border: none;
-	background-color: #bbb;
-	height: 1px;
-	margin: 1.4375em 0 1.5em 0;
-}
-pre {
-	margin: 1.5em 0 1.5em 0;
-	overflow: auto;
-	font-family: monospace;
-	white-space: pre;
-	color: black;
-}
-tt, code {
-	font-family: monospace;
-	white-space: pre;
-	color: black;
-}
-dt {
-	margin: 1.5em 0 0 0;
-	font-weight: bold;
-}
-dd {
-	margin:  0 0 0 1.5em;
-}
-blockquote {
-	font-size: 0.75em;
-	margin: 2em;
-	line-height: 2;
-}
-cite {
-	font-style: italic;
-	color: #444;
-}
-acronym, abbr {
-	text-transform: uppercase;
-	font-size: 0.9em;
-}
-.toc {
-	font-size: 0.75em;
-	list-style:none;
-	background-image: url('Pics/greydot.png');
-	background-position: bottom left;
-	background-repeat: repeat-x;
-	line-height:1.833;
-	padding: 0;
-	max-width: 62%;
-	margin: 2em 0 2em 0;
-}
-.toc li {
-	background-image: url('Pics/greydot.png');
-	background-position: top left;
-	background-repeat: repeat-x;
-	padding: 0.0833em 0 0.0833em 0;
- }
-.toc a {
-	display:block;
-	text-decoration: none;
-}
-.toc a:hover {
-	display:block;
-	background-color: #f0f0f4;
-	text-decoration: underline;
-}
-.toc dt {
-	margin: 0;
-	background-image: url('Pics/greydot.png');
-	background-position: top left;
-	background-repeat: repeat-x;
-	padding: 0.0833em 0 0.0833em 0;
-}
-
-/* Sitemap */
-
-.card {
-	clear:both;
-	margin:1.5em 0 1.5em 0;
-	background-position: 0 -50px;
-	background-repeat: repeat-x;
-	padding:0;
-}
-.card ul {
-}
-.card ul li {
-	list-style:none;
-}
-.card h2 {
-}
-.lefthalf {
-	float:left;
-}
-.righthalf {
-	margin-left:50%;
-}
-.lefthalf ul {
-	margin-top:0;
-}
-
-/* Footer */
-
-#footer {
-	font-size: 0.75em;
-	border: 1px solid #dfdfe0;
-	padding:1em;
-	background-color: #f5f6f7;
-	margin: 0 10px 0 52px;
-	line-height: 1.5em;
-	border-left: 0;
-	border-right: 0;
-}
-#content #footer {
-	margin-left: 0;
-}
-#footer p {
-	margin: 1em 0 1em 0;
-}
-#footer hr {
-	border-top: 1px solid #d2d3d7;
-	border-bottom: 1px solid white;
-	height: 0;
-}
-#footer .editbar li {
-	display: inline;
-	margin-right: 2em;
-}
-#footer .info {
-}
-#fineprint {
-	margin-bottom: 1em;
-}
-#footermap {
-	list-style:none;
-	margin: 0 0 0 0;
-	padding: 0;
-	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 {
-	padding-left: 0;
-}
-ul#footermap-cola
-, ul#footermap-colb
-, ul#footermap-colc
-, ul#footermap-cold
-, ul#footermap-cole {
-	float:left;
-	width: 19%;
-	min-width: 11em;
-	height: 12em;		/* Update when adding items */
-	margin:0 1% 0 0;
-	padding: 2em 0 0 0;
-	list-style: none;
-}
-ul#footermap-cole {
-	width: 18.9%;
-	margin-right:0;
-}
-#footermap-wrap {
-	padding:2em;
-	border-top: 1px solid white;
-}
-#footermap a {
-	margin: 0;
-}
-#footermap ul{
-	list-style: none;
-	padding:0;
-}
-#footermap li {
-	text-indent:0;
-	background-color: transparent;
-	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;
-}
-#serverselect {
-}
-#serverselect input
-, #serverselect option 
-, #serverselect select {
-}
-#serverselect ul {
-	display: inline;
-	margin-left: 2em;
-}
-#serverselect li {
-	list-style: none;
-	display: inline;
-	padding:0 1em 0 1em;
-	margin:0;
-}
-#serverselect form p {
-	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;
-}
-.lcol50 h2 {
-	margin-top:0;
-}
-.rcol50 {
-	margin:0 0 0 51%;
-	padding:0;
-	font-size:0.75em;
-}
-form#pageLang {
-	display: inline;
-}
-
-/* Extras */
-
-input:focus {
-	background-color:#FFFFCB;
-	
-}
-.hidecss {
-	display: none;
-}
-.clear {
-	clear:both
-}
-#clear {
-	clear:both;
-	border:0;
-	height:1px;
-	display:block;
-}
-.quicklist:before {
-	content: "Quick Links: ";
-	font-weight: bold;
-}
-.quicklist {
-	list-style: none;
-	font-size: 0.75em;
-	margin: 2em 0 2em 0;
-	padding:0;
-	text-indent:0;
-	line-height: 2em;
-}
-.quicklist li  {
-	display:inline;
-}
-.item p{
-	margin: 0;
-}
-.item h2
-, .item p
-, .item ul{
-	margin-right: 10px 
-}
-.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; 
-}
-.downloads ul.downlist {
-	margin:0;
-}
-div.downloads .col50 { 
-	border-top: 0.15em solid #339900;
-}
-ul.downlist {
-	padding-left: 30px;
-	text-indent:0;
-	background: url('Pics/emblem-downloads.png') no-repeat 0 0.15em;
-	/* 
-	 * border-top: 0.17em solid #339900;
-	 */
-}
-ul.quicklist.downlist {
-	border-top: 0.17em solid #339900;
-	padding-top: 0.25em;
-	margin-top: 1.6em;
-}
-ul.downlist li {
-	display: inline;
-}
-ul.downlist li:after {
-	content: ', ';
-}
-ul.downlist li:last-child:after {
-	content: '';
-}
-div.tip
-, div.important
-, div.warning
-, div.note 
-, p.trans-note {
-	padding:0 2em 0 4em;
-	margin: 1.85em 0 1.85em 0;
-	background-repeat: no-repeat;
-	background-position: 0.5em 1em;
-	font-size: 0.75em;
-	line-height: 2em;
-	background-color:#FFFFCB;
-	border:0.15em solid #CCCCA3;
-}
-div.tip p
-, div.important p
-, div.warning p
-, div.note p {
-	margin: 1em 0 1em 0;
-}
-div.tip
-, p.trans-note {
-	background-image: url('Pics/admon-tip.png');
-}
-div.important{
-	background-image: url('Pics/admon-important.png');
-}
-div.warning {
-	background-image: url('Pics/admon-warning.png');
-}
-div.note {
-	background-image: url('Pics/admon-note.png');
-}
-
-/* Layout Elements */
-
-.col50
-, .cardleft
-, .cardright {
-	width:47.5%;
-	float: left;
-	padding-bottom: 1.5em;
-}
-.lastcol
-, .cardright {
-	margin: auto;
-	width: 47.5%;
-	float:left;
-	padding-right: 0;
-	margin-left: 5%;
-}
-.lastcol h2
-, .lastcol p
-, .lastcol ul {
-	margin-right:0;
-}
-.cardleft h2 {
-	margin-right: 1em;
-}
-.cardright div {
-	margin-left: 1.5em;
-}
-.cardright h2 {
-	margin-left: 1em;
-}
-.votemenu a {
-	display:block;
-}
-table.vote td, table.vote th {
-	padding-right: 1.5em;
-}
-#maincol.with-toolbox {
-	margin-right: 14em;
-}
-div.tabular table, table.tabular, table.vendors {
-/*	border-bottom: 1px solid #a9abb3;
-	border-top: 1px solid #a9abb3; */
-	border-bottom: 0.15em solid #666;
-	border-top: 0.15em solid #666;
-	width: auto;
-	font-size: 0.75em;
-	line-height: 2em;
-	margin-bottom: 4em;
-	margin-top: -0.169em;
-}
-table td {
-	padding-right: 1.5em;
-}
-div.tabular table tr, table.tabular tr, table.vendors tr {
-	width: 100%;
-}
-table th {
-	padding-right: 1.5em;
-}
-div.tabular table td, table.tabular td, table.vendors td {
-	background-image: url(Pics/greydot.png);
-	background-position: top left;
-	background-repeat: repeat-x;
-}
-div.tabular table > td:fist-child, table.tabular  > td:fist-child, table.vendors  > td:fist-child {
-	background-image: none;
-}
-#pageLang p, #pageLang form {
-	display: inline;
-}
-.inline  a {
-	float: left;
-	margin-right: 1em;
-}
diff --git a/underlay/dsa.css b/underlay/dsa.css
deleted file mode 100644
index 23cf7b0..0000000
--- a/underlay/dsa.css
+++ /dev/null
@@ -1,454 +0,0 @@
-/* ikiwiki style sheet */
-
-/* Note that instead of modifying this style sheet, you can instead edit
- * local.css and use it to override or change settings in this one.
- */
-
-article,
-header,
-footer,
-nav {
-	display: block;
-}
-
-.header {
-	margin: 0;
-	font-size: 22px;
-	font-weight: bold;
-	line-height: 1em;
-	display: block;
-}
-
-.inlineheader .author {
-	margin: 0;
-	font-size: 18px;
-	font-weight: bold;
-	display: block;
-}
-
-.actions ul {
-	margin: 0;
-	padding: 6px;
-	list-style-type: none;
-}
-.actions li {
-	display: inline;
-	padding: .2em .4em;
-}
-.pageheader .actions ul {
-	border-bottom: 1px solid #000;
-}
-
-.inlinepage .actions ul {
-	border-bottom: 0;
-}
-
-#otherlanguages ul {
-	margin: 0;
-	padding: 6px;
-	list-style-type: none;
-}
-#otherlanguages li {
-	display: inline;
-	padding: .2em .4em;
-}
-.pageheader #otherlanguages {
-	border-bottom: 1px solid #000;
-}
-
-.inlinecontent {
-	margin-top: .4em;
-}
-
-.pagefooter {
-	clear: both;
-}
-.inlinefooter {
-	clear: both;
-}
-
-#pageinfo {
-	margin: 1em 0;
-	border-top: 1px solid #000;
-}
-
-.tags {
-	margin-top: 1em;
-}
-
-.inlinepage .tags {
-        display: inline;
-}
-
-.mapparent {
-	text-decoration: none;
-}
-
-.img caption {
-	font-size: 80%;
-	caption-side: bottom;
-	text-align: center;
-}
-
-.align-left {
-	float:left;
-}
-
-.align-right {
-	float:right;
-}
-
-#backlinks {
-	margin-top: 1em;
-}
-
-#searchform {
-	display: inline;
-	float: right;
-}
-
-#editcontent {
-	width: 100%;
-}
-
-img {
-	border-style: none;
-}
-
-div.recentchanges {
-	border-style: solid;
-	border-width: 1px;
-	overflow: auto;
-	clear: both;
-	width: 100%;
-	background: #eee;
-	color: black !important;
-}
-.recentchanges .metadata {
-	padding: 0px 0.5em;
-}
-.recentchanges .changelog {
-	font-style: italic;
-	clear: both;
-	display: block;
-	padding: 1px 2px;
-	background: white !important;
-	color: black !important;
-}
-.recentchanges .desc {
-	display: none;
-}
-.recentchanges .diff {
-	display: none;
-}
-.recentchanges .committer {
-	float: left;
-	margin: 0;
-	width: 40%;
-}
-.recentchanges .committype {
-	float: left;
-	margin: 0;
-	width: 5%;
-	font-size: small;
-}
-.recentchanges .changedate {
-	float: left;
-	margin: 0;
-	width: 35%;
-	font-size: small;
-}
-.recentchanges .pagelinks {
-	float: right;
-	margin: 0;
-	width: 60%;
-}
-
-/* Used for adding a blog page. */
-#blogform {
-	padding: 10px 10px;
-	border: 1px solid #aaa;
-	background: #eee;
-	color: black !important;
-}
-
-.inlinepage {
-	padding: 10px 10px;
-	border: 1px solid #aaa;
-}
-
-.pagedate,
-.pagelicense,
-.pagecopyright {
-	font-style: italic;
-	display: block;
-	margin-top: 1em;
-}
-
-.error {
-	color: #C00;
-}
-
-/* Used for invalid form fields. */
-.fb_invalid {
-	color: red;
-	background: white !important;
-}
-
-/* Used for required form fields. */
-.fb_required {
-	font-weight: bold;
-}
-
-/* Orange feed button. */
-.feedbutton {
-	background: #ff6600;
-	color: white !important;
-	border-left: 1px solid #cc9966;
-	border-top: 1px solid #ccaa99;
-	border-right: 1px solid #993300;
-	border-bottom: 1px solid #331100;
-	padding: 0px 0.5em 0px 0.5em;
-	font-family: sans-serif;
-	font-weight: bold;
-	font-size: small;
-	text-decoration: none;
-	margin-top: 1em;
-}
-.feedbutton:hover {
-	color: white !important;
-	background: #ff9900;
-}
-
-/* Tag cloud. */
-.pagecloud {
-	float: right;
-	width: 30%;
-	text-align: center;
-	padding: 10px 10px;
-	border: 1px solid #aaa;
-	background: #eee;
-	color: black !important;
-}
-.smallestPC { font-size: 70%; }
-.smallPC { font-size: 85%; }
-.normalPC { font-size: 100%; }
-.bigPC { font-size: 115%; }
-.biggestPC { font-size: 130%; }
-
-.sidebar {
-	width: 30ex;
-	float: right;
-	margin-left: 4px;
-	margin-bottom: 4px;
-	margin-top: -1px;
-	padding: 0ex 2ex;
-	background: white;
-	border: 1px solid black;
-	color: black !important;
-}
-
-/* outlines */
-li.L1 {
-	list-style: upper-roman;
-}
-li.L2 {
-	list-style: decimal;
-}
-li.L3 {
-	list-style: lower-alpha;
-}
-li.L4 {
-	list-style: disc;
-}
-li.L5 {
-	list-style: square;
-}
-li.L6 {
-	list-style: circle;
-}
-li.L7 {
-	list-style: lower-roman;
-}
-li.L8 {
-	list-style: upper-alpha;
-}
-
-hr.poll {
-	height: 10pt;
-	color: white !important;
-	background: #eee;
-	border: 2px solid black;
-}
-div.poll {
-	margin-top: 1ex;
-	margin-bottom: 1ex;
-	padding: 1ex 1ex;
-	border: 1px solid #aaa;
-}
-
-div.progress {
-	margin-top: 1ex;
-	margin-bottom: 1ex;
-	border: 1px solid #888;
-	width: 400px;
-	background: #eee;
-	color: black !important;
-	padding: 1px;
-}
-div.progress-done {
-	background: #ea6 !important;
-	color: black !important;
-	text-align: center;
-	padding: 1px;
-}
-
-input#openid_url {
-	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 0 50%;
-	color: #000;
-	padding-left: 18px;
-}
-
-input#searchbox {
-	background: url(wikiicons/search-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 100% 50%;
-	color: #000;
-	padding-right: 16px;
-}
-
-/* Things to hide in printouts. */
-@media print {
-	.actions { display: none; }
-	.tags { display: none; }
-	.feedbutton { display: none; }
-	#searchform { display: none; }
-	#blogform { display: none; }
-	#backlinks { display: none; }
-}
-
-/* Provided for use by template plugin for floating info boxes. */
-.infobox {
-	float: right;
-	margin-left: 2ex;
-	margin-top: 1ex;
-	margin-bottom: 1ex;
-	padding: 1ex 1ex;
-	border: 1px solid #aaa;
-	background: white;
-	color: black !important;
-}
-
-/* Provided for use by template plugin for floating note boxes. */
-.notebox {
-	float: right;
-	margin-left: 2ex;
-	margin-top: 1ex;
-	margin-bottom: 1ex;
-	padding: 1ex 1ex;
-	border: 1px solid #aaa;
-	width: 25%;
-	background: white;
-	color: black !important;
-}
-
-/* Used by the popup template and for backlinks hiding. */
-.popup {
-	border-bottom: 1px dotted #366;
-	color: #366;
-}
-.popup .balloon,
-.popup .paren,
-.popup .expand {
-	display: none;
-}
-.popup:hover .balloon,
-.popup:focus .balloon {
-	position: absolute;
-	display: inline;
-	margin: 1em 0 0 -2em;
-	padding: 0.625em;
-	border: 2px solid;
-	background-color: #dee;
-	color: black;
-}
-
-/* Formbuilder styling */
-fieldset {
-	margin: 1ex 0;
-	border: 1px solid black;
-}
-legend {
-	padding: 0 1ex;
-}
-.fb_submit {
-	float: left;
-	margin: 2px 0;
-}
-#signin_openid_url_label {
-	float: left;
-	margin-right: 1ex;
-}
-#signin_openid {
-	padding: 10px 10px;
-	border: 1px solid #aaa;
-	background: #eee; 
-	color: black !important;
-}
-
-span.color {
-	padding: 2px;
-}
-
-.comment-header,
-.microblog-header {
-	font-style: italic;
-	margin-top: .3em;
-}
-.comment .author,
-.microblog .author {
-	font-weight: bold;
-}
-.comment-subject {
-	font-weight: bold;
-}
-.comment {
-	border: 1px solid #aaa;
-	padding: 3px;
-}
-
-/* Used by the highlight plugin. */
-pre.hl { color:#000000; background-color:#ffffff; }
-.hl.num { color:#2928ff; }
-.hl.esc { color:#ff00ff; }
-.hl.str { color:#ff0000; }
-.hl.dstr { color:#818100; }
-.hl.slc { color:#838183; font-style:italic; }
-.hl.com { color:#838183; font-style:italic; }
-.hl.dir { color:#008200; }
-.hl.sym { color:#000000; }
-.hl.line { color:#555555; }
-.hl.mark { background-color:#ffffbb; }
-.hl.kwa { color:#000000; font-weight:bold; }
-.hl.kwb { color:#830000; }
-.hl.kwc { color:#000000; font-weight:bold; }
-.hl.kwd { color:#010181; }
-
-/* For the calendar plugin. */
-.month-calendar-day-this-day { background-color: #eee; }
-.year-calendar-this-month { background-color: #eee; }
-.month-calendar-arrow A:link,
-.year-calendar-arrow A:link,
-.month-calendar-arrow A:visited,
-.year-calendar-arrow A:visited {
-	text-decoration: none;
-	font-weight: normal;
-	font-size: 150%;
-}
-
-div.page_header:before {
-	content: "/";
-}
-