mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-11 16:14:04 +02:00
fix broken navbar collapse
This commit is contained in:
Binary file not shown.
8
docs/assets/css/bootstrap-responsive.css
vendored
8
docs/assets/css/bootstrap-responsive.css
vendored
@@ -305,12 +305,14 @@
|
|||||||
.btn-navbar {
|
.btn-navbar {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
.nav-collapse.collapse {
|
.nav-collapse {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
height: 0;
|
height: 0;
|
||||||
}
|
}
|
||||||
.nav-collapse.collapse.in {
|
}
|
||||||
height: auto;
|
@media (min-width: 940px) {
|
||||||
|
.nav-collapse.collapse {
|
||||||
|
height: auto !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@media (min-width: 1200px) {
|
@media (min-width: 1200px) {
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
<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>
|
||||||
<div class="nav-collapse collapse">
|
<div class="nav-collapse">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="">
|
<li class="">
|
||||||
<a href="./index.html">Overview</a>
|
<a href="./index.html">Overview</a>
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
<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>
|
||||||
<div class="nav-collapse collapse">
|
<div class="nav-collapse">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="">
|
<li class="">
|
||||||
<a href="./index.html">Overview</a>
|
<a href="./index.html">Overview</a>
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
<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>
|
||||||
<div class="nav-collapse collapse">
|
<div class="nav-collapse">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="">
|
<li class="">
|
||||||
<a href="./index.html">Overview</a>
|
<a href="./index.html">Overview</a>
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
<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>
|
||||||
<div class="nav-collapse collapse">
|
<div class="nav-collapse">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="">
|
<li class="">
|
||||||
<a href="./index.html">Overview</a>
|
<a href="./index.html">Overview</a>
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
<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>
|
||||||
<div class="nav-collapse collapse">
|
<div class="nav-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>
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
<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>
|
||||||
<div class="nav-collapse collapse">
|
<div class="nav-collapse">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="">
|
<li class="">
|
||||||
<a href="./index.html">Overview</a>
|
<a href="./index.html">Overview</a>
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
<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>
|
||||||
<div class="nav-collapse collapse">
|
<div class="nav-collapse">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="">
|
<li class="">
|
||||||
<a href="./index.html">Overview</a>
|
<a href="./index.html">Overview</a>
|
||||||
@@ -345,13 +345,13 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="span3"><code>@warningText</code></td>
|
<td class="span3"><code>@warningText</code></td>
|
||||||
<td>#c09853</td>
|
<td>#f3edd2</td>
|
||||||
<td class="swatch-col"><span class="swatch" style="background-color: #c09853;"></span></td>
|
<td class="swatch-col"><span class="swatch" style="background-color: #f3edd2;"></span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><code>@warningBackground</code></td>
|
<td><code>@warningBackground</code></td>
|
||||||
<td>#f3edd2</td>
|
<td>#c09853</td>
|
||||||
<td><span class="swatch" style="background-color: #f3edd2;"></span></td>
|
<td><span class="swatch" style="background-color: #c09853;"></span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><code>@errorText</code></td>
|
<td><code>@errorText</code></td>
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
<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>
|
||||||
<div class="nav-collapse collapse">
|
<div class="nav-collapse">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="">
|
<li class="">
|
||||||
<a href="./index.html">Overview</a>
|
<a href="./index.html">Overview</a>
|
||||||
|
2
docs/templates/layout.mustache
vendored
2
docs/templates/layout.mustache
vendored
@@ -39,7 +39,7 @@
|
|||||||
<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>
|
||||||
<div class="nav-collapse collapse">
|
<div class="nav-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>
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
<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>
|
||||||
<div class="nav-collapse collapse">
|
<div class="nav-collapse">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="">
|
<li class="">
|
||||||
<a href="./index.html">Overview</a>
|
<a href="./index.html">Overview</a>
|
||||||
|
@@ -22,6 +22,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// UP TO LANDSCAPE PHONE
|
// UP TO LANDSCAPE PHONE
|
||||||
// ---------------------
|
// ---------------------
|
||||||
|
|
||||||
@@ -103,11 +104,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
|
// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
|
|
||||||
// GRID & CONTAINERS
|
// GRID & CONTAINERS
|
||||||
// -----------------
|
// -----------------
|
||||||
// Remove width from containers
|
// Remove width from containers
|
||||||
@@ -133,6 +134,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// PORTRAIT TABLET TO DEFAULT DESKTOP
|
// PORTRAIT TABLET TO DEFAULT DESKTOP
|
||||||
// ----------------------------------
|
// ----------------------------------
|
||||||
|
|
||||||
@@ -225,6 +227,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// TABLETS AND BELOW
|
// TABLETS AND BELOW
|
||||||
// -----------------
|
// -----------------
|
||||||
@media (max-width: 940px) {
|
@media (max-width: 940px) {
|
||||||
@@ -335,15 +338,23 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Hide everything in the navbar save .brand and toggle button */
|
// Hide everything in the navbar save .brand and toggle button */
|
||||||
.nav-collapse.collapse {
|
.nav-collapse {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
height: 0;
|
height: 0;
|
||||||
}
|
}
|
||||||
.nav-collapse.collapse.in {
|
|
||||||
height: auto;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// DEFAULT DESKTOP
|
||||||
|
// ---------------
|
||||||
|
|
||||||
|
@media (min-width: 940px) {
|
||||||
|
.nav-collapse.collapse {
|
||||||
|
height: auto !important;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// LARGE DESKTOP & UP
|
// LARGE DESKTOP & UP
|
||||||
|
Reference in New Issue
Block a user