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

improved bootswatch, thanks Paolo

Browse Source
This commit is contained in:
mdipierro
2012-06-18 17:07:32 -05:00
parent 71f43c0669
commit 4830a6fbf2
3 changed files with 11 additions and 9 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-06-17 23:36:32) dev Version 2.00.0 (2012-06-18 17:07:27) dev
applications/welcome/static/css/bootswatch.css
+7 -5
View File
@@ -14,7 +14,7 @@ li {margin-bottom: 0;} /*bootswatch*/
#navbar{float:none;position:absolute;bottom:-10px;left:4px;} #navbar{float:none;position:absolute;bottom:-10px;left:4px;}
} }
.jumbotron h1 { .mastheader h1 {
margin-bottom: 9px; margin-bottom: 9px;
font-size: 81px; font-size: 81px;
font-weight: bold; font-weight: bold;
@@ -22,11 +22,11 @@ li {margin-bottom: 0;} /*bootswatch*/
line-height: 1; line-height: 1;
} }
.subhead h1 { .mastheader h1 {
font-size: 54px; font-size: 54px;
} }
.jumbotron small { .mastheader small {
font-size: 20px; font-size: 20px;
font-weight: 300; font-weight: 300;
} }
@@ -68,7 +68,7 @@ li {margin-bottom: 0;} /*bootswatch*/
display:inline-block; display:inline-block;
} }
.icon-chevron-right { .chevron-right {
border-left: 4px solid #000; border-left: 4px solid #000;
border-right: 4px solid transparent; border-right: 4px solid transparent;
border-bottom: 4px solid transparent; border-bottom: 4px solid transparent;
@@ -92,5 +92,7 @@ li {margin-bottom: 0;} /*bootswatch*/
#navbar .auth_navbar, #navbar .auth_navbar a {color:inherit;} #navbar .auth_navbar, #navbar .auth_navbar a {color:inherit;}
.ie-lte7 #navbar .auth_navbar, #navbar .auth_navbar a {color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */} .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 overwrites bootswatch theme */ #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 */
.icon-white{background-image:url("../images/glyphicons-halflings-white.png");} /* right folder for bootstrap white images/icons */
applications/welcome/views/layout.html
+3 -3
View File
@@ -68,7 +68,7 @@
}); });
jQuery('.nav li li').each(function(){ jQuery('.nav li li').each(function(){
if(jQuery(this).find('ul').length) if(jQuery(this).find('ul').length)
jQuery(this).children('a').contents().before('<i class="icon-chevron-right"></i>'); jQuery(this).children('a').contents().before('<i class="chevron-right"></i>');
}); });
}); });
</script> </script>
@@ -87,12 +87,12 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="#">web2py&trade;&nbsp;</a> <a class="brand" href="#">web2py&trade;&nbsp;</a>
<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ','')) or ''}}</div>
<div class="nav-collapse"> <div class="nav-collapse">
{{is_mobile=request.user_agent().is_mobile}} {{is_mobile=request.user_agent().is_mobile}}
{{if response.menu:}} {{if response.menu:}}
{{=MENU(response.menu, _class='mobile-menu nav' if is_mobile else 'nav',mobile=is_mobile,li_class='dropdown',ul_class='dropdown-menu')}} {{=MENU(response.menu, _class='mobile-menu nav' if is_mobile else 'nav',mobile=is_mobile,li_class='dropdown',ul_class='dropdown-menu')}}
{{pass}} {{pass}}
<div class="nav pull-right" id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ','')) or ''}}</div>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </div>
@@ -102,7 +102,7 @@
<div class="container"> <div class="container">
<!-- Masthead ================================================== --> <!-- Masthead ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="mastheader" id="header">
<div class="page-header"> <div class="page-header">
<h1> <h1>
{{=response.title or request.application}} {{=response.title or request.application}}