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

fixes #1068

Browse Source 
threw in also a better list:string widget repr for bs3

Updated also the bootswatch theme because something was wrong
This commit is contained in:
niphlod
2015-09-21 21:38:28 +02:00
parent 0fa0dbaeea
commit 46f081c45c
8 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/welcome/static/css/bootstrap.min.css
Vendored
+3 -1
View File
File diff suppressed because one or more lines are too long
applications/welcome/static/css/web2py-bootstrap3.css
+6 -6
View File
@@ -1,4 +1,4 @@
div.flash {
div.w2p_flash {
background-image: none;
border-radius: 4px;
-o-border-radius: 4px;
@@ -15,13 +15,13 @@ div.flash {
margin: 0 0 20px;
padding: 15px 35px 15px 15px;
}
div.flash.alert:hover {
div.w2p_flash.alert:hover {
opacity: 1;
}
.ie-lte8 div.flash {
.ie-lte8 div.w2p_flash {
filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#222222', endColorstr='#000000', GradientType=0);
}
.ie-lte8 div.flash:hover {
.ie-lte8 div.w2p_flash:hover {
filter: alpha(opacity=25);
}
.main-container {
@@ -37,7 +37,7 @@ div.error {
display: inline-block;
padding: 5px;
}
div.flash.alert {
div.w2p_flash.alert {
display: none;
position: fixed;
top: 70px;
@@ -136,7 +136,7 @@ header h1 {
header .jumbotron {
background-color: transparent;
}
.flash {
.w2p_flash {
opacity: 0.9!important;
right: 100px;
}
applications/welcome/static/css/web2py.css
+6 -6
View File
@@ -33,7 +33,7 @@ audio {width:200px}
[type="text"], [type="password"], select {
margin-right: 5px; width: 300px;
}
.hidden {display:none;visibility:visible}
.w2p_hidden {display:none;visibility:visible}
.right {float:right; text-align:right}
.left {float:left; text-align:left}
.center {width:100%; text-align:center; vertical-align:middle}
@@ -88,7 +88,7 @@ div.w2p_export_menu a, div.w2p_wiki_tags a, div.w2p_cloud a {margin-left:5px; pa
#web2py_user_form td {vertical-align:top}
/*********** web2py specific ***********/
div.flash {
div.w2p_flash {
font-weight:bold;
display:none;
position:fixed;
@@ -117,11 +117,11 @@ div.flash {
z-index:2000;
}
div.flash #closeflash{color:inherit; float:right; margin-left:15px;}
div.w2p_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;}
div.flash:hover { opacity:0.25; }
div.w2p_flash:hover { opacity:0.25; }
div.error_wrapper {display:block}
div.error {
@@ -304,8 +304,8 @@ li.w2p_grid_breadcrumb_elem {
/* fix some IE problems */
.ie-lte7 .topbar .container {z-index:2}
.ie-lte8 div.flash{ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#222222', endColorstr='#000000', GradientType=0 ); }
.ie-lte8 div.flash:hover {filter:alpha(opacity=25);}
.ie-lte8 div.w2p_flash{ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#222222', endColorstr='#000000', GradientType=0 ); }
.ie-lte8 div.w2p_flash:hover {filter:alpha(opacity=25);}
.ie9 #w2p_query_panel {padding-bottom:2px}
.web2py_console .form-control {width: 20%; display: inline;}