turn off brand hover for now + get nav toggling in mobile

This commit is contained in:
Jacob Thornton 2012-01-28 15:42:07 -08:00
parent ea1c21d62d
commit b8a683d7f2
15 changed files with 299 additions and 274 deletions

View File

@ -86,9 +86,6 @@
width: auto;
margin: 0;
}
.btn-navbar {
display: block;
}
}
@media (min-width: 768px) and (max-width: 940px) {
.container {
@ -258,6 +255,13 @@
padding-left: 10px;
padding-right: 10px;
}
.btn-navbar {
display: block;
}
.nav-collapse {
overflow: hidden;
height: 0;
}
}
/*
@media (min-width: 1210px) {

View File

@ -2356,7 +2356,6 @@ button.btn.small, input[type="submit"].btn.small {
margin-top: 3px;
}
.navbar .brand:hover {
color: #ffffff;
text-decoration: none;
}
.navbar .brand {

View File

@ -33,12 +33,13 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
@ -65,6 +66,7 @@
</div>
</div>
</div>
</div>
<div class="container">

View File

@ -33,12 +33,13 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
@ -65,6 +66,7 @@
</div>
</div>
</div>
</div>
<div class="container">

View File

@ -33,12 +33,13 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
@ -65,6 +66,7 @@
</div>
</div>
</div>
</div>
<div class="container">

View File

@ -33,12 +33,13 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
@ -65,6 +66,7 @@
</div>
</div>
</div>
</div>
<div class="container">

View File

@ -33,12 +33,13 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse">
<ul class="nav">
<li class="active">
<a href="./index.html">Overview</a>
@ -65,6 +66,7 @@
</div>
</div>
</div>
</div>
<div class="container">

View File

@ -33,12 +33,13 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
@ -65,6 +66,7 @@
</div>
</div>
</div>
</div>
<div class="container">

View File

@ -33,12 +33,13 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
@ -65,6 +66,7 @@
</div>
</div>
</div>
</div>
<div class="container">

View File

@ -33,12 +33,13 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
@ -65,6 +66,7 @@
</div>
</div>
</div>
</div>
<div class="container">

View File

@ -33,12 +33,13 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse">
<ul class="nav">
<li class="{{index}}">
<a href="./index.html">{{_i}}Overview{{/i}}</a>
@ -65,6 +66,7 @@
</div>
</div>
</div>
</div>
<div class="container">

View File

@ -33,12 +33,13 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
@ -65,6 +66,7 @@
</div>
</div>
</div>
</div>
<div class="container">

View File

@ -1,5 +1,5 @@
// COLLAPSE
// --------
// ACCORDION
// ---------
// Parent container

View File

@ -43,7 +43,6 @@
.navbar {
// Hover and active states
.brand:hover {
color: @white;
text-decoration: none;
}
// Website or project name

View File

@ -126,12 +126,6 @@
width: auto;
margin: 0;
}
// Navbar button
.btn-navbar {
display: block;
}
}
@ -292,6 +286,15 @@
padding-left: 10px;
padding-right: 10px;
}
// Navbar button
.btn-navbar {
display: block;
}
.nav-collapse {
overflow: hidden;
height: 0;
}
}