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

added part of bootswatch improvements, thanks Angelo

Browse Source
This commit is contained in:
mdipierro
2012-08-10 13:01:35 -05:00
parent 914a87be4e
commit 2d234a5fb6
2 changed files with 122 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-10 12:55:52) dev Version 2.00.0 (2012-08-10 13:01:31) dev
applications/welcome/static/css/bootswatch.css
+55 -37
View File
@@ -1,28 +1,23 @@
#navbar{padding-top:9px;} body {
padding-top: 60px;
}
#navbar .auth_navbar, #navbar .auth_navbar a {color:inherit;} #navbar .auth_navbar, #navbar .auth_navbar a {color:inherit;}
@media only screen and (max-width: 479px) { /* bootstrap dropdown */
div.flash {
right: 5px; .dropdown-menu ul {
} left: 100%;
position: absolute;
top: 0;
visibility: hidden;
margin-top: -1px;
} }
@media only screen and (max-width: 767px) { .dropdown-menu li:hover ul {
.navbar-inner{position:relative;} visibility: visible;
#navbar{bottom:-10px;left:4px;}
} }
@media only screen and (min-width: 768px) {
body {
height:auto; /*to avoid vertical scroll bar*/
}
h1,h2,h3,h4,h5,h6 {font-family: inherit;}
li {margin-bottom: 0;} /*bootswatch*/
.auth_navbar, .navbar .btn-group{padding:0;}
.mastheader h1 { .mastheader h1 {
margin-bottom: 9px; margin-bottom: 9px;
font-size: 81px; font-size: 81px;
@@ -40,20 +35,6 @@
font-weight: 300; font-weight: 300;
} }
/* bootstrap dropdown */
.dropdown-menu ul {
left: 100%;
position: absolute;
top: 0;
visibility: hidden;
margin-top: -1px;
}
.dropdown-menu li:hover ul {
visibility: visible;
}
.navbar .dropdown-menu ul:before { .navbar .dropdown-menu ul:before {
border-bottom: 7px solid transparent; border-bottom: 7px solid transparent;
border-left: none; border-left: none;
@@ -101,12 +82,49 @@
#navbar .auth_navbar a:hover {color:white;text-decoration:none;} /* this overwrite bootswatch */ #navbar .auth_navbar a:hover {color:white;text-decoration:none;} /* this overwrite bootswatch */
[class^="icon-"],[class*=" icon-"]{background-image:url("../images/glyphicons-halflings.png")} /* right folder for bootstrap black images/icons */ body {
.icon-white{background-image:url("../images/glyphicons-halflings-white.png");} /* right folder for bootstrap white images/icons */ height:auto; /*to avoid vertical scroll bar*/
} }
@media only screen and (min-width: 980px) { h1,h2,h3,h4,h5,h6 {font-family: inherit;}
li {margin-bottom: 0;} /*bootswatch*/
.auth_navbar, .navbar .btn-group { padding:0; }
[class^="icon-"],[class*=" icon-"]{background-image:url("../images/glyphicons-halflings.png")} /* right folder for bootstrap black images/icons */
.icon-white{background-image:url("../images/glyphicons-halflings-white.png");} /* right folder for bootstrap white images/icons */
@media only screen and (max-width: 979px) {
body { body {
padding-top: 60px; padding-top: 0px;
}
.navbar-inner{position:relative;}
#navbar{bottom:-10px;left:4px;}
div.flash {
right: 5px;
}
.dropdown-menu ul {
visibility: visible;
}
}
@media only screen and (max-width: 479px) {
body {
padding-left: 10px;
padding-right: 10px;
}
.navbar-fixed-top, .navbar-fixed-bottom {
margin-left: -10px;
margin-right: -10px;
}
input[type="text"], input[type="password"], select {
width: 95%;
} }
} }