diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 56322 -> 56377 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 12 | ||||
| -rw-r--r-- | docs/components.html | 15 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 15 |
4 files changed, 35 insertions, 7 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex c451d13a2..44fdb437a 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e9fb04f2d..b90cb7635 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2840,20 +2840,26 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); outline: 0; } -.navbar-fixed-top { +.navbar-fixed-top, .navbar-fixed-bottom { position: fixed; - top: 0; right: 0; left: 0; z-index: 1030; + margin-bottom: 0; } -.navbar-fixed-top .navbar-inner { +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.navbar-fixed-top { + top: 0; +} +.navbar-fixed-bottom { + bottom: 0; +} .navbar .nav { position: relative; left: 0; diff --git a/docs/components.html b/docs/components.html index 172fbcf20..9cfd261ff 100644 --- a/docs/components.html +++ b/docs/components.html @@ -849,13 +849,24 @@ </div> </pre> <h3>Fixed navbar</h3> - <p>To make the navbar fixed to the top of the viewport, add <code>.navbar-fixed-top</code> to the outermost div, <code>.navbar</code>.</p> + <p>Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, <code>.navbar</code>.</p> + <div class="row"> + <div class="span4"> <pre class="prettyprint linenums"> <div class="navbar navbar-fixed-top"> ... </div> </pre> - <p>In your CSS, you will also need to account for the overlap it causes by adding 40px or more of padding to your <code><body></code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p> + </div><!--/span--> + <div class="span4"> +<pre class="prettyprint linenums"> +<div class="navbar navbar-fixed-bottom"> + ... +</div> +</pre> + </div><!--/span--> + </div><!--/row--> + <p>When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of apdding to the <code><body></code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p> <h3>Brand name</h3> <p>A simple link to show your brand or project name only requires an anchor tag.</p> <pre class="prettyprint linenums"> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 3a176fa44..8868d9927 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -773,13 +773,24 @@ </div> </pre> <h3>{{_i}}Fixed navbar{{/i}}</h3> - <p>{{_i}}To make the navbar fixed to the top of the viewport, add <code>.navbar-fixed-top</code> to the outermost div, <code>.navbar</code>.{{/i}}</p> + <p>{{_i}}Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, <code>.navbar</code>.{{/i}}</p> + <div class="row"> + <div class="span4"> <pre class="prettyprint linenums"> <div class="navbar navbar-fixed-top"> ... </div> </pre> - <p>{{_i}}In your CSS, you will also need to account for the overlap it causes by adding 40px or more of padding to your <code><body></code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}</p> + </div><!--/span--> + <div class="span4"> +<pre class="prettyprint linenums"> +<div class="navbar navbar-fixed-bottom"> + ... +</div> +</pre> + </div><!--/span--> + </div><!--/row--> + <p>{{_i}}When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of apdding to the <code><body></code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}</p> <h3>{{_i}}Brand name{{/i}}</h3> <p>{{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}</p> <pre class="prettyprint linenums"> |