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

fixed issue 1594:radio widget layout conflicts with bootstrap, thanks Paolo Caruccio

Browse Source
This commit is contained in:
mdipierro
2013-07-19 04:33:18 -05:00
parent 5add14bf68
commit bf3d345ce5
4 changed files with 283 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.07.19.03.27.22
Version 2.6.0-development+timestamp.2013.07.19.04.32.07
applications/admin/static/css/web2py_bootstrap.css
+9 -1
View File
@@ -233,10 +233,11 @@ div.controls .error {
@media only screen and (max-width:979px){
body{padding-top:0px;}
#navbar{top:5px;}
#navbar{/*top:5px;*/}
div.flash{right:5px;}
.dropdown-menu ul{visibility:visible;}
}
@media only screen and (max-width:479px){
body{
padding-left:10px;
@@ -250,3 +251,10 @@ div.controls .error {
width:95%;
}
}
@media (max-width: 767px) {
.navbar {
margin-right: -20px;
margin-left: -20px;
}
}
applications/examples/static/css/web2py_bootstrap.css
+9 -1
View File
@@ -233,10 +233,11 @@ div.controls .error {
@media only screen and (max-width:979px){
body{padding-top:0px;}
#navbar{top:5px;}
#navbar{/*top:5px;*/}
div.flash{right:5px;}
.dropdown-menu ul{visibility:visible;}
}
@media only screen and (max-width:479px){
body{
padding-left:10px;
@@ -250,3 +251,10 @@ div.controls .error {
width:95%;
}
}
@media (max-width: 767px) {
.navbar {
margin-right: -20px;
margin-left: -20px;
}
}
applications/welcome/static/css/web2py_bootstrap.css
+4
View File
@@ -145,6 +145,10 @@ div>input[type="radio"],div>input[type="checkbox"]{margin:0;}
/* bootstrap has button instead of input */
input[type="button"], input[type="submit"]{margin-right:8px;}
/* web2py radio widget adjustment */
.generic-widget input[type='radio'] {margin:-1px 0 0 0; vertical-align: middle;}
.generic-widget input[type='radio'] + label {display:inline-block; margin:0 0 0 6px; vertical-align: middle;}
/*=============================================================
RULES FOR SOLVING CONFLICTS BETWEEN WEB2PY.CSS AND BOOTSTRAP.CSS
==============================================================*/