[SCM] live-studio branch, master, updated. be1494946e9a501d3083543e05ef6490dba17159

Chris Lamb lamby at debian.org
Sun Aug 1 06:29:52 UTC 2010


The following commit has been merged in the master branch:
commit be1494946e9a501d3083543e05ef6490dba17159
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 1 02:28:01 2010 -0400

    Shoehorn in kjs's nice web design

diff --git a/htdocs/media/css/debheld.css b/htdocs/media/css/debheld.css
new file mode 100644
index 0000000..cea5341
--- /dev/null
+++ b/htdocs/media/css/debheld.css
@@ -0,0 +1,114 @@
+#splash {
+		background-image: none;
+		padding: 0;
+		margin:0;
+}
+#splash h1 {
+		background-image: none;
+}
+div#outer {
+		margin: 0;
+}
+maincol {
+	background-image: url('../img/cropped-swirls.png');
+	background-position:top center;
+	background-repeat: repeat-x;
+}
+#announce {
+	text-align: center;
+	float: left;
+	width: 41%;
+	min-width: 260px;
+	margin-bottom: 1.5em;
+}
+#intro {
+	padding-top: 0;
+}
+#intro p {
+	margin-top: 0em;
+	padding:0;
+}
+#hometoc {
+	list-style:none;
+	margin: 0 0 2em 0;
+	padding: 0;
+	width:100%;
+	font-size: 0.75em;
+	overflow: hidden;
+	line-height: 1.5em;
+	border: 0;
+}
+#hometoc a {
+	text-decoration: none;
+}
+#hometoc a:hover {
+	text-decoration: underline;
+}
+ul#hometoc-cola a, ul#hometoc-colb a, ul#hometoc-colc a, ul#hometoc-cold a, ul#hometoc-cole a {
+	padding-left: 5px;
+}
+ul#hometoc-cola, ul#hometoc-colb,ul#hometoc-colc, ul#hometoc-cold, ul#hometoc-cole {
+	float:left;
+	width: 19.2%;
+	min-width: 11em;
+	height: 14em; /* Update when adding items */
+	margin:0 1% 0 0;
+	padding: 0;
+	background-image:url('../img/gradient.png');
+	background-position: 0 -40px;
+	background-repeat: repeat-x; 
+/*	border-top: 2px solid #c6c8e0;
+	border-bottom: 1px solid #c6c8e0;
+*/
+	border-top: 1px solid #c6c8e0;
+	list-style: none;
+}
+ul#hometoc-cole {
+	width: 18.9%;
+	margin-right:0;
+}
+#hometoc-wrap {
+	padding:1em 1em 1em 1em;
+	border-top: 1px solid white;
+}
+#hometoc a {
+	margin: 0;
+}
+#hometoc ul{
+	list-style: none;
+	padding: 1em 0 0 0;
+}
+#hometoc ul ul {
+	padding: 0;
+}
+#hometoc li {
+	text-indent:0;
+	background-color: transparent;
+	font-weight:bold;
+}
+#hometoc li ul {
+	margin: 0;
+	padding: 0:
+
+}
+#hometoc li li {
+	margin:0;
+	text-indent:0;
+	padding:0;
+	font-weight:normal;
+	border:0;
+	background-image:none;
+	background-color:transparent;
+}
+.infobar {
+	margin: 0 0 2em 0;
+	padding: 1em 5px 1em 5px;
+	line-height: 1em;
+	font-size: 0.75em;
+	border: 1px solid #d2d3d7;
+	border-bottom: 1px solid #d2d3d7;
+	background-image:url('../img/gradient.png');
+	background-position: 0 -35px;
+	background-repeat: repeat-x;
+	clear: both;
+}
diff --git a/htdocs/media/css/debhome.css b/htdocs/media/css/debhome.css
new file mode 100644
index 0000000..87605eb
--- /dev/null
+++ b/htdocs/media/css/debhome.css
@@ -0,0 +1,130 @@
+/*
+	www.debian.org redesign
+
+	Kalle Soderman, 2008 debhome.css
+ 
+	Copyleft : This work is free, you can copy, spread, and modify it under
+	the terms of the Free Art License http://artlibre.org/licence/lal/en/
+ */
+
+ at import url("debian.css");
+ at import url("debheld.css") handheld;
+
+#splash {
+	margin-top:0px;
+	margin-bottom: 1.5em;
+	text-align:center;
+	overflow:hidden;
+	height: 120px;
+}
+#splash h1 {
+	background-image: url('../img/debian-61_glossy-large.png');
+	background-position:top center;
+	padding-top:130px;
+	overflow:hidden;
+	text-align:center;
+	background-repeat:no-repeat;
+	display:block;
+	margin:0;
+	height:0;
+}
+#outer {
+	background-image: url('../img/cropped-swirls.png');
+	background-position:top center;
+	background-repeat: repeat-x;
+}
+#announce {
+	text-align: center;
+	float: left;
+	width: 41%;
+	min-width: 260px;
+	margin-bottom: 1.5em;
+}
+#intro {
+	padding-top: 0;
+}
+#intro p {
+	margin-top: 0em;
+	padding:0;
+}
+
+/* Homepage Links */
+
+#hometoc {
+	list-style:none;
+	margin: 0 0 2em 0;
+	padding: 0;
+	width:100%;
+	font-size: 0.75em;
+	overflow: hidden;
+	line-height: 1.5em;
+	border: 0;
+}
+#hometoc a {
+	text-decoration: none;
+}
+#hometoc a:hover {
+	text-decoration: underline;
+}
+ul#hometoc-cola a, ul#hometoc-colb a, ul#hometoc-colc a, ul#hometoc-cold a, ul#hometoc-cole a {
+	padding-left: 5px;
+}
+ul#hometoc-cola, ul#hometoc-colb,ul#hometoc-colc, ul#hometoc-cold, ul#hometoc-cole {
+	float:left;
+	width: 19.2%;
+	min-width: 11em;
+	height: 12em; 		/* Update when adding items */
+	margin:0 1% 0 0;
+	padding: 0;
+	background-position: bottom left;
+	background-repeat: repeat-x; 
+	background-image: url('../img/reddot.png');
+	list-style: none;
+}
+ul#hometoc-cole {
+	width: 18.9%;
+	margin-right:0;
+}
+#hometoc-wrap {
+	padding:1em 1em 1em 1em;
+	border-top: 1px solid white;
+}
+#hometoc a {
+	margin: 0;
+}
+#hometoc ul{
+	list-style: none;
+	padding: 0 0 0 0;
+}
+#hometoc ul ul {
+	padding: 0;
+}
+#hometoc li {
+	text-indent:0;
+	background-color: transparent;
+	font-weight:bold;
+}
+#hometoc li ul {
+	margin: 0;
+	padding: 0:
+
+}
+#hometoc li li {
+	margin:0;
+	text-indent:0;
+	padding:0;
+	font-weight:normal;
+	border:0;
+	background-image:none;
+	background-color:transparent;
+}
+.infobar {
+	margin: 0 0 2em 0;
+	padding: 0 0 2em 0;
+	line-height: 1em;
+	font-size: 0.75em;
+	background-image: url('../img/greydot.png');
+	background-position: bottom left;
+	background-repeat: repeat-x;
+	clear: both;
+}
diff --git a/htdocs/media/css/debian.css b/htdocs/media/css/debian.css
new file mode 100644
index 0000000..caa2c4e
--- /dev/null
+++ b/htdocs/media/css/debian.css
@@ -0,0 +1,746 @@
+/*
+	www.debian.org stylesheet proposal
+	
+	Kalle Soderman, 2008 debian.css
+	
+	Copyleft : This work is free, you can copy, spread, and modify it under
+	the terms of the Free Art License http://artlibre.org/licence/lal/en/
+	
+	
+	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;
+	/* Uncomment to show baseline grid 
+	background-image: url('24grid.png');
+	background-position: 30px 9px; 
+	*/
+}
+#outer {
+	margin: 0 10px 0 62px;
+}
+#inner {
+	position: relative;
+}
+#maincol {
+	margin: 0 15em 1.5em 0;
+}
+
+/* Header */
+
+#header {
+	margin:0;
+	padding:0 10px 0 62px; 
+	background-image:url('../img/gradient.png');
+	background-position: 0 0;
+	background-repeat: repeat-x;
+}
+#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 ;
+}
+#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:62px;
+	background-color: #c70036;
+}
+#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;
+}
+#navbar li {
+	list-style: none;
+	float: left;
+	padding: 0;
+	margin: 0;
+}
+#navbar a:link
+, #navbar a:visited {
+	padding: 2em 1em 0.25em 1em;
+	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: #efefef;
+	border-left: 1px solid  #d2d3d7;
+	border-right: 1px solid #d2d3d7;
+	text-decoration: underline;
+}
+#searchbox {
+	text-align:left;
+	line-height: 1;
+	margin: 0 10px 0 0.5em;
+	padding: 0px 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: 61px;
+	height: 5.07em;
+}
+#logo a {
+	display: block;
+	position: relative;
+	padding: 0 5px 0 5px;
+	height: 100%;
+}
+#logo img {
+	margin-top: 5px;
+	position: absolute;
+	bottom: 0.3em;
+	overflow: auto;
+}
+#logo:hover {
+	border: 1px solid #d2d3d7 ;
+	border-top: 0;
+	background-color: #eee;
+}
+
+/* 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;
+}
+
+/* Secondnav */
+
+#second-nav {
+	width: 16em;
+	font-size: 0.75em;
+	line-height: 1.5;
+	position: absolute;
+	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;
+	font-color: black;
+}
+tt, code {
+	font-family: monospace;
+	white-space: pre;
+	font-color: black;
+}
+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;
+}
+
+/* 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 0 0 0;
+	margin-top: 2em;
+	line-height: 1.5em;
+	border-left: 0;
+	border-right: 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.15em 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 {
+	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 {
+	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;
+}
+table.vendors {
+/*	border-bottom: 1px solid #a9abb3;
+	border-top: 1px solid #a9abb3; */
+	border-bottom: 0.15em solid #666;
+	border-top: 0.15em solid #666;
+	display: block;
+	width: auto;
+	font-size: 0.75em;
+	line-height: 2em;
+	margin-bottom: 4em;
+	margin-top: -0.169em;
+}
+table td {
+	padding-right: 1.5em;
+}
+table.vendors tr {
+	width: 100%;
+}
+table th {
+	padding-right: 1.5em;
+}
+table.vendors td {
+	background-image: url(Pics/greydot.png);
+	background-position: top left;
+	background-repeat: repeat-x;
+}
+#pageLang p, #pageLang form {
+	display: inline;
+}
diff --git a/htdocs/media/css/stylesheet.css b/htdocs/media/css/stylesheet.css
deleted file mode 100644
index 2c01fe0..0000000
--- a/htdocs/media/css/stylesheet.css
+++ /dev/null
@@ -1,319 +0,0 @@
-/* @group ORIGINAL */
-/*
- * Debian PTS stylesheet.
- * by:
- * - Dan Callahan <dan.callahan at gmail.com>
- * - Enrico Tassi <gareuselesinge at debian.org>
- * - Stefano Zacchiroli <zack at debian.org>
- */
-/* --- Whole-Page --- */
-body {
-  margin: 0;
-  padding: 0;
-  font-family: "DejaVu Sans", "Bitstream Vera Sans", sans-serif;
-  /*Pr
-efer Free Fonts*/
-    background: #fff url('../img/debian-title.png') no-repeat 10px 7px;
-  color: #000;
-  font-size: 100%;
-}
-a:link {
-  color: #0755d7;
-  text-decoration: underline;
-}
-a:visited {
-  color: #0755d7;
-  text-decoration: underline;
-}
-a:hover {
-  color: #032a6b;
-  text-decoration: underline;
-}
-a:active {
-  color: #f00;
-  text-decoration: underline;
-}
-a img {
-  border: none;
-}
-.containertable {
-  width: 100%;
-}
-/* --- Header --- */
-body > form {
-
-/* "Jump to package" */
-    margin: 0.3em;
-  font-size: 80%;
-  padding: 0.5em;
-  border: 1px solid #aaa;
-  background-color: #dfdfdf;
-}
-#quickforms {
-
-/* "Jump to package" */
-    margin: 0.3em;
-  font-size: 80%;
-  padding: 0.5em;
-  border: 1px solid #aaa;
-  background-color: #dfdfdf;
-}
-h1#title {
-  margin: 0 0 0 0;
-  padding: 20px 0 0 280px;
-  font-size: 150%;
-/*
-min-height: 60px;
-    height: auto !important; /* "Min-Height Fast Hack" */
-/*
-height: 60px; */
-}
-h1#title a {
-  color: black;
-  text-decoration: none;
-}
-h2#subtitle {
-  margin: -1em 0 1em 0;
-  padding: 20px 0 0 280px;
-  font-size: 80%;
-/*
-min-height: 60px;
-    height: auto !important;
-    height: 60px;*/
-}
-h2#subtitle a {
-  color: black;
-  text-decoration: none;
-}
-/* --- Content Pane --- */
-div#body {
-  clear: both;
-  border-top: 2px solid #d70751;
-  /*
-background: #dfdfdf;*/
-    padding: 1em 1em;
-/*
-0em 0em */
-}
-table.containertable {
-  padding: 0.5em 0.5em;
-}
-td.containercell {
-  padding: 0.5em;
-}
-table.lefttable {
-  border-collapse: collapse;
-  border: 1px solid #999;
-  background: #fff;
-  width: 100%;
-}
-table.righttable {
-  border-collapse: collapse;
-  border: 1px solid #999;
-  background: #fff;
-  width: 100%;
-}
-td.titlecell {
-  padding: 0.2em 0.2em 0.1em 0.2em;
-  font-weight: bold;
-  font-size: 100%;
-  background: #d70751;
-  color: #fff;
-  border-top: 3px solid #999;
-  border-bottom: 1px solid #999;
-}
-td.titlecell a:link {
-  color: #ffffff;
-  background: #d70751;
-  text-decoration: underline;
-}
-td.titlecell a:visited {
-  color: #ffffff;
-  background: #d70751;
-  text-decoration: underline;
-}
-td.titlecell a:hover {
-  color: #fff200;
-  background: #d70751;
-  text-decoration: underline;
-}
-td.titlecell a:active {
-  color: #295598;
-  background: #d70751;
-  text-decoration: underline;
-}
-th.titlecell {
-  padding: 0.2em 0.2em 0.1em 0.2em;
-  font-weight: bold;
-  font-size: 100%;
-  background: #d70751;
-  color: #fff;
-  border-top: 3px solid #999;
-  border-bottom: 1px solid #999;
-}
-th.titlecell a:link {
-  color: #ffffff;
-  background: #d70751;
-  text-decoration: underline;
-}
-th.titlecell a:visited {
-  color: #ffffff;
-  background: #d70751;
-  text-decoration: underline;
-}
-th.titlecell a:hover {
-  color: #fff200;
-  background: #d70751;
-  text-decoration: underline;
-}
-th.titlecell a:active {
-  color: #295598;
-  background: #d70751;
-  text-decoration: underline;
-}
-td.labelcell {
-  font-weight: bold;
-  padding: 0.2em 0 0.2em 0.3em;
-  border-bottom: 1px dotted #999;
-}
-td.labelcell:after {
-  content: ":";
-}
-td.contentcell {
-  padding: 0.2em 0.3em 0.2em 0;
-  border-bottom: 1px dotted #999;
-}
-/* - Edge Tables - */
-tr#bugs_rc {
-  font-size: 90%;
-}
-tr#bugs_in {
-  font-size: 90%;
-}
-tr#bugs_mw {
-  font-size: 90%;
-}
-tr#bugs_fp {
-  font-size: 90%;
-}
-span.indented {
-  padding-left: 1.5em;
-}
-td > form {
-  margin: 0.4em 0 0.4em 0.4em;
-  padding: 0;
-}
-/* PTS subscribe */
-td#src_files ul {
-  padding: 0;
-}
-td#src_files li {
-  display: inline;
-  font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
-}
-#news-list {
-  max-height: 30em;
-  overflow: auto;
-}
-/* - Central Table - */
-#problems {
-  background: #0755d7;
-  color: #ffffff;
-}
-#todo {
-  background: #0755d7;
-  color: #ffffff;
-}
-/* --- Footer --- */
-div#body > hr {
-  display: none;
-}
-div.footer {
-  padding: 1em 0;
-  background-color: #fff;
-  text-align: center;
-  border-top: 2px solid #d70751;
-  margin: 0 0 0 0;
-  border-bottom: 0;
-}
-tt {
-  font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
-}
-/* --- Misc --- */
-form > p {
-  margin: 0;
-  padding: 0;
-}
-a.feedlink {
-
-/* Little orange RSS button */
-    background: #f60                  !important;
-  color: #fff                       !important;
-  border: 1px solid                 !important;
-  border-color: #fc9 #630 #330 #f96 !important;
-  padding: 0 3px                    !important;
-  font-weight: bold                 !important;
-  font-size: 70%                    !important;
-  text-decoration: none             !important;
-  vertical-align: 0.2em             !important;
-/* Without !import
-ant, inherets from td.titlecell a:* */
-}
-/* ul { list-style-type: none; padding: 0; }
-li { margin-top: 0.2em; }
-/*li { margin-top: 0.4em; }
-td > ul { padding-left: 1em; }
-a.none { color: #000 !important; text-decoration: none !important; }*/
-/* @end */
-/* @group NEU */
-#contentstart {
-  width: 900px;
-  position: relative;
-  overflow: hidden;
-  margin: 80px auto 0;
-}
-/* TABS */
-.tab {
-  float: left;
-  width: 300px;
-}
-.tab ul {
-  float: left;
-  font-size: .9em;
-  margin: 20px 0 0 35px;
-}
-.tab a {
-  color: #666;
-  text-decoration: none;
-}
-/* fancy! */
-.tab:hover a, .tab:hover ul a {
-  color: #555;
-}
-.tab ul a:hover {
-  color: #222;
-}
-/* STARTLINKS */
-a.sl {
-  float: left;
-  width: 242px;
-  font-size: 32px;
-  font-weight: 800;
-  /*text-align: center;*/
-  padding-top: 220px;
-  padding-left: 58px;
-  text-decoration: none;
-  background: url(user.png) no-repeat 75px 0;
-}
-
-#sl_devel {
-  background-image: url(devel.png);
-}
-#sl_project {
-  background-image: url(project.png);
-}
-/* @end */
-
-form.add_config ul {
-  list-style: none;
-}
diff --git a/htdocs/media/img/agplv3.png b/htdocs/media/img/agplv3.png
new file mode 100644
index 0000000..85a4add
Binary files /dev/null and b/htdocs/media/img/agplv3.png differ
diff --git a/htdocs/media/img/cropped-swirls.png b/htdocs/media/img/cropped-swirls.png
new file mode 100644
index 0000000..9b59d78
Binary files /dev/null and b/htdocs/media/img/cropped-swirls.png differ
diff --git a/htdocs/media/img/debian-61_glossy-large.png b/htdocs/media/img/debian-61_glossy-large.png
new file mode 100644
index 0000000..e8eddc5
Binary files /dev/null and b/htdocs/media/img/debian-61_glossy-large.png differ
diff --git a/htdocs/media/img/gradient.png b/htdocs/media/img/gradient.png
new file mode 100644
index 0000000..dc4a8b8
Binary files /dev/null and b/htdocs/media/img/gradient.png differ
diff --git a/htdocs/media/img/greydot.png b/htdocs/media/img/greydot.png
new file mode 100644
index 0000000..ec23c01
Binary files /dev/null and b/htdocs/media/img/greydot.png differ
diff --git a/htdocs/media/img/openlogo-50.png b/htdocs/media/img/openlogo-50.png
new file mode 100644
index 0000000..f4e75fc
Binary files /dev/null and b/htdocs/media/img/openlogo-50.png differ
diff --git a/htdocs/media/img/reddot.png b/htdocs/media/img/reddot.png
new file mode 100644
index 0000000..76cc993
Binary files /dev/null and b/htdocs/media/img/reddot.png differ
diff --git a/templates/base.html b/templates/base.html
index 54f1efb..e7a671d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -2,7 +2,10 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>Debian Live Studio</title>
-  <link rel="stylesheet" href="{% static "css/stylesheet.css" %}" type="text/css" />
+
+  {% block css %}
+  <link rel="stylesheet" href="{% static "css/debian.css" %}" type="text/css" />
+  {% endblock %}
 
   <script language="javascript" src="{% static "js/jquery.js" %}"></script>
   <script language="javascript" src="{% static "js/live-studio.js" %}"></script>
