Skip to content

B
bootstrap
Commit 7dbcd0be authored by Mark Otto's avatar Mark Otto
Browse files
Options

fix navbar button for mobile tapping (turn to button instead of adding... 

fix navbar button for mobile tapping (turn to button instead of adding href=#), streamline less docs page
parent aaf1825b
Show whitespace changes
Inline Side-by-side
Showing with 998 additions and 1012 deletions
docs/base-css.html
View file @ 7dbcd0be
......@@ -34,11 +34,11 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
......
docs/components.html
View file @ 7dbcd0be
......@@ -34,11 +34,11 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
......
docs/download.html
View file @ 7dbcd0be
......@@ -34,11 +34,11 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
......
docs/examples.html
View file @ 7dbcd0be
......@@ -34,11 +34,11 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
......
docs/index.html
View file @ 7dbcd0be
......@@ -34,11 +34,11 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
......
docs/javascript.html
View file @ 7dbcd0be
......@@ -34,11 +34,11 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
......
docs/less.html
View file @ 7dbcd0be
......@@ -34,11 +34,11 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
......@@ -138,13 +138,11 @@
<h1>Bootstrap variables <small>LESS variables, their values, and usage guidelines</small></h1>
</div>
<div class="row">
<div class="span6">
<h3>Scaffolding and links</h3>
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@bodyBackground</code></td>
<td class="span4"><code>@bodyBackground</code></td>
<td><code>@white</code></td>
<td>Page background color</td>
<td class="swatch-col"><span class="swatch" style="background-color: #fff;"></span></td>
......@@ -173,7 +171,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@gridColumns</code></td>
<td class="span4"><code>@gridColumns</code></td>
<td>12</td>
</tr>
<tr>
......@@ -198,7 +196,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@sansFontFamily</code></td>
<td class="span4"><code>@sansFontFamily</code></td>
<td colspan="2">"Helvetica Neue", Helvetica, Arial, sans-serif</td>
</tr>
<tr>
......@@ -211,7 +209,7 @@
</tr>
<tr>
<td class="span2"><code>@baseFontSize</code></td>
<td><code>@baseFontSize</code></td>
<td>13px</td>
<td><em class="muted">Must be pixels</em></td>
</tr>
......@@ -230,7 +228,7 @@
</tr>
<tr>
<td class="span2"><code>@headingsFontFamily</code></td>
<td><code>@headingsFontFamily</code></td>
<td colspan="2"><code>inherit</code></td>
</tr>
<tr>
......@@ -247,7 +245,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@tableBackground</code></td>
<td class="span4"><code>@tableBackground</code></td>
<td><code>transparent</code></td>
</tr>
<tr>
......@@ -264,13 +262,12 @@
</tr>
</tbody>
</table>
</div>
<div class="span6">
<h3>Grayscale colors</h3>
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@black</code></td>
<td class="span4"><code>@black</code></td>
<td>#000</td>
<td class="swatch-col"><span class="swatch" style="background-color: #000;"></span></td>
</tr>
......@@ -310,7 +307,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@blue</code></td>
<td class="span4"><code>@blue</code></td>
<td>#049cdb</td>
<td class="swatch-col"><span class="swatch" style="background-color: #049cdb;"></span></td>
</tr>
......@@ -346,93 +343,91 @@
</tr>
</tbody>
</table>
</div>
</div> <!-- /row -->
<h3>Components</h3>
<div class="row">
<div class="span6">
<h4>Buttons</h4>
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span3"><code>@btnBackground</code></td>
<td class="span4"><code>@btnBackground</code></td>
<td><code>@white</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #fff;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnBackgroundHighlight</code></td>
<td><code>@btnBackgroundHighlight</code></td>
<td><code>darken(@white, 10%)</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #e6e6e6;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnBorder</code></td>
<td><code>@btnBorder</code></td>
<td><code>darken(@white, 20%)</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #ccc;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnPrimaryBackground</code></td>
<td><code>@btnPrimaryBackground</code></td>
<td><code>@linkColor</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #08c;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnPrimaryBackgroundHighlight</code></td>
<td><code>@btnPrimaryBackgroundHighlight</code></td>
<td><code>spin(@btnPrimaryBackground, 15%)</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #05c;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnInfoBackground</code></td>
<td><code>@btnInfoBackground</code></td>
<td><code>#5bc0de</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #5bc0de;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnInfoBackgroundHighlight</code></td>
<td><code>@btnInfoBackgroundHighlight</code></td>
<td><code>#2f96b4</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #2f96b4;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnSuccessBackground</code></td>
<td><code>@btnSuccessBackground</code></td>
<td><code>#62c462</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #62c462;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnSuccessBackgroundHighlight</code></td>
<td><code>@btnSuccessBackgroundHighlight</code></td>
<td><code>51a351</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #51a351;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnWarningBackground</code></td>
<td><code>@btnWarningBackground</code></td>
<td><code>lighten(@orange, 15%)</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #fbb450;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnWarningBackgroundHighlight</code></td>
<td><code>@btnWarningBackgroundHighlight</code></td>
<td><code>@orange</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #f89406;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnDangerBackground</code></td>
<td><code>@btnDangerBackground</code></td>
<td><code>#ee5f5b</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #ee5f5b;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnDangerBackgroundHighlight</code></td>
<td><code>@btnDangerBackgroundHighlight</code></td>
<td><code>#bd362f</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #bd362f;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnInverseBackground</code></td>
<td><code>@btnInverseBackground</code></td>
<td><code>@gray</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #555;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnInverseBackgroundHighlight</code></td>
<td><code>@btnInverseBackgroundHighlight</code></td>
<td><code>@grayDarker</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #222;"></span></td>
</tr>
......@@ -442,7 +437,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span3"><code>@placeholderText</code></td>
<td class="span4"><code>@placeholderText</code></td>
<td><code>@grayLight</code></td>
</tr>
<tr>
......@@ -471,7 +466,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span3"><code>@warningText</code></td>
<td class="span4"><code>@warningText</code></td>
<td>#c09853</td>
<td><span class="swatch" style="background-color: #c09853;"></span></td>
</tr>
......@@ -512,13 +507,12 @@
</tr>
</tbody>
</table>
</div>
<div class="span6">
<h4>Navbar</h4>
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span3"><code>@navbarHeight</code></td>
<td class="span4"><code>@navbarHeight</code></td>
<td>40px</td>
<td class="swatch-col"></td>
</tr>
......@@ -595,7 +589,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@dropdownBackground</code></td>
<td class="span4"><code>@dropdownBackground</code></td>
<td><code>@white</code></td>
</tr>
<tr>
......@@ -628,7 +622,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span3"><code>@heroUnitBackground</code></td>
<td class="span4"><code>@heroUnitBackground</code></td>
<td><code>@grayLighter</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #eee;"></span></td>
</tr>
......@@ -644,8 +638,7 @@
</tr>
</tbody>
</table>
</div>
</div><!-- /row -->
</section>
......
docs/scaffolding.html
View file @ 7dbcd0be
......@@ -34,11 +34,11 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
......
docs/templates/layout.mustache
View file @ 7dbcd0be
......@@ -34,11 +34,11 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
......
docs/templates/pages/less.mustache
View file @ 7dbcd0be
......@@ -61,13 +61,11 @@
<h1>{{_i}}Bootstrap variables <small>LESS variables, their values, and usage guidelines</small>{{/i}}</h1>
</div>
<div class="row">
<div class="span6">
<h3>{{_i}}Scaffolding and links{{/i}}</h3>
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@bodyBackground</code></td>
<td class="span4"><code>@bodyBackground</code></td>
<td><code>@white</code></td>
<td>{{_i}}Page background color{{/i}}</td>
<td class="swatch-col"><span class="swatch" style="background-color: #fff;"></span></td>
......@@ -96,7 +94,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@gridColumns</code></td>
<td class="span4"><code>@gridColumns</code></td>
<td>12</td>
</tr>
<tr>
......@@ -121,7 +119,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@sansFontFamily</code></td>
<td class="span4"><code>@sansFontFamily</code></td>
<td colspan="2">"Helvetica Neue", Helvetica, Arial, sans-serif</td>
</tr>
<tr>
......@@ -134,7 +132,7 @@
</tr>
<tr>
<td class="span2"><code>@baseFontSize</code></td>
<td><code>@baseFontSize</code></td>
<td>13px</td>
<td><em class="muted">Must be pixels</em></td>
</tr>
......@@ -153,7 +151,7 @@
</tr>
<tr>
<td class="span2"><code>@headingsFontFamily</code></td>
<td><code>@headingsFontFamily</code></td>
<td colspan="2"><code>inherit</code></td>
</tr>
<tr>
......@@ -170,7 +168,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@tableBackground</code></td>
<td class="span4"><code>@tableBackground</code></td>
<td><code>transparent</code></td>
</tr>
<tr>
......@@ -187,13 +185,12 @@
</tr>
</tbody>
</table>
</div>
<div class="span6">
<h3>{{_i}}Grayscale colors{{/i}}</h3>
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@black</code></td>
<td class="span4"><code>@black</code></td>
<td>#000</td>
<td class="swatch-col"><span class="swatch" style="background-color: #000;"></span></td>
</tr>
......@@ -233,7 +230,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@blue</code></td>
<td class="span4"><code>@blue</code></td>
<td>#049cdb</td>
<td class="swatch-col"><span class="swatch" style="background-color: #049cdb;"></span></td>
</tr>
......@@ -269,93 +266,91 @@
</tr>
</tbody>
</table>
</div>
</div> <!-- /row -->
<h3>{{_i}}Components{{/i}}</h3>
<div class="row">
<div class="span6">
<h4>{{_i}}Buttons{{/i}}</h4>
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span3"><code>@btnBackground</code></td>
<td class="span4"><code>@btnBackground</code></td>
<td><code>@white</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #fff;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnBackgroundHighlight</code></td>
<td><code>@btnBackgroundHighlight</code></td>
<td><code>darken(@white, 10%)</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #e6e6e6;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnBorder</code></td>
<td><code>@btnBorder</code></td>
<td><code>darken(@white, 20%)</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #ccc;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnPrimaryBackground</code></td>
<td><code>@btnPrimaryBackground</code></td>
<td><code>@linkColor</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #08c;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnPrimaryBackgroundHighlight</code></td>
<td><code>@btnPrimaryBackgroundHighlight</code></td>
<td><code>spin(@btnPrimaryBackground, 15%)</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #05c;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnInfoBackground</code></td>
<td><code>@btnInfoBackground</code></td>
<td><code>#5bc0de</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #5bc0de;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnInfoBackgroundHighlight</code></td>
<td><code>@btnInfoBackgroundHighlight</code></td>
<td><code>#2f96b4</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #2f96b4;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnSuccessBackground</code></td>
<td><code>@btnSuccessBackground</code></td>
<td><code>#62c462</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #62c462;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnSuccessBackgroundHighlight</code></td>
<td><code>@btnSuccessBackgroundHighlight</code></td>
<td><code>51a351</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #51a351;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnWarningBackground</code></td>
<td><code>@btnWarningBackground</code></td>
<td><code>lighten(@orange, 15%)</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #fbb450;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnWarningBackgroundHighlight</code></td>
<td><code>@btnWarningBackgroundHighlight</code></td>
<td><code>@orange</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #f89406;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnDangerBackground</code></td>
<td><code>@btnDangerBackground</code></td>
<td><code>#ee5f5b</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #ee5f5b;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnDangerBackgroundHighlight</code></td>
<td><code>@btnDangerBackgroundHighlight</code></td>
<td><code>#bd362f</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #bd362f;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnInverseBackground</code></td>
<td><code>@btnInverseBackground</code></td>
<td><code>@gray</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #555;"></span></td>
</tr>
<tr>
<td class="span3"><code>@btnInverseBackgroundHighlight</code></td>
<td><code>@btnInverseBackgroundHighlight</code></td>
<td><code>@grayDarker</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #222;"></span></td>
</tr>
......@@ -365,7 +360,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span3"><code>@placeholderText</code></td>
<td class="span4"><code>@placeholderText</code></td>
<td><code>@grayLight</code></td>
</tr>
<tr>
......@@ -394,7 +389,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span3"><code>@warningText</code></td>
<td class="span4"><code>@warningText</code></td>
<td>#c09853</td>
<td><span class="swatch" style="background-color: #c09853;"></span></td>
</tr>
......@@ -435,13 +430,12 @@
</tr>
</tbody>
</table>
</div>
<div class="span6">
<h4>{{_i}}Navbar{{/i}}</h4>
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span3"><code>@navbarHeight</code></td>
<td class="span4"><code>@navbarHeight</code></td>
<td>40px</td>
<td class="swatch-col"></td>
</tr>
......@@ -518,7 +512,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span2"><code>@dropdownBackground</code></td>
<td class="span4"><code>@dropdownBackground</code></td>
<td><code>@white</code></td>
</tr>
<tr>
......@@ -551,7 +545,7 @@
<table class="table table-bordered table-striped">
<tbody>
<tr>
<td class="span3"><code>@heroUnitBackground</code></td>
<td class="span4"><code>@heroUnitBackground</code></td>
<td><code>@grayLighter</code></td>
<td class="swatch-col"><span class="swatch" style="background-color: #eee;"></span></td>
</tr>
......@@ -567,8 +561,7 @@
</tr>
</tbody>
</table>
</div>
</div><!-- /row -->
</section>
......
docs/upgrading.html
View file @ 7dbcd0be
......@@ -34,11 +34,11 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
......
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