From 6fafba0772e55ab5ae56f62c58ce1a42d41b0af0 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 12 Dec 2012 21:46:09 -0600 Subject: [PATCH] fixed css issue 1219, thanks Paolo --- VERSION | 2 +- applications/admin/static/css/web2py.css | 2 +- applications/examples/static/css/web2py.css | 2 +- applications/welcome/static/css/web2py.css | 2 +- .../welcome/static/css/web2py_bootstrap.css | 25 +++++++++++-------- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/VERSION b/VERSION index ce563d6b..dc4da52a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.3.0 (2012-12-12 21:30:14) rc1 +Version 2.3.0 (2012-12-12 21:45:21) rc1 diff --git a/applications/admin/static/css/web2py.css b/applications/admin/static/css/web2py.css index a09407fe..7bcc151d 100644 --- a/applications/admin/static/css/web2py.css +++ b/applications/admin/static/css/web2py.css @@ -115,7 +115,7 @@ div.flash { z-index:2000; } -div.flash #closeflash{color:inherit; float:right;} +div.flash #closeflash{color:inherit; float:right; margin-left:15px;} .ie-lte7 div.flash #closeflash {color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} diff --git a/applications/examples/static/css/web2py.css b/applications/examples/static/css/web2py.css index a09407fe..7bcc151d 100644 --- a/applications/examples/static/css/web2py.css +++ b/applications/examples/static/css/web2py.css @@ -115,7 +115,7 @@ div.flash { z-index:2000; } -div.flash #closeflash{color:inherit; float:right;} +div.flash #closeflash{color:inherit; float:right; margin-left:15px;} .ie-lte7 div.flash #closeflash {color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index a09407fe..7bcc151d 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -115,7 +115,7 @@ div.flash { z-index:2000; } -div.flash #closeflash{color:inherit; float:right;} +div.flash #closeflash{color:inherit; float:right; margin-left:15px;} .ie-lte7 div.flash #closeflash {color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} diff --git a/applications/welcome/static/css/web2py_bootstrap.css b/applications/welcome/static/css/web2py_bootstrap.css index cd732ea3..ee752b4b 100644 --- a/applications/welcome/static/css/web2py_bootstrap.css +++ b/applications/welcome/static/css/web2py_bootstrap.css @@ -1,5 +1,5 @@ /*============================================================= - CUSTOM RULES + CUSTOM RULES ==============================================================*/ body{height:auto;} /* to avoid vertical scroll bar */ @@ -39,7 +39,7 @@ div.flash.flash-top,div.flash.flash-top:hover{ /* auth navbar - primitive style */ .auth_navbar,.auth_navbar a{color:inherit;} .ie-lte7 .auth_navbar,.auth_navbar a{color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */} -.auth_navbar a{white-space:nowrap;} /* to avoid the nav split on more lines */ +.auth_navbar a{white-space:nowrap;} /* to avoid the nav split on more lines */ .auth_navbar a:hover{color:white;text-decoration:none;} ul#navbar>.auth_navbar{ display:inline-block; @@ -51,7 +51,7 @@ div.error_wrapper .error{ border-radius: 4px; -o-border-radius: 4px; -moz-border-radius: 4px; - -webkit-border-radius: 4px; + -webkit-border-radius: 4px; } /* below rules are only for formstyle = bootstrap trying to make errors look like bootstrap ones */ @@ -69,8 +69,11 @@ div.controls .error{ margin:0; /*display:inline;*/ /* uncommenting this, the animation effect is lost */ } -div.controls .inline-help{color:#3A87AD;} -div.controls .error_wrapper+.inline-help{margin-left:-99999px;} +div.controls .help-inline{color:#3A87AD;} +div.controls .error_wrapper +.help-inline {margin-left:-99999px;} +div.controls select +.error_wrapper {margin-left:5px;} +.ie-lte7 div.error{color:#fff;} + /* beautify brand */ .navbar-inverse .brand{color:#c6cecc;} .navbar-inverse .brand b{display:inline-block;margin-top:-1px;} @@ -89,13 +92,13 @@ a{white-space:normal;} li{margin-bottom:0;} textarea,button{display:block;} /*reset ul padding */ -ul#navbar{padding:0;} +ul#navbar{padding:0;} /* label aligned to related input */ td.w2p_fl,td.w2p_fc {padding:0;} #web2py_user_form td{vertical-align:middle;} /*============================================================= - OVERRIDING BOOTSTRAP.CSS RULES + OVERRIDING BOOTSTRAP.CSS RULES ==============================================================*/ /* because web2py handles this via js */ @@ -186,8 +189,8 @@ td.w2p_fw ul{margin-left:0px;} margin-bottom: 0; vertical-align: middle; } -.web2py_console input[type="submit"], -.web2py_console input[type="button"], +.web2py_console input[type="submit"], +.web2py_console input[type="button"], .web2py_console button{ padding-top:4px; padding-bottom:4px; @@ -221,8 +224,8 @@ td.w2p_fw ul{margin-left:0px;} .navbar-fixed-top,.navbar-fixed-bottom { margin-left:-10px; margin-right:-10px; - } + } input[type="text"],input[type="password"],select{ width:95%; } -} \ No newline at end of file +}