@@ -10,40 +13,56 @@
 
 <body>
 
-<h1 id="title"><a href="{% url static:welcome %}">Debian Live Studio</a></h1>
-<h2 id="subtitle"><a href="{% url static:welcome %}">Live Debian systems!</a></h2>
-
-<div id="body">
+<div id="header">
+  <div id="upperheader">
+  <div id="logo">
+  <a href="{% url static:welcome %}" title="Debian Home">
+    <img src="{% static "img/openlogo-50.png" %}" alt="Debian" width="50" height="61">
+  </a>
+  </div>
+ </div>
 
-{% if messages %}
-<ul style="list-style: none">
-    {% for message in messages %}
-    <li class="{{ message.tags }}" style="border: 5px black solid; background-color: yellow; padding: 1em">{{ message }}</li>
-    {% endfor %}
-</ul>
-{% endif %}
+  <div id="navbar">
+    <ul>
+      <li><a href="{% url static:welcome %}">Home</a></li>
 
-  {% if request.user.is_authenticated %}
-  <div class="actions" style="float: right">
-    <p><a href="{% url config:configs %}">Home</a>
-    -
-    <a href="{% url auth_logout %}">Logout</a>
+      {% if request.user.is_authenticated %}
+      <li><a href="{% url auth_logout %}">Login</a></li>
+      {% else %}
+      <li><a href="{% url auth_login %}">Login</a></li>
+      <li><a href="{% url registration_register %}">Register</a></li>
+      {% endif %}
+    </ul>
   </div>
