Skip to content

B
bootstrap
Commit b8a683d7 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

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

parent ea1c21d6
Hide whitespace changes
Inline Side-by-side
Showing with 299 additions and 274 deletions
docs/assets/css/bootstrap-responsive.css
View file @ b8a683d7
...@@ -86,9 +86,6 @@ ...@@ -86,9 +86,6 @@
width: auto; width: auto;
margin: 0; margin: 0;
} }
.btn-navbar {
display: block;
}
} }
@media (min-width: 768px) and (max-width: 940px) { @media (min-width: 768px) and (max-width: 940px) {
.container { .container {
...@@ -258,6 +255,13 @@ ...@@ -258,6 +255,13 @@
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
} }
.btn-navbar {
display: block;
}
.nav-collapse {
overflow: hidden;
height: 0;
}
} }
/* /*
@media (min-width: 1210px) { @media (min-width: 1210px) {
......
docs/assets/css/bootstrap.css
View file @ b8a683d7
...@@ -2356,7 +2356,6 @@ button.btn.small, input[type="submit"].btn.small { ...@@ -2356,7 +2356,6 @@ button.btn.small, input[type="submit"].btn.small {
margin-top: 3px; margin-top: 3px;
} }
.navbar .brand:hover { .navbar .brand:hover {
color: #ffffff;
text-decoration: none; text-decoration: none;
} }
.navbar .brand { .navbar .brand {
......
docs/base-css.html
View file @ b8a683d7
...@@ -26,42 +26,44 @@ ...@@ -26,42 +26,44 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <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> <span class="i-bar"></span>
<span class="i-bar"></span> <span class="i-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <div class="nav-collapse">
<li class=""> <ul class="nav">
<a href="./index.html">Overview</a> <li class="">
</li> <a href="./index.html">Overview</a>
<li class=""> </li>
<a href="./scaffolding.html">Scaffolding</a> <li class="">
</li> <a href="./scaffolding.html">Scaffolding</a>
<li class="active"> </li>
<a href="./base-css.html">Base CSS</a> <li class="active">
</li> <a href="./base-css.html">Base CSS</a>
<li class=""> </li>
<a href="./components.html">Components</a> <li class="">
</li> <a href="./components.html">Components</a>
<li class=""> </li>
<a href="./javascript.html">Javascript plugins</a> <li class="">
</li> <a href="./javascript.html">Javascript plugins</a>
<li class=""> </li>
<a href="./less.html">Using LESS</a> <li class="">
</li> <a href="./less.html">Using LESS</a>
<li class=""> </li>
<a href="./download.html">Customize</a> <li class="">
</li> <a href="./download.html">Customize</a>
</ul> </li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
docs/components.html
View file @ b8a683d7
...@@ -26,42 +26,44 @@ ...@@ -26,42 +26,44 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <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> <span class="i-bar"></span>
<span class="i-bar"></span> <span class="i-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <div class="nav-collapse">
<li class=""> <ul class="nav">
<a href="./index.html">Overview</a> <li class="">
</li> <a href="./index.html">Overview</a>
<li class=""> </li>
<a href="./scaffolding.html">Scaffolding</a> <li class="">
</li> <a href="./scaffolding.html">Scaffolding</a>
<li class=""> </li>
<a href="./base-css.html">Base CSS</a> <li class="">
</li> <a href="./base-css.html">Base CSS</a>
<li class="active"> </li>
<a href="./components.html">Components</a> <li class="active">
</li> <a href="./components.html">Components</a>
<li class=""> </li>
<a href="./javascript.html">Javascript plugins</a> <li class="">
</li> <a href="./javascript.html">Javascript plugins</a>
<li class=""> </li>
<a href="./less.html">Using LESS</a> <li class="">
</li> <a href="./less.html">Using LESS</a>
<li class=""> </li>
<a href="./download.html">Customize</a> <li class="">
</li> <a href="./download.html">Customize</a>
</ul> </li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
docs/download.html
View file @ b8a683d7
...@@ -26,42 +26,44 @@ ...@@ -26,42 +26,44 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <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> <span class="i-bar"></span>
<span class="i-bar"></span> <span class="i-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <div class="nav-collapse">
<li class=""> <ul class="nav">
<a href="./index.html">Overview</a> <li class="">
</li> <a href="./index.html">Overview</a>
<li class=""> </li>
<a href="./scaffolding.html">Scaffolding</a> <li class="">
</li> <a href="./scaffolding.html">Scaffolding</a>
<li class=""> </li>
<a href="./base-css.html">Base CSS</a> <li class="">
</li> <a href="./base-css.html">Base CSS</a>
<li class=""> </li>
<a href="./components.html">Components</a> <li class="">
</li> <a href="./components.html">Components</a>
<li class=""> </li>
<a href="./javascript.html">Javascript plugins</a> <li class="">
</li> <a href="./javascript.html">Javascript plugins</a>
<li class=""> </li>
<a href="./less.html">Using LESS</a> <li class="">
</li> <a href="./less.html">Using LESS</a>
<li class="active"> </li>
<a href="./download.html">Customize</a> <li class="active">
</li> <a href="./download.html">Customize</a>
</ul> </li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
docs/examples.html
View file @ b8a683d7
...@@ -26,42 +26,44 @@ ...@@ -26,42 +26,44 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <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> <span class="i-bar"></span>
<span class="i-bar"></span> <span class="i-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <div class="nav-collapse">
<li class=""> <ul class="nav">
<a href="./index.html">Overview</a> <li class="">
</li> <a href="./index.html">Overview</a>
<li class=""> </li>
<a href="./scaffolding.html">Scaffolding</a> <li class="">
</li> <a href="./scaffolding.html">Scaffolding</a>
<li class=""> </li>
<a href="./base-css.html">Base CSS</a> <li class="">
</li> <a href="./base-css.html">Base CSS</a>
<li class=""> </li>
<a href="./components.html">Components</a> <li class="">
</li> <a href="./components.html">Components</a>
<li class=""> </li>
<a href="./javascript.html">Javascript plugins</a> <li class="">
</li> <a href="./javascript.html">Javascript plugins</a>
<li class=""> </li>
<a href="./less.html">Using LESS</a> <li class="">
</li> <a href="./less.html">Using LESS</a>
<li class=""> </li>
<a href="./download.html">Customize</a> <li class="">
</li> <a href="./download.html">Customize</a>
</ul> </li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
docs/index.html
View file @ b8a683d7
...@@ -26,42 +26,44 @@ ...@@ -26,42 +26,44 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <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> <span class="i-bar"></span>
<span class="i-bar"></span> <span class="i-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <div class="nav-collapse">
<li class="active"> <ul class="nav">
<a href="./index.html">Overview</a> <li class="active">
</li> <a href="./index.html">Overview</a>
<li class=""> </li>
<a href="./scaffolding.html">Scaffolding</a> <li class="">
</li> <a href="./scaffolding.html">Scaffolding</a>
<li class=""> </li>
<a href="./base-css.html">Base CSS</a> <li class="">
</li> <a href="./base-css.html">Base CSS</a>
<li class=""> </li>
<a href="./components.html">Components</a> <li class="">
</li> <a href="./components.html">Components</a>
<li class=""> </li>
<a href="./javascript.html">Javascript plugins</a> <li class="">
</li> <a href="./javascript.html">Javascript plugins</a>
<li class=""> </li>
<a href="./less.html">Using LESS</a> <li class="">
</li> <a href="./less.html">Using LESS</a>
<li class=""> </li>
<a href="./download.html">Customize</a> <li class="">
</li> <a href="./download.html">Customize</a>
</ul> </li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
docs/javascript.html
View file @ b8a683d7
...@@ -26,42 +26,44 @@ ...@@ -26,42 +26,44 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <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> <span class="i-bar"></span>
<span class="i-bar"></span> <span class="i-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <div class="nav-collapse">
<li class=""> <ul class="nav">
<a href="./index.html">Overview</a> <li class="">
</li> <a href="./index.html">Overview</a>
<li class=""> </li>
<a href="./scaffolding.html">Scaffolding</a> <li class="">
</li> <a href="./scaffolding.html">Scaffolding</a>
<li class=""> </li>
<a href="./base-css.html">Base CSS</a> <li class="">
</li> <a href="./base-css.html">Base CSS</a>
<li class=""> </li>
<a href="./components.html">Components</a> <li class="">
</li> <a href="./components.html">Components</a>
<li class="active"> </li>
<a href="./javascript.html">Javascript plugins</a> <li class="active">
</li> <a href="./javascript.html">Javascript plugins</a>
<li class=""> </li>
<a href="./less.html">Using LESS</a> <li class="">
</li> <a href="./less.html">Using LESS</a>
<li class=""> </li>
<a href="./download.html">Customize</a> <li class="">
</li> <a href="./download.html">Customize</a>
</ul> </li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
docs/less.html
View file @ b8a683d7
...@@ -26,42 +26,44 @@ ...@@ -26,42 +26,44 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <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> <span class="i-bar"></span>
<span class="i-bar"></span> <span class="i-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <div class="nav-collapse">
<li class=""> <ul class="nav">
<a href="./index.html">Overview</a> <li class="">
</li> <a href="./index.html">Overview</a>
<li class=""> </li>
<a href="./scaffolding.html">Scaffolding</a> <li class="">
</li> <a href="./scaffolding.html">Scaffolding</a>
<li class=""> </li>
<a href="./base-css.html">Base CSS</a> <li class="">
</li> <a href="./base-css.html">Base CSS</a>
<li class=""> </li>
<a href="./components.html">Components</a> <li class="">
</li> <a href="./components.html">Components</a>
<li class=""> </li>
<a href="./javascript.html">Javascript plugins</a> <li class="">
</li> <a href="./javascript.html">Javascript plugins</a>
<li class="active"> </li>
<a href="./less.html">Using LESS</a> <li class="active">
</li> <a href="./less.html">Using LESS</a>
<li class=""> </li>
<a href="./download.html">Customize</a> <li class="">
</li> <a href="./download.html">Customize</a>
</ul> </li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
docs/scaffolding.html
View file @ b8a683d7
...@@ -26,42 +26,44 @@ ...@@ -26,42 +26,44 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <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> <span class="i-bar"></span>
<span class="i-bar"></span> <span class="i-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <div class="nav-collapse">
<li class=""> <ul class="nav">
<a href="./index.html">Overview</a> <li class="">
</li> <a href="./index.html">Overview</a>
<li class="active"> </li>
<a href="./scaffolding.html">Scaffolding</a> <li class="active">
</li> <a href="./scaffolding.html">Scaffolding</a>
<li class=""> </li>
<a href="./base-css.html">Base CSS</a> <li class="">
</li> <a href="./base-css.html">Base CSS</a>
<li class=""> </li>
<a href="./components.html">Components</a> <li class="">
</li> <a href="./components.html">Components</a>
<li class=""> </li>
<a href="./javascript.html">Javascript plugins</a> <li class="">
</li> <a href="./javascript.html">Javascript plugins</a>
<li class=""> </li>
<a href="./less.html">Using LESS</a> <li class="">
</li> <a href="./less.html">Using LESS</a>
<li class=""> </li>
<a href="./download.html">Customize</a> <li class="">
</li> <a href="./download.html">Customize</a>
</ul> </li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
docs/templates/layout.mustache
View file @ b8a683d7
...@@ -26,42 +26,44 @@ ...@@ -26,42 +26,44 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <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> <span class="i-bar"></span>
<span class="i-bar"></span> <span class="i-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <div class="nav-collapse">
<li class="{{index}}"> <ul class="nav">
<a href="./index.html">{{_i}}Overview{{/i}}</a> <li class="{{index}}">
</li> <a href="./index.html">{{_i}}Overview{{/i}}</a>
<li class="{{scaffolding}}"> </li>
<a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a> <li class="{{scaffolding}}">
</li> <a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a>
<li class="{{base-css}}"> </li>
<a href="./base-css.html">{{_i}}Base CSS{{/i}}</a> <li class="{{base-css}}">
</li> <a href="./base-css.html">{{_i}}Base CSS{{/i}}</a>
<li class="{{components}}"> </li>
<a href="./components.html">{{_i}}Components{{/i}}</a> <li class="{{components}}">
</li> <a href="./components.html">{{_i}}Components{{/i}}</a>
<li class="{{javascript}}"> </li>
<a href="./javascript.html">{{_i}}Javascript plugins{{/i}}</a> <li class="{{javascript}}">
</li> <a href="./javascript.html">{{_i}}Javascript plugins{{/i}}</a>
<li class="{{less}}"> </li>
<a href="./less.html">{{_i}}Using LESS{{/i}}</a> <li class="{{less}}">
</li> <a href="./less.html">{{_i}}Using LESS{{/i}}</a>
<li class="{{download}}"> </li>
<a href="./download.html">{{_i}}Customize{{/i}}</a> <li class="{{download}}">
</li> <a href="./download.html">{{_i}}Customize{{/i}}</a>
</ul> </li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
docs/upgrading.html
View file @ b8a683d7
...@@ -26,42 +26,44 @@ ...@@ -26,42 +26,44 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <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> <span class="i-bar"></span>
<span class="i-bar"></span> <span class="i-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <div class="nav-collapse">
<li class=""> <ul class="nav">
<a href="./index.html">Overview</a> <li class="">
</li> <a href="./index.html">Overview</a>
<li class=""> </li>
<a href="./scaffolding.html">Scaffolding</a> <li class="">
</li> <a href="./scaffolding.html">Scaffolding</a>
<li class=""> </li>
<a href="./base-css.html">Base CSS</a> <li class="">
</li> <a href="./base-css.html">Base CSS</a>
<li class=""> </li>
<a href="./components.html">Components</a> <li class="">
</li> <a href="./components.html">Components</a>
<li class=""> </li>
<a href="./javascript.html">Javascript plugins</a> <li class="">
</li> <a href="./javascript.html">Javascript plugins</a>
<li class=""> </li>
<a href="./less.html">Using LESS</a> <li class="">
</li> <a href="./less.html">Using LESS</a>
<li class=""> </li>
<a href="./download.html">Customize</a> <li class="">
</li> <a href="./download.html">Customize</a>
</ul> </li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
less/accordion.less
View file @ b8a683d7
// COLLAPSE // ACCORDION
// -------- // ---------
// Parent container // Parent container
......
less/navbar.less
View file @ b8a683d7
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
.navbar { .navbar {
// Hover and active states // Hover and active states
.brand:hover { .brand:hover {
color: @white;
text-decoration: none; text-decoration: none;
} }
// Website or project name // Website or project name
...@@ -286,4 +285,4 @@ ...@@ -286,4 +285,4 @@
left: auto; left: auto;
right: 13px; right: 13px;
} }
} }
\ No newline at end of file
less/responsive.less
View file @ b8a683d7
...@@ -126,12 +126,6 @@ ...@@ -126,12 +126,6 @@
width: auto; width: auto;
margin: 0; margin: 0;
} }
// Navbar button
.btn-navbar {
display: block;
}
} }
...@@ -292,6 +286,15 @@ ...@@ -292,6 +286,15 @@
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
} }
// Navbar button
.btn-navbar {
display: block;
}
.nav-collapse {
overflow: hidden;
height: 0;
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment