Skip to content
GitLab
Commit a6281091 authored by Jacob Thornton's avatar Jacob Thornton
Browse files

fix responsive navbar

parent a5552a1d
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 16 deletions
+17 -16
docs/assets/bootstrap.zip
+ 0
- 0
View file @ a6281091
No preview for this file type
docs/assets/css/bootstrap-responsive.css
+ 2
- 1
View file @ a6281091
...@@ -667,7 +667,8 @@ ...@@ -667,7 +667,8 @@
.btn-navbar { .btn-navbar {
display: block; display: block;
} }
.nav-collapse { .nav-collapse,
.nav-collapse.collapse {
overflow: hidden; overflow: hidden;
height: 0; height: 0;
} }
......
docs/assets/css/bootstrap.css
+ 1
- 1
View file @ a6281091
...@@ -2804,7 +2804,7 @@ input[type="submit"].btn.btn-mini { ...@@ -2804,7 +2804,7 @@ input[type="submit"].btn.btn-mini {
margin-bottom: 18px; margin-bottom: 18px;
} }
.navbar-inner { .navbar-inner {
height: 40px; min-height: 40px;
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;
background-color: #2c2c2c; background-color: #2c2c2c;
......
docs/base-css.html
+ 1
- 1
View file @ a6281091
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li class=""> <li class="">
<a href="./index.html">Overview</a> <a href="./index.html">Overview</a>
......
docs/components.html
+ 1
- 1
View file @ a6281091
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li class=""> <li class="">
<a href="./index.html">Overview</a> <a href="./index.html">Overview</a>
......
docs/css-tests.html
+ 1
- 1
View file @ a6281091
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li class=""> <li class="">
<a href="./index.html">Overview</a> <a href="./index.html">Overview</a>
......
docs/download.html
+ 1
- 1
View file @ a6281091
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li class=""> <li class="">
<a href="./index.html">Overview</a> <a href="./index.html">Overview</a>
......
docs/examples.html
+ 1
- 1
View file @ a6281091
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li class=""> <li class="">
<a href="./index.html">Overview</a> <a href="./index.html">Overview</a>
......
docs/index.html
+ 1
- 1
View file @ a6281091
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li class="active"> <li class="active">
<a href="./index.html">Overview</a> <a href="./index.html">Overview</a>
......
docs/javascript.html
+ 1
- 1
View file @ a6281091
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li class=""> <li class="">
<a href="./index.html">Overview</a> <a href="./index.html">Overview</a>
......
docs/less.html
+ 1
- 1
View file @ a6281091
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li class=""> <li class="">
<a href="./index.html">Overview</a> <a href="./index.html">Overview</a>
......
docs/scaffolding.html
+ 1
- 1
View file @ a6281091
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li class=""> <li class="">
<a href="./index.html">Overview</a> <a href="./index.html">Overview</a>
......
docs/templates/layout.mustache
+ 1
- 1
View file @ a6281091
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li class="{{index}}"> <li class="{{index}}">
<a href="./index.html">{{_i}}Overview{{/i}}</a> <a href="./index.html">{{_i}}Overview{{/i}}</a>
......
docs/upgrading.html
+ 1
- 1
View file @ a6281091
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse collapse">
<ul class="nav"> <ul class="nav">
<li class=""> <li class="">
<a href="./index.html">Overview</a> <a href="./index.html">Overview</a>
......
less/navbar.less
+ 1
- 1
View file @ a6281091
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
// Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present // Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
.navbar-inner { .navbar-inner {
height: @navbarHeight; min-height: @navbarHeight;
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground); #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
......
less/responsive-navbar.less
+ 2
- 2
View file @ a6281091
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
} }
// Hide everything in the navbar save .brand and toggle button */ // Hide everything in the navbar save .brand and toggle button */
.nav-collapse { .nav-collapse, .nav-collapse.collapse {
overflow: hidden; overflow: hidden;
height: 0; height: 0;
} }
...@@ -128,4 +128,4 @@ ...@@ -128,4 +128,4 @@
height: auto !important; height: auto !important;
overflow: visible !important; overflow: visible !important;
} }
} }
\ No newline at end of file
Supports Markdown
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