mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-11 18:02:28 +03:00
Keep origin in track
This commit is contained in:
+12
-8
@@ -1190,37 +1190,37 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td><a class="btn" href="#">{{_i}}Default{{/i}}</a></td>
|
||||
<td><button class="btn" href="#">{{_i}}Default{{/i}}</button></td>
|
||||
<td><code>.btn</code></td>
|
||||
<td>{{_i}}Standard gray button with gradient{{/i}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a class="btn btn-primary" href="#">{{_i}}Primary{{/i}}</a></td>
|
||||
<td><button class="btn btn-primary" href="#">{{_i}}Primary{{/i}}</button></td>
|
||||
<td><code>.btn-primary</code></td>
|
||||
<td>{{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a class="btn btn-info" href="#">{{_i}}Info{{/i}}</a></td>
|
||||
<td><button class="btn btn-info" href="#">{{_i}}Info{{/i}}</button></td>
|
||||
<td><code>.btn-info</code></td>
|
||||
<td>{{_i}}Used as an alternate to the default styles{{/i}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a class="btn btn-success" href="#">{{_i}}Success{{/i}}</a></td>
|
||||
<td><button class="btn btn-success" href="#">{{_i}}Success{{/i}}</button></td>
|
||||
<td><code>.btn-success</code></td>
|
||||
<td>{{_i}}Indicates a successful or positive action{{/i}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a class="btn btn-warning" href="#">{{_i}}Warning{{/i}}</a></td>
|
||||
<td><button class="btn btn-warning" href="#">{{_i}}Warning{{/i}}</button></td>
|
||||
<td><code>.btn-warning</code></td>
|
||||
<td>{{_i}}Indicates caution should be taken with this action{{/i}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a class="btn btn-danger" href="#">{{_i}}Danger{{/i}}</a></td>
|
||||
<td><button class="btn btn-danger" href="#">{{_i}}Danger{{/i}}</button></td>
|
||||
<td><code>.btn-danger</code></td>
|
||||
<td>{{_i}}Indicates a dangerous or potentially negative action{{/i}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a class="btn btn-inverse" href="#">{{_i}}Inverse{{/i}}</a></td>
|
||||
<td><button class="btn btn-inverse" href="#">{{_i}}Inverse{{/i}}</button></td>
|
||||
<td><code>.btn-inverse</code></td>
|
||||
<td>{{_i}}Alternate dark gray button, not tied to a semantic action or use{{/i}}</td>
|
||||
</tr>
|
||||
@@ -1237,7 +1237,7 @@
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>{{_i}}Multiple sizes{{/i}}</h3>
|
||||
<p>{{_i}}Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for two additional sizes.{{/i}}</p>
|
||||
<p>{{_i}}Fancy larger or smaller buttons? Add <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code> for two additional sizes.{{/i}}</p>
|
||||
<p>
|
||||
<button class="btn btn-large btn-primary">{{_i}}Primary action{{/i}}</button>
|
||||
<button class="btn btn-large">{{_i}}Action{{/i}}</button>
|
||||
@@ -1246,6 +1246,10 @@
|
||||
<button class="btn btn-small btn-primary">{{_i}}Primary action{{/i}}</button>
|
||||
<button class="btn btn-small">{{_i}}Action{{/i}}</button>
|
||||
</p>
|
||||
<p>
|
||||
<button class="btn btn-mini btn-primary">{{_i}}Primary action{{/i}}</button>
|
||||
<button class="btn btn-mini">{{_i}}Action{{/i}}</button>
|
||||
</p>
|
||||
<br>
|
||||
<h3>{{_i}}Disabled state{{/i}}</h3>
|
||||
<p>{{_i}}For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code><button></code> elements.{{/i}}</p>
|
||||
|
||||
+12
-4
@@ -788,14 +788,14 @@
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
|
||||
|
||||
<!-- {{_i}}.btn-navbar is used as the toggle for collapsed navbar content{{/i}} -->
|
||||
<a 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>
|
||||
|
||||
|
||||
<!-- {{_i}}Be sure to leave the brand out there if you want it shown{{/i}} -->
|
||||
<a class="brand" href="#">{{_i}}Project name{{/i}}</a>
|
||||
|
||||
@@ -824,11 +824,19 @@
|
||||
<li><a href="#">{{_i}}Link{{/i}}</a></li>
|
||||
<li><a href="#">{{_i}}Link{{/i}}</a></li>
|
||||
</ul>
|
||||
</pre>
|
||||
<p>{{_i}}You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:{{/i}}</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="nav">
|
||||
...
|
||||
<li class="divider-vertical"></li>
|
||||
...
|
||||
</ul>
|
||||
</pre>
|
||||
<h3>{{_i}}Component alignment{{/i}}</h3>
|
||||
<p>{{_i}}To align a nav, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.{{/i}}</p>
|
||||
<h3>{{_i}}Adding dropdowns{{/i}}</h3>
|
||||
<p>{{_i}}Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdown">our javascript plugin</a>.{{/i}}</p>
|
||||
<p>{{_i}}Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdowns">our javascript plugin</a>.{{/i}}</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="nav">
|
||||
<li class="dropdown">
|
||||
@@ -844,7 +852,7 @@
|
||||
</li>
|
||||
</ul>
|
||||
</pre>
|
||||
<p><a class="btn" href="./javascript.html#dropdown">{{_i}}Get the javascript →{{/i}}</a></p>
|
||||
<p><a class="btn" href="./javascript.html#dropdowns">{{_i}}Get the javascript →{{/i}}</a></p>
|
||||
</div><!-- /.span -->
|
||||
</div><!-- /.row -->
|
||||
|
||||
|
||||
+1
-1
@@ -213,7 +213,7 @@
|
||||
</pre>
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="modal">
|
||||
<div class="modal" id="myModal">
|
||||
<div class="modal-header">
|
||||
<a class="close" data-dismiss="modal">×</a>
|
||||
<h3>Modal header</h3>
|
||||
|
||||
+1
-1
@@ -368,7 +368,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{_i}}Landscape tablets{{/i}}</td>
|
||||
<td>768px to 980px</td>
|
||||
<td>768px to 979px</td>
|
||||
<td>42px</td>
|
||||
<td>20px</td>
|
||||
</tr>
|
||||
|
||||
+2
-5
@@ -39,7 +39,7 @@
|
||||
<ul>
|
||||
<li>{{_i}}Media queries added for <strong>basic support</strong> across mobile and tablet devices{{/i}}
|
||||
<li>{{_i}}Responsive CSS is compiled separately, as bootstrap-responsive.css{{/i}}</li>
|
||||
</ul>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
|
||||
@@ -179,13 +179,10 @@
|
||||
<li>{{_i}}The <code>animate</code> option was renamed to <code>animation</code>.{{/i}}</li>
|
||||
<li>{{_i}}The <code>html</code> option was removed, as the tooltips default to allowing HTML now.{{/i}}</li>
|
||||
</ul>
|
||||
<h3>{{_i}}Tooltips{{/i}}</h3>
|
||||
<ul>
|
||||
<li>{{_i}}Values for <code>placement</code> option changed from <code>above</code> and <code>below</code> to <code>top</code> and <code>bottom</code>. (Affects popovers, too.){{/i}}</li>
|
||||
</ul>
|
||||
<h3>{{_i}}Popovers{{/i}}</h3>
|
||||
<ul>
|
||||
<li>{{_i}}Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.{{/i}}</li>
|
||||
<li>{{_i}}The <code>placement</code> option value that was <code>below</code> is now <code>bottom</code>, and <code>above</code> is now <code>top</code>.{{/i}}</li>
|
||||
</ul>
|
||||
<h3>{{_i}}New plugins{{/i}}</h3>
|
||||
<ul>
|
||||
|
||||
Reference in New Issue
Block a user