diff --git a/VERSION b/VERSION index db2abfd7..2188ad7d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.6 (2012-09-03 08:55:49) stable +Version 2.0.6 (2012-09-03 10:18:10) stable diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index 54b1cbce..be3aebf6 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -15,9 +15,9 @@ td,th {text-align:left; padding:2px 5px 2px 5px} th {vertical-align:middle; border-right:1px solid white} td {vertical-align:top} form table tr td label {text-align:left} -p,table,ol,ul {padding:0; margin: 0.5em 0} +p,table,ol,ul {padding:0; margin: 0.75em 0} p {text-align:justify} -ol, ul {list-style-position:inside} +ol, ul {list-style-position:outside; margin-left:2em} li {margin-bottom:0.5em} span,input,select,textarea,button,label,a {display:inline} img {border:0} @@ -39,13 +39,6 @@ input[type=text],input[type=password],select{width:300px; margin-right:5px} /* Sticky footer begin */ -.wrapper { - min-height:100%; - height:auto !important; - height:100%; - margin:0 auto -8em; /* set last value to footer height plus footer vertical padding */ -} - .main { padding:20px 0 50px 0; } diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index addb3682..35532710 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -129,7 +129,7 @@ -