fixed navbar problem with IE, thanks Paolo

This commit is contained in:
Massimo Di Pierro
2012-05-28 15:55:19 -05:00
parent b4453c6237
commit 26127e8fde
4 changed files with 10 additions and 5 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-05-28 15:45:54) dev
Version 2.00.0 (2012-05-28 15:54:06) dev
@@ -7,6 +7,8 @@ h1,h2,h3,h4,h5,h6 {font-family: inherit;}
li {margin-bottom: 0;} /*bootswatch*/
.auth_navbar, .navbar .btn-group{padding:0;}
@media only screen and (max-width: 320px) {
.navbar-inner{position:relative;}
#navbar{float:none;position:absolute;bottom:-10px;left:4px;}
@@ -146,8 +146,6 @@ div.error {
}
#navbar {float: right; padding: 5px; /* same as superfish */}
#navbar {padding: 9px;}
#navbar a {color: inherit;}
.right {
width:100%;
+7 -2
View File
@@ -70,6 +70,11 @@
if(jQuery(this).find('ul').length)
var a=jQuery(this).children('a').contents().before('<i class="icon-chevron-right"></i>');
});
jQuery('.auth_navbar').each(function(){
jQuery(this)
.addClass('btn-group')
.children('a').addClass('btn')
});
});
</script>
<noscript><link href="{{=URL('static', 'css/bootswatch_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript>
@@ -88,7 +93,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="#">web2py&trade;&nbsp;</a>
<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ',''))}}</div>
<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' ',''))}}</div>
<div class="nav-collapse">
{{is_mobile=request.user_agent().is_mobile}}
{{if response.menu:}}
@@ -118,7 +123,7 @@
</div>
</header>
<section id="main" class="main">
<section id="main" class="main span12">
<div class="row">
{{if left_sidebar_enabled:}}
<div class="span3 left-sidebar">