mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-17 19:06:40 +02:00
Code Issues Releases Wiki Activity

derp on navbar toggle and docs positions

Browse Source
This commit is contained in:
Mark Otto
2013-04-28 14:27:48 -07:00
parent 8b3a1702d4
commit bbee78b30b
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/bootstrap.css vendored
View File

@@ -3516,7 +3516,7 @@ button.close {
} }
.navbar-nav { .navbar-nav {
margin-top: 15px; margin-top: 5px;
} }
.navbar-nav > li > a { .navbar-nav > li > a {

14
docs/assets/css/docs.css
View File

@@ -308,14 +308,21 @@ section > ul li {
.bs-navbar-bottom-example { .bs-navbar-bottom-example {
z-index: 1; z-index: 1;
padding: 0; padding: 0;
height: 110px; min-height: 110px;
overflow: hidden; /* cut the drop shadows off */ overflow: hidden; /* cut the drop shadows off */
} }
.bs-navbar-top-example .navbar-fixed-top, .bs-navbar-top-example .navbar-fixed-top,
.bs-navbar-bottom-example .navbar-fixed-bottom { .bs-navbar-bottom-example .navbar-fixed-bottom {
position: relative;
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
} }
.bs-navbar-top-example .navbar-fixed-top {
top: -1px;
}
.bs-navbar-bottom-example .navbar-fixed-bottom {
bottom: -1px;
}
.bs-navbar-top-example { .bs-navbar-top-example {
-webkit-border-radius: 0 0 4px 4px; -webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px;
@@ -711,6 +718,11 @@ input.focused {
text-align: left; text-align: left;
} }
.bs-navbar-top-example .navbar-fixed-top,
.bs-navbar-bottom-example .navbar-fixed-bottom {
position: absolute;
}
} }
/* Tablets/desktops and up */ /* Tablets/desktops and up */

4
docs/docs.html
View File

@@ -3506,7 +3506,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<h3 id="navbar-fixed-top">Fixed to top</h3> <h3 id="navbar-fixed-top">Fixed to top</h3>
<p>Add <code>.navbar-fixed-top</code>.</p> <p>Add <code>.navbar-fixed-top</code>.</p>
<div class="bs-docs-example bs-navbar-top-example"> <div class="bs-docs-example bs-navbar-top-example">
<div class="navbar navbar-fixed-top" style="position: absolute; top: -1px;"> <div class="navbar navbar-fixed-top">
<div class="container" style="width: auto;"> <div class="container" style="width: auto;">
<a class="navbar-brand" href="#">Title</a> <a class="navbar-brand" href="#">Title</a>
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
@@ -3542,7 +3542,7 @@ body {
<h3 id="navbar-fixed-bottom">Fixed to bottom</h3> <h3 id="navbar-fixed-bottom">Fixed to bottom</h3>
<p>Add <code>.navbar-fixed-bottom</code> instead.</p> <p>Add <code>.navbar-fixed-bottom</code> instead.</p>
<div class="bs-docs-example bs-navbar-bottom-example"> <div class="bs-docs-example bs-navbar-bottom-example">
<div class="navbar navbar-fixed-bottom" style="position: absolute; bottom: -1px;"> <div class="navbar navbar-fixed-bottom">
<div class="container" style="width: auto;"> <div class="container" style="width: auto;">
<a class="navbar-brand" href="#">Title</a> <a class="navbar-brand" href="#">Title</a>
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">

4
less/navbar.less
View File

@@ -17,7 +17,7 @@
.navbar-nav { .navbar-nav {
// Space out from .navbar .brand and .btn-navbar // Space out from .navbar .brand and .btn-navbar
margin-top: 15px; margin-top: 5px;
> li > a { > li > a {
padding-top: ((@navbar-height - @line-height-base) / 2); padding-top: ((@navbar-height - @line-height-base) / 2);
@@ -96,7 +96,7 @@
// Collapsible navbar toggle // Collapsible navbar toggle
.navbar-toggle { .navbar-toggle {
position: absolute; position: absolute;
top: 10px; top: 18px;
right: 10px; right: 10px;
padding: 8px 12px; padding: 8px 12px;
background-color: transparent; background-color: transparent;