dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed css issue 1219, thanks Paolo

Browse Source
This commit is contained in:
mdipierro
2012-12-12 21:46:09 -06:00
parent 2cb2484cd0
commit 6fafba0772
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.3.0 (2012-12-12 21:30:14) rc1 Version 2.3.0 (2012-12-12 21:45:21) rc1
applications/admin/static/css/web2py.css
+1 -1
View File
@@ -115,7 +115,7 @@ div.flash {
z-index:2000; 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 .ie-lte7 div.flash #closeflash
{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} {color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;}
applications/examples/static/css/web2py.css
+1 -1
View File
@@ -115,7 +115,7 @@ div.flash {
z-index:2000; 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 .ie-lte7 div.flash #closeflash
{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} {color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;}
applications/welcome/static/css/web2py.css
+1 -1
View File
@@ -115,7 +115,7 @@ div.flash {
z-index:2000; 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 .ie-lte7 div.flash #closeflash
{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} {color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;}
applications/welcome/static/css/web2py_bootstrap.css
+14 -11
View File
@@ -1,5 +1,5 @@
/*============================================================= /*=============================================================
CUSTOM RULES CUSTOM RULES
==============================================================*/ ==============================================================*/
body{height:auto;} /* to avoid vertical scroll bar */ 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 - primitive style */
.auth_navbar,.auth_navbar a{color:inherit;} .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 */} .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;} .auth_navbar a:hover{color:white;text-decoration:none;}
ul#navbar>.auth_navbar{ ul#navbar>.auth_navbar{
display:inline-block; display:inline-block;
@@ -51,7 +51,7 @@ div.error_wrapper .error{
border-radius: 4px; border-radius: 4px;
-o-border-radius: 4px; -o-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
} }
/* below rules are only for formstyle = bootstrap /* below rules are only for formstyle = bootstrap
trying to make errors look like bootstrap ones */ trying to make errors look like bootstrap ones */
@@ -69,8 +69,11 @@ div.controls .error{
margin:0; margin:0;
/*display:inline;*/ /* uncommenting this, the animation effect is lost */ /*display:inline;*/ /* uncommenting this, the animation effect is lost */
} }
div.controls .inline-help{color:#3A87AD;} div.controls .help-inline{color:#3A87AD;}
div.controls .error_wrapper+.inline-help{margin-left:-99999px;} 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 */ /* beautify brand */
.navbar-inverse .brand{color:#c6cecc;} .navbar-inverse .brand{color:#c6cecc;}
.navbar-inverse .brand b{display:inline-block;margin-top:-1px;} .navbar-inverse .brand b{display:inline-block;margin-top:-1px;}
@@ -89,13 +92,13 @@ a{white-space:normal;}
li{margin-bottom:0;} li{margin-bottom:0;}
textarea,button{display:block;} textarea,button{display:block;}
/*reset ul padding */ /*reset ul padding */
ul#navbar{padding:0;} ul#navbar{padding:0;}
/* label aligned to related input */ /* label aligned to related input */
td.w2p_fl,td.w2p_fc {padding:0;} td.w2p_fl,td.w2p_fc {padding:0;}
#web2py_user_form td{vertical-align:middle;} #web2py_user_form td{vertical-align:middle;}
/*============================================================= /*=============================================================
OVERRIDING BOOTSTRAP.CSS RULES OVERRIDING BOOTSTRAP.CSS RULES
==============================================================*/ ==============================================================*/
/* because web2py handles this via js */ /* because web2py handles this via js */
@@ -186,8 +189,8 @@ td.w2p_fw ul{margin-left:0px;}
margin-bottom: 0; margin-bottom: 0;
vertical-align: middle; vertical-align: middle;
} }
.web2py_console input[type="submit"], .web2py_console input[type="submit"],
.web2py_console input[type="button"], .web2py_console input[type="button"],
.web2py_console button{ .web2py_console button{
padding-top:4px; padding-top:4px;
padding-bottom:4px; padding-bottom:4px;
@@ -221,8 +224,8 @@ td.w2p_fw ul{margin-left:0px;}
.navbar-fixed-top,.navbar-fixed-bottom { .navbar-fixed-top,.navbar-fixed-bottom {
margin-left:-10px; margin-left:-10px;
margin-right:-10px; margin-right:-10px;
} }
input[type="text"],input[type="password"],select{ input[type="text"],input[type="password"],select{
width:95%; width:95%;
} }
} }