upgraded to Bootstrap 2.1.0 thanks Alec Taylor
This commit is contained in:
Massimo Di Pierro
@@ -1 +1 @@
|
||||
Version 2.00.0 (2012-08-24 09:26:31) dev
|
||||
Version 2.00.0 (2012-08-24 09:43:38) dev
|
||||
|
||||
@@ -35,7 +35,7 @@ def _():
|
||||
ctr = request.controller
|
||||
# useful links to internal and external resources
|
||||
response.menu+=[
|
||||
(SPAN('web2py',_style='color:yellow'),False, 'http://web2py.com', [
|
||||
('web2py',False, 'http://web2py.com', [
|
||||
(T('My Sites'),False,URL('admin','default','site')),
|
||||
(T('This App'),False,URL('admin','default','design/%s' % app), [
|
||||
(T('Controller'),False,
|
||||
|
||||
File diff suppressed because one or more lines are too long
+2
-2
File diff suppressed because one or more lines are too long
@@ -1,9 +1,7 @@
|
||||
body {
|
||||
padding-top: 60px;
|
||||
padding-top: 50px;
|
||||
}
|
||||
|
||||
#navbar .auth_navbar, #navbar .auth_navbar a {color:inherit;}
|
||||
|
||||
/* bootstrap dropdown */
|
||||
|
||||
.dropdown-menu ul {
|
||||
@@ -12,119 +10,206 @@ body {
|
||||
top: 0;
|
||||
visibility: hidden;
|
||||
margin-top: -1px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.dropdown-menu li:hover ul {
|
||||
visibility: visible;
|
||||
|
||||
.nav i {
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.mastheader h1 {
|
||||
margin-bottom: 9px;
|
||||
font-size: 81px;
|
||||
font-weight: bold;
|
||||
letter-spacing: -1px;
|
||||
line-height: 1;
|
||||
.nav a:hover i {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.mastheader h1 {
|
||||
font-size: 54px;
|
||||
.tooltip-inner {
|
||||
max-width: 500px;
|
||||
}
|
||||
|
||||
.mastheader small {
|
||||
font-size: 20px;
|
||||
font-weight: 300;
|
||||
.alert a {
|
||||
font-weight: bold;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.navbar .dropdown-menu ul:before {
|
||||
border-bottom: 7px solid transparent;
|
||||
border-left: none;
|
||||
border-right: 7px solid rgba(0, 0, 0, 0.2);
|
||||
border-top: 7px solid transparent;
|
||||
left: -7px;
|
||||
top: 5px;
|
||||
.alert p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.navbar .dropdown-menu ul:after {
|
||||
border-top: 6px solid transparent;
|
||||
border-left: none;
|
||||
border-right: 6px solid #fff;
|
||||
border-bottom: 6px solid transparent;
|
||||
left: 10px;
|
||||
top: 6px;
|
||||
left: -6px;
|
||||
.hero-unit {
|
||||
margin-top: 60px;
|
||||
margin-bottom: 60px;
|
||||
}
|
||||
|
||||
.dropdown-menu span{
|
||||
display:inline-block;
|
||||
.hero-unit h1, .hero-unit p {
|
||||
text-align: center;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.chevron-right {
|
||||
border-left: 4px solid #000;
|
||||
border-right: 4px solid transparent;
|
||||
border-bottom: 4px solid transparent;
|
||||
border-top: 4px solid transparent;
|
||||
content: "";
|
||||
display: inline-block;
|
||||
height: 0;
|
||||
#social {
|
||||
margin-top: 45px;
|
||||
}
|
||||
|
||||
.twitter-follow-button {
|
||||
width: 150px !important;
|
||||
}
|
||||
|
||||
.rss-button {
|
||||
width: 40px;
|
||||
height: 14px;
|
||||
font-size: 11px;
|
||||
line-height: 14px;
|
||||
font-weight: bold;
|
||||
margin: 0;
|
||||
padding: 2px 5px 2px 4px;
|
||||
}
|
||||
|
||||
.icon-rss {
|
||||
background: url(../img/rss-icons.png) no-repeat 0 0;
|
||||
opacity: .65;
|
||||
width: 16px;
|
||||
}
|
||||
|
||||
.icon-envelope {
|
||||
opacity: .65;
|
||||
}
|
||||
|
||||
.about {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.about .span4 {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.about h3 {
|
||||
margin: 0 0 5px 35px;
|
||||
}
|
||||
|
||||
.about img {
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
opacity: 0.7;
|
||||
vertical-align: top;
|
||||
width: 0;
|
||||
margin-right:-13px;
|
||||
margin-top: 7px;
|
||||
float:right;
|
||||
}
|
||||
|
||||
.open > .dropdown-menu ul { /* fix menu issue when BS2.0.4 is applied */
|
||||
display: block;
|
||||
#gallery {
|
||||
margin: 45px 0 30px 0;
|
||||
padding-right: 20px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.ie-lte7 #navbar .auth_navbar, #navbar .auth_navbar a {color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */}
|
||||
|
||||
#navbar .auth_navbar a:hover {color:white;text-decoration:none;} /* this overwrite bootswatch */
|
||||
|
||||
body {
|
||||
height:auto; /*to avoid vertical scroll bar*/
|
||||
.thumbnail {
|
||||
margin-bottom: 20px;
|
||||
background-color: rgba(0, 0, 0, 0.05);
|
||||
}
|
||||
|
||||
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 {
|
||||
padding-top: 0px;
|
||||
}
|
||||
|
||||
.navbar-inner{position:relative;}
|
||||
#navbar{bottom:-10px;left:4px;}
|
||||
|
||||
div.flash {
|
||||
right: 5px;
|
||||
}
|
||||
|
||||
.dropdown-menu ul {
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
.thumbnail img {
|
||||
width: 100%;
|
||||
-webkit-border-radius: 7px;
|
||||
-moz-border-radius: 7px;
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
@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%;
|
||||
}
|
||||
.thumbnail .label {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.thumbnail .btn-toolbar {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.modal .label {
|
||||
vertical-align: text-top;
|
||||
}
|
||||
|
||||
.links {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.links > a {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
/* Landscape phones and down */
|
||||
@media (max-width: 480px) {
|
||||
|
||||
.hero-unit {
|
||||
padding: 40px 20px 10px;
|
||||
margin: 0 0 20px;
|
||||
}
|
||||
|
||||
.hero-unit h1 {
|
||||
font-size: 36px;
|
||||
}
|
||||
|
||||
.hero-unit p {
|
||||
font-size: 13px;
|
||||
line-height: 18px;
|
||||
}
|
||||
|
||||
#social {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
.about {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.about h3 {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.about p {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.modal {
|
||||
position: fixed !important;
|
||||
top: 25% !important;
|
||||
}
|
||||
}
|
||||
|
||||
div.one .bsa_it_ad {
|
||||
padding: 25px 25px 15px 25px;
|
||||
}
|
||||
|
||||
div.one .bsa_it_p {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#bsap_aplink {
|
||||
float: right;
|
||||
margin-bottom: 20px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
/* Landscape phone to portrait tablet */
|
||||
@media (min-width: 481px) and (max-width: 767px) {
|
||||
|
||||
.hero-unit {
|
||||
margin-top: 0;
|
||||
padding-bottom: 60px;
|
||||
}
|
||||
|
||||
.about {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* Portrait tablet to landscape and desktop */
|
||||
@media (min-width: 768px) and (max-width: 980px) {
|
||||
|
||||
.hero-unit {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.thumbnail .btn {
|
||||
font-size: 11px;
|
||||
}
|
||||
}
|
||||
|
||||
/* Large desktop */
|
||||
@media (min-width: 1200px) {
|
||||
|
||||
}
|
||||
@@ -160,7 +160,6 @@
|
||||
if(jQuery(this).find('ul').length)
|
||||
jQuery(this).children('a').contents().before('<i class="chevron-right"></i>');
|
||||
});
|
||||
|
||||
if(jQuery(document).width()>=980) {
|
||||
jQuery('ul.nav li.dropdown').hover(function() {
|
||||
jQuery(this).find('.dropdown-menu').stop(true, true).delay(200).fadeIn();
|
||||
|
||||
Reference in New Issue
Block a user