changeset 223:a0b71ad16383 v1.0

Merge with Arne
author David Soria Parra <dsp@php.net>
date Fri, 10 Jul 2009 11:36:14 +0200
parents 101601f15bf5 (diff) 101e24b66db2 (current diff)
children 4bd9461104a8
files
diffstat 2 files changed, 3 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/hgscm/media/css/styles.css	Fri Jul 10 11:29:20 2009 +0200
+++ b/hgscm/media/css/styles.css	Fri Jul 10 11:36:14 2009 +0200
@@ -31,11 +31,6 @@
 h3 { font-size: 1.3em; }
 
 /*
- * WIP warning, can be removed once the site is 'finished'
- */
-.wip-warning { font-size: 1.1em; font-family: Optimer, Helvetica, Arial, sans-serif; border: 1px solid #330; background-color: #fafa33; padding: 2px; text-align: center}
-
-/*
  * Lists
  */
 ul { margin-left: 2.2em; line-height: 1.5em; }
@@ -96,7 +91,7 @@
 /*
  * Nav
  */
-#nav { position: absolute; top: 41px; right: 0; background: #999; height: 42px; margin: 0; width: 665px; font-size: 1.2428em; *font-size: 16px; line-height: 42px; font-family: Optimer, Helvetica, Arial, sans-serif; overflow: hidden; }
+#nav { position: absolute; top: 17px; right: 0; background: #999; height: 42px; margin: 0; width: 665px; font-size: 1.1428em; *font-size: 16px; line-height: 42px; font-family: Optimer, Helvetica, Arial, sans-serif; overflow: hidden; }
 #nav li { float: left; margin: 0; padding: 0; list-style: none; }
 #nav a { float: left; color: #fff; text-decoration: none; padding: 0 16px; *padding: 0 14px; }
 #nav a:hover, #nav a:focus, #nav .active a { background: #00b5f1; }
@@ -104,7 +99,7 @@
 /*
  * Search
  */
-#search { position: absolute; right: 15px; top: 50px; color: #fff; width: 183px; height: 23px; background: url(../images/search.png) no-repeat 0 0; }
+#search { position: absolute; right: 15px; top: 26px; color: #fff; width: 183px; height: 23px; background: url(../images/search.png) no-repeat 0 0; }
 #search legend { display: none; }
 #search label { position: absolute; left: -9999px; }
 #search .text { width: 150px; background: none; border: none; margin: 0 0 0 5px; position: relative; top: 5px; color: #666; outline:0; }
@@ -153,4 +148,4 @@
  * Lists without big bullet type...
  */
 
-#home .undecorated_list li { list-style:decimal outside; background: none; padding-left: 0px; min-height: 0px; margin-bottom: 1.7em} #home .undecorated_list li li { list-style: circle outside }
\ No newline at end of file
+#home .undecorated_list li { list-style:decimal outside; background: none; padding-left: 0px; min-height: 0px; margin-bottom: 1.7em} #home .undecorated_list li li { list-style: circle outside }
--- a/hgscm/templates/base.html	Fri Jul 10 11:29:20 2009 +0200
+++ b/hgscm/templates/base.html	Fri Jul 10 11:36:14 2009 +0200
@@ -11,8 +11,6 @@
 		<title>Mercurial SCM</title>
 	</head>
 	<body id="home">
-	        <div class="wip-warning">Please note that this site is <em>work in progress and incomplete</em>! You probably want to <a href="http://www.selenic.com/mercurial" style="color: #3d3dfa">visit the official mercurial homepage</a> instead.</div>
-				
 		<h1 id="logo"><a href="/">mercurial</a></h1>
 			
 		<ul id="nav" class="typeface-js">