+</div>
+
+<div id="outer">
+  {% if messages %}
+  <ul style="list-style: none">
+      {% for message in messages %}
+      <li class="{{ message.tags }}" style="border: 5px black solid; background-color: yellow; padding: 1em">{{ message }}</li>
+      {% endfor %}
+  </ul>
   {% endif %}
 
-<div id="content">
-  {% block content %}{% endblock %}
-</div>
+  <div id="inner">
+    {% block content %}{% endblock %}
+  </div>
 
-<hr />
+  <div id="footer">
+  <div id="fineprint">
+    <a href="http://www.gnu.org/licenses/agpl-3.0.html"><img src="{% static "img/agplv3.png" %}" style="float: right"></a>
 
-</div>
+    <p>To report a problem with the web site, e-mail <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>. For other contact information, see the <a href="http://live.debian.net">Debian Live homepage</a>.</p>
+
+    <p>
+      Copyright &copy; 2010 <a href="http://chris-lamb.co.uk/">Chris Lamb</a>. Released under the terms of the <a href="http://www.gnu.org/licenses/agpl-3.0.html">GNU Affero General Public License></a> version 3 or greater.
+      <br>
+      Debian is a registered <a href="http://www.debian.org/trademark">trademark</a> of Software in the Public Interest, Inc.
+    </p>
+  </div>
+  </div>
 
-<div class="footer">
-  <p>
-    <a href="http://live.debian.net/">Debian Live Project</a>
-    &lt;<a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt;
-  </p>
 </div>
 
 </body>
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 48bcfb7..12fd900 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -5,8 +5,13 @@
 <h1>Login</h1>
 
 <form method="post" action="">{% csrf_token %}
-{{ form.as_p }}
-<input type="submit" value="Login">
+<table>
+{{ form }}
+<tr>
+  <td>&nbsp;</td>
+  <td><input type="submit" value="Login"></td>
+</tr>
+</table>
 </form>
 
 {% endblock %}
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
index 9803032..c761169 100644
--- a/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@@ -2,11 +2,16 @@
 
 {% block content %}
 
-<h1>Register</h1>
+<h1>Register for Debian Live Studio</h1>
 
 <form method="post" action="">{% csrf_token %}
-{{ form.as_p }}
-<input type="submit" value="Register">
+<table>
+{{ form }}
+<tr>
+  <td>&nbsp;</td>
+  <td><input type="submit" value="Register"></td>
+</tr>
+</table>
 </form>
 
 {% endblock %}
diff --git a/templates/static/welcome.html b/templates/static/welcome.html
index 9f6ca98..137a1a0 100644
--- a/templates/static/welcome.html
+++ b/templates/static/welcome.html
@@ -1,11 +1,21 @@
 {% extends "base.html" %}
 
+{% block css %}
+  <link rel="stylesheet" href="{% static "css/debhome.css" %}" type="text/css" />
+{% endblock %}
+
 {% block content %}
 
-<h1>Welcome</h1>
+<div id="splash" style="text-align: center;">
+  <h1>Debian GNU/Linux</h1>
+</div>
+
+<div id="intro">
+  <p>A <em>live</em> system is an operating system that does not require a classical installer to use it. It can can book from various types of media, including CDs, USB sticks or via netbooting.</p>
+</div>
 
 <p><a href="{% url auth_login %}">Login</a> or <a href="{% url registration_register %}">register</a>
 
-<p>A <em>live</em> system is an operating system that does not require a classical installer to use it. It can can book from various types of media, including CDs, USB sticks or via netbooting.</p>
+{% comment %}<p class="infobar"></p>{% endcomment %}
 
 {% endblock %}

-- 
live-studio



More information about the debian-live-changes mailing list