mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-05 16:42:29 +03:00
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts: docs/assets/bootstrap.zip
This commit is contained in:
Jacob Thornton
+150
-150
@@ -299,7 +299,7 @@
|
||||
</div><!--/span-->
|
||||
<div class="span4">
|
||||
<h2>Basic block</h2>
|
||||
<p>{{_i}}Use <code><pre></code> for multiple lines of code. Be sure to turn any angle brackets into unicode characters for proper rendering.{{/i}}</p>
|
||||
<p>{{_i}}Use <code><pre></code> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.{{/i}}</p>
|
||||
<pre>
|
||||
<p>{{_i}}Sample text here...{{/i}}</p>
|
||||
</pre>
|
||||
@@ -309,6 +309,7 @@
|
||||
</pre>
|
||||
</pre>
|
||||
<p>{{_i}}<strong>Note:</strong> Be sure to keep code within <code><pre></code> tags as close to the left as possible; it will render all tabs.{{/i}}</p>
|
||||
<p>{{_i}}You may optionally add the <code>.pre-scrollable</code> class which will set a max-height of 350px and provide a y-axis scrollbar.{{/i}}</p>
|
||||
</div><!--/span-->
|
||||
<div class="span4">
|
||||
<h2>Google Prettify</h2>
|
||||
@@ -830,7 +831,10 @@
|
||||
<form class="well form-inline">
|
||||
<input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}">
|
||||
<input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}">
|
||||
<button type="submit" class="btn">{{_i}}Go{{/i}}</button>
|
||||
<label class="checkbox">
|
||||
<input type="checkbox"> {{_i}}Remember?{{/i}}
|
||||
</label>
|
||||
<button type="submit" class="btn">{{_i}}Sign in{{/i}}</button>
|
||||
</form>
|
||||
<pre class="prettyprint linenums">
|
||||
<form class="well form-inline">
|
||||
@@ -904,7 +908,7 @@
|
||||
</div>
|
||||
<div class="form-actions">
|
||||
<button type="submit" class="btn btn-primary">{{_i}}Save changes{{/i}}</button>
|
||||
<button type="reset" class="btn">{{_i}}Cancel{{/i}}</button>
|
||||
<button class="btn">{{_i}}Cancel{{/i}}</button>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
@@ -1013,7 +1017,7 @@
|
||||
</div>
|
||||
<div class="form-actions">
|
||||
<button type="submit" class="btn btn-primary">{{_i}}Save changes{{/i}}</button>
|
||||
<button type="reset" class="btn">{{_i}}Cancel{{/i}}</button>
|
||||
<button class="btn">{{_i}}Cancel{{/i}}</button>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
@@ -1137,7 +1141,7 @@
|
||||
</div>
|
||||
<div class="form-actions">
|
||||
<button type="submit" class="btn btn-primary">{{_i}}Save changes{{/i}}</button>
|
||||
<button type="reset" class="btn">{{_i}}Cancel{{/i}}</button>
|
||||
<button class="btn">{{_i}}Cancel{{/i}}</button>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
@@ -1221,23 +1225,27 @@
|
||||
<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>
|
||||
<a href="#" class="btn btn-large btn-primary">{{_i}}Primary action{{/i}}</a>
|
||||
<a href="#" class="btn btn-large">{{_i}}Action{{/i}}</a>
|
||||
<button class="btn btn-large btn-primary">{{_i}}Primary action{{/i}}</button>
|
||||
<button class="btn btn-large">{{_i}}Action{{/i}}</button>
|
||||
</p>
|
||||
<p>
|
||||
<a href="#" class="btn btn-small btn-primary">{{_i}}Primary action{{/i}}</a>
|
||||
<a href="#" class="btn btn-small">{{_i}}Action{{/i}}</a>
|
||||
<button class="btn btn-small btn-primary">{{_i}}Primary action{{/i}}</button>
|
||||
<button class="btn btn-small">{{_i}}Action{{/i}}</button>
|
||||
</p>
|
||||
<br>
|
||||
<h3>{{_i}}Disabled state{{/i}}</h3>
|
||||
<p>{{_i}}For disabled buttons, use <code>.btn-disabled</code> for links and <code>:disabled</code> for <code><button></code> elements.{{/i}}</p>
|
||||
<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>
|
||||
<p>
|
||||
<a href="#" class="btn btn-large btn-primary disabled">{{_i}}Primary action{{/i}}</a>
|
||||
<a href="#" class="btn btn-large disabled">{{_i}}Action{{/i}}</a>
|
||||
<a href="#" class="btn btn-large btn-primary disabled">{{_i}}Primary link{{/i}}</a>
|
||||
<a href="#" class="btn btn-large disabled">{{_i}}Link{{/i}}</a>
|
||||
</p>
|
||||
<p style="margin-bottom: 18px;">
|
||||
<button class="btn btn-large btn-primary disabled" disabled="disabled">{{_i}}Primary button{{/i}}</button>
|
||||
<button class="btn btn-large" disabled>{{_i}}Button{{/i}}</button>
|
||||
</p>
|
||||
<p>
|
||||
<button class="btn btn-large btn-primary disabled" disabled="disabled">{{_i}}Primary action{{/i}}</button>
|
||||
<button class="btn btn-large" disabled>{{_i}}Action{{/i}}</button>
|
||||
<span class="label label-info">{{_i}}Heads up!{{/i}}</span>
|
||||
{{_i}}We use <code>.disabled</code> as a utility class here, similar to the common <code>.active</code> class, so no prefix is required.{{/i}}
|
||||
</p>
|
||||
</div>
|
||||
<div class="span4">
|
||||
@@ -1274,144 +1282,140 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span3">
|
||||
<div class="the-icons">
|
||||
<i class="icon-glass"></i>
|
||||
<i class="icon-music"></i>
|
||||
<i class="icon-search"></i>
|
||||
<i class="icon-envelope"></i>
|
||||
<i class="icon-heart"></i>
|
||||
<i class="icon-star"></i>
|
||||
<i class="icon-star-empty"></i>
|
||||
<i class="icon-user"></i>
|
||||
<i class="icon-film"></i>
|
||||
<i class="icon-th-large"></i>
|
||||
<i class="icon-th"></i>
|
||||
<i class="icon-th-list"></i>
|
||||
<i class="icon-ok"></i>
|
||||
<i class="icon-remove"></i>
|
||||
<i class="icon-zoom-in"></i>
|
||||
<i class="icon-zoom-out"></i>
|
||||
<i class="icon-off"></i>
|
||||
<i class="icon-signal"></i>
|
||||
<i class="icon-cog"></i>
|
||||
<i class="icon-trash"></i>
|
||||
|
||||
<i class="icon-home"></i>
|
||||
<i class="icon-file"></i>
|
||||
<i class="icon-time"></i>
|
||||
<i class="icon-road"></i>
|
||||
<i class="icon-download-alt"></i>
|
||||
<i class="icon-download"></i>
|
||||
<i class="icon-upload"></i>
|
||||
<i class="icon-inbox"></i>
|
||||
<i class="icon-play-circle"></i>
|
||||
<i class="icon-repeat"></i>
|
||||
</div>
|
||||
<ul class="the-icons">
|
||||
<li><i class="icon-glass"></i> icon-glass</li>
|
||||
<li><i class="icon-music"></i> icon-music</li>
|
||||
<li><i class="icon-search"></i> icon-search</li>
|
||||
<li><i class="icon-envelope"></i> icon-envelope</li>
|
||||
<li><i class="icon-heart"></i> icon-heart</li>
|
||||
<li><i class="icon-star"></i> icon-star</li>
|
||||
<li><i class="icon-star-empty"></i> icon-star-empty</li>
|
||||
<li><i class="icon-user"></i> icon-user</li>
|
||||
<li><i class="icon-film"></i> icon-film</li>
|
||||
<li><i class="icon-th-large"></i> icon-th-large</li>
|
||||
<li><i class="icon-th"></i> icon-th</li>
|
||||
<li><i class="icon-th-list"></i> icon-th-list</li>
|
||||
<li><i class="icon-ok"></i> icon-ok</li>
|
||||
<li><i class="icon-remove"></i> icon-remove</li>
|
||||
<li><i class="icon-zoom-in"></i> icon-zoom-in</li>
|
||||
<li><i class="icon-zoom-out"></i> icon-zoom-out</li>
|
||||
<li><i class="icon-off"></i> icon-off</li>
|
||||
<li><i class="icon-signal"></i> icon-signal</li>
|
||||
<li><i class="icon-cog"></i> icon-cog</li>
|
||||
<li><i class="icon-trash"></i> icon-trash</li>
|
||||
<li><i class="icon-home"></i> icon-home</li>
|
||||
<li><i class="icon-file"></i> icon-file</li>
|
||||
<li><i class="icon-time"></i> icon-time</li>
|
||||
<li><i class="icon-road"></i> icon-road</li>
|
||||
<li><i class="icon-download-alt"></i> icon-download-alt</li>
|
||||
<li><i class="icon-download"></i> icon-download</li>
|
||||
<li><i class="icon-upload"></i> icon-upload</li>
|
||||
<li><i class="icon-inbox"></i> icon-inbox</li>
|
||||
<li><i class="icon-play-circle"></i> icon-play-circle</li>
|
||||
<li><i class="icon-repeat"></i> icon-repeat</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span3">
|
||||
<div class="the-icons">
|
||||
<i class="icon-refresh"></i>
|
||||
<i class="icon-list-alt"></i>
|
||||
<i class="icon-lock"></i>
|
||||
<i class="icon-flag"></i>
|
||||
<i class="icon-headphones"></i>
|
||||
<i class="icon-volume-off"></i>
|
||||
<i class="icon-volume-down"></i>
|
||||
<i class="icon-volume-up"></i>
|
||||
<i class="icon-qrcode"></i>
|
||||
<i class="icon-barcode"></i>
|
||||
|
||||
<i class="icon-tag"></i>
|
||||
<i class="icon-tags"></i>
|
||||
<i class="icon-book"></i>
|
||||
<i class="icon-bookmark"></i>
|
||||
<i class="icon-print"></i>
|
||||
<i class="icon-camera"></i>
|
||||
<i class="icon-font"></i>
|
||||
<i class="icon-bold"></i>
|
||||
<i class="icon-italic"></i>
|
||||
<i class="icon-text-height"></i>
|
||||
<i class="icon-text-width"></i>
|
||||
<i class="icon-align-left"></i>
|
||||
<i class="icon-align-center"></i>
|
||||
<i class="icon-align-right"></i>
|
||||
<i class="icon-align-justify"></i>
|
||||
<i class="icon-list"></i>
|
||||
<i class="icon-indent-left"></i>
|
||||
<i class="icon-indent-right"></i>
|
||||
<i class="icon-facetime-video"></i>
|
||||
<i class="icon-picture"></i>
|
||||
</div>
|
||||
<ul class="the-icons">
|
||||
<li><i class="icon-refresh"></i> icon-refresh</li>
|
||||
<li><i class="icon-list-alt"></i> icon-list-alt</li>
|
||||
<li><i class="icon-lock"></i> icon-lock</li>
|
||||
<li><i class="icon-flag"></i> icon-flag</li>
|
||||
<li><i class="icon-headphones"></i> icon-headphones</li>
|
||||
<li><i class="icon-volume-off"></i> icon-volume-off</li>
|
||||
<li><i class="icon-volume-down"></i> icon-volume-down</li>
|
||||
<li><i class="icon-volume-up"></i> icon-volume-up</li>
|
||||
<li><i class="icon-qrcode"></i> icon-qrcode</li>
|
||||
<li><i class="icon-barcode"></i> icon-barcode</li>
|
||||
<li><i class="icon-tag"></i> icon-tag</li>
|
||||
<li><i class="icon-tags"></i> icon-tags</li>
|
||||
<li><i class="icon-book"></i> icon-book</li>
|
||||
<li><i class="icon-bookmark"></i> icon-bookmark</li>
|
||||
<li><i class="icon-print"></i> icon-print</li>
|
||||
<li><i class="icon-camera"></i> icon-camera</li>
|
||||
<li><i class="icon-font"></i> icon-font</li>
|
||||
<li><i class="icon-bold"></i> icon-bold</li>
|
||||
<li><i class="icon-italic"></i> icon-italic</li>
|
||||
<li><i class="icon-text-height"></i> icon-text-height</li>
|
||||
<li><i class="icon-text-width"></i> icon-text-width</li>
|
||||
<li><i class="icon-align-left"></i> icon-align-left</li>
|
||||
<li><i class="icon-align-center"></i> icon-align-center</li>
|
||||
<li><i class="icon-align-right"></i> icon-align-right</li>
|
||||
<li><i class="icon-align-justify"></i> icon-align-justify</li>
|
||||
<li><i class="icon-list"></i> icon-list</li>
|
||||
<li><i class="icon-indent-left"></i> icon-indent-left</li>
|
||||
<li><i class="icon-indent-right"></i> icon-indent-right</li>
|
||||
<li><i class="icon-facetime-video"></i> icon-facetime-video</li>
|
||||
<li><i class="icon-picture"></i> icon-picture</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span3">
|
||||
<div class="the-icons">
|
||||
<i class="icon-pencil"></i>
|
||||
<i class="icon-map-marker"></i>
|
||||
<i class="icon-adjust"></i>
|
||||
<i class="icon-tint"></i>
|
||||
<i class="icon-edit"></i>
|
||||
<i class="icon-share"></i>
|
||||
<i class="icon-check"></i>
|
||||
<i class="icon-move"></i>
|
||||
<i class="icon-step-backward"></i>
|
||||
<i class="icon-fast-backward"></i>
|
||||
<i class="icon-backward"></i>
|
||||
<i class="icon-play"></i>
|
||||
<i class="icon-pause"></i>
|
||||
<i class="icon-stop"></i>
|
||||
<i class="icon-forward"></i>
|
||||
<i class="icon-fast-forward"></i>
|
||||
<i class="icon-step-forward"></i>
|
||||
<i class="icon-eject"></i>
|
||||
<i class="icon-chevron-left"></i>
|
||||
<i class="icon-chevron-right"></i>
|
||||
|
||||
<i class="icon-plus-sign"></i>
|
||||
<i class="icon-minus-sign"></i>
|
||||
<i class="icon-remove-sign"></i>
|
||||
<i class="icon-ok-sign"></i>
|
||||
<i class="icon-question-sign"></i>
|
||||
<i class="icon-info-sign"></i>
|
||||
<i class="icon-screenshot"></i>
|
||||
<i class="icon-remove-circle"></i>
|
||||
<i class="icon-ok-circle"></i>
|
||||
<i class="icon-ban-circle"></i>
|
||||
</div>
|
||||
<ul class="the-icons">
|
||||
<li><i class="icon-pencil"></i> icon-pencil</li>
|
||||
<li><i class="icon-map-marker"></i> icon-map-marker</li>
|
||||
<li><i class="icon-adjust"></i> icon-adjust</li>
|
||||
<li><i class="icon-tint"></i> icon-tint</li>
|
||||
<li><i class="icon-edit"></i> icon-edit</li>
|
||||
<li><i class="icon-share"></i> icon-share</li>
|
||||
<li><i class="icon-check"></i> icon-check</li>
|
||||
<li><i class="icon-move"></i> icon-move</li>
|
||||
<li><i class="icon-step-backward"></i> icon-step-backward</li>
|
||||
<li><i class="icon-fast-backward"></i> icon-fast-backward</li>
|
||||
<li><i class="icon-backward"></i> icon-backward</li>
|
||||
<li><i class="icon-play"></i> icon-play</li>
|
||||
<li><i class="icon-pause"></i> icon-pause</li>
|
||||
<li><i class="icon-stop"></i> icon-stop</li>
|
||||
<li><i class="icon-forward"></i> icon-forward</li>
|
||||
<li><i class="icon-fast-forward"></i> icon-fast-forward</li>
|
||||
<li><i class="icon-step-forward"></i> icon-step-forward</li>
|
||||
<li><i class="icon-eject"></i> icon-eject</li>
|
||||
<li><i class="icon-chevron-left"></i> icon-chevron-left</li>
|
||||
<li><i class="icon-chevron-right"></i> icon-chevron-right</li>
|
||||
<li><i class="icon-plus-sign"></i> icon-plus-sign</li>
|
||||
<li><i class="icon-minus-sign"></i> icon-minus-sign</li>
|
||||
<li><i class="icon-remove-sign"></i> icon-remove-sign</li>
|
||||
<li><i class="icon-ok-sign"></i> icon-ok-sign</li>
|
||||
<li><i class="icon-question-sign"></i> icon-question-sign</li>
|
||||
<li><i class="icon-info-sign"></i> icon-info-sign</li>
|
||||
<li><i class="icon-screenshot"></i> icon-screenshot</li>
|
||||
<li><i class="icon-remove-circle"></i> icon-remove-circle</li>
|
||||
<li><i class="icon-ok-circle"></i> icon-ok-circle</li>
|
||||
<li><i class="icon-ban-circle"></i> icon-ban-circle</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span3">
|
||||
<div class="the-icons">
|
||||
<i class="icon-arrow-left"></i>
|
||||
<i class="icon-arrow-right"></i>
|
||||
<i class="icon-arrow-up"></i>
|
||||
<i class="icon-arrow-down"></i>
|
||||
<i class="icon-share-alt"></i>
|
||||
<i class="icon-resize-full"></i>
|
||||
<i class="icon-resize-small"></i>
|
||||
<i class="icon-plus"></i>
|
||||
<i class="icon-minus"></i>
|
||||
<i class="icon-asterisk"></i>
|
||||
|
||||
<i class="icon-exclamation-sign"></i>
|
||||
<i class="icon-gift"></i>
|
||||
<i class="icon-leaf"></i>
|
||||
<i class="icon-fire"></i>
|
||||
<i class="icon-eye-open"></i>
|
||||
<i class="icon-eye-close"></i>
|
||||
<i class="icon-warning-sign"></i>
|
||||
<i class="icon-plane"></i>
|
||||
<i class="icon-calendar"></i>
|
||||
<i class="icon-random"></i>
|
||||
<i class="icon-comment"></i>
|
||||
<i class="icon-magnet"></i>
|
||||
<i class="icon-chevron-up"></i>
|
||||
<i class="icon-chevron-down"></i>
|
||||
<i class="icon-retweet"></i>
|
||||
<i class="icon-shopping-cart"></i>
|
||||
<i class="icon-folder-close"></i>
|
||||
<i class="icon-folder-open"></i>
|
||||
<i class="icon-resize-vertical"></i>
|
||||
<i class="icon-resize-horizontal"></i>
|
||||
</div>
|
||||
<ul class="the-icons">
|
||||
<li><i class="icon-arrow-left"></i> icon-arrow-left</li>
|
||||
<li><i class="icon-arrow-right"></i> icon-arrow-right</li>
|
||||
<li><i class="icon-arrow-up"></i> icon-arrow-up</li>
|
||||
<li><i class="icon-arrow-down"></i> icon-arrow-down</li>
|
||||
<li><i class="icon-share-alt"></i> icon-share-alt</li>
|
||||
<li><i class="icon-resize-full"></i> icon-resize-full</li>
|
||||
<li><i class="icon-resize-small"></i> icon-resize-small</li>
|
||||
<li><i class="icon-plus"></i> icon-plus</li>
|
||||
<li><i class="icon-minus"></i> icon-minus</li>
|
||||
<li><i class="icon-asterisk"></i> icon-asterisk</li>
|
||||
<li><i class="icon-exclamation-sign"></i> icon-exclamation-sign</li>
|
||||
<li><i class="icon-gift"></i> icon-gift</li>
|
||||
<li><i class="icon-leaf"></i> icon-leaf</li>
|
||||
<li><i class="icon-fire"></i> icon-fire</li>
|
||||
<li><i class="icon-eye-open"></i> icon-eye-open</li>
|
||||
<li><i class="icon-eye-close"></i> icon-eye-close</li>
|
||||
<li><i class="icon-warning-sign"></i> icon-warning-sign</li>
|
||||
<li><i class="icon-plane"></i> icon-plane</li>
|
||||
<li><i class="icon-calendar"></i> icon-calendar</li>
|
||||
<li><i class="icon-random"></i> icon-random</li>
|
||||
<li><i class="icon-comment"></i> icon-comment</li>
|
||||
<li><i class="icon-magnet"></i> icon-magnet</li>
|
||||
<li><i class="icon-chevron-up"></i> icon-chevron-up</li>
|
||||
<li><i class="icon-chevron-down"></i> icon-chevron-down</li>
|
||||
<li><i class="icon-retweet"></i> icon-retweet</li>
|
||||
<li><i class="icon-shopping-cart"></i> icon-shopping-cart</li>
|
||||
<li><i class="icon-folder-close"></i> icon-folder-close</li>
|
||||
<li><i class="icon-folder-open"></i> icon-folder-open</li>
|
||||
<li><i class="icon-resize-vertical"></i> icon-resize-vertical</li>
|
||||
<li><i class="icon-resize-horizontal"></i> icon-resize-horizontal</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="alert alert-info">
|
||||
@@ -1438,10 +1442,6 @@
|
||||
<i class="icon-search icon-white"></i>
|
||||
</pre>
|
||||
<p>{{_i}}There are 120 classes to choose from for your icons. Just add an <code><i></code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.{{/i}}</p>
|
||||
<div class="alert alert-info">
|
||||
<strong>{{_i}}Heads up!{{/i}}</strong>
|
||||
{{_i}}The <code>.icon-</code> class must be listed first in the class tag for proper CSS targeting.{{/i}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>{{_i}}Use cases{{/i}}</h3>
|
||||
|
||||
+23
-15
@@ -42,14 +42,34 @@
|
||||
<div class="span4">
|
||||
<h3>{{_i}}Button groups{{/i}}</h3>
|
||||
<p>{{_i}}Use button groups to join multiple buttons together as one composite component. Build them with a series of <code><a></code> or <code><button></code> elements.{{/i}}</p>
|
||||
<p>{{_i}}You can also combine sets of <code><div class="btn-group"></code> into a <code><div class="btn-toolbar"></code> for more complex projects.{{/i}}</p>
|
||||
<div class="btn-toolbar" style="margin-top: 18px;">
|
||||
<div class="btn-group">
|
||||
<h3>{{_i}}Best practices{{/i}}</h3>
|
||||
<p>{{_i}}We recommend the following guidelines for using button groups and toolbars:{{/i}}</p>
|
||||
<ul>
|
||||
<li>{{_i}}Always use the same element in a single button group, <code><a></code> or <code><button></code>.{{/i}}</li>
|
||||
<li>{{_i}}Don't mix buttons of different colors in the same button group.{{/i}}</li>
|
||||
<li>{{_i}}Use icons in addition to or instead of text, but be sure include alt and title text where appropriate.{{/i}}</li>
|
||||
</ul>
|
||||
<p>{{_i}}<span class="label label-info">Related</span> Button groups with dropdowns (see below) should be called out separately and always include a dropdown caret to indicate intended behavior.{{/i}}</p>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>{{_i}}Default example{{/i}}</h3>
|
||||
<p>{{_i}}Here's how the HTML looks for a standard button group built with anchor tag buttons:{{/i}}</p>
|
||||
<div class="">
|
||||
<div class="btn-group" style="margin: 9px 0;">
|
||||
<a class="btn" href="#">{{_i}}Left{{/i}}</a>
|
||||
<a class="btn" href="#">{{_i}}Middle{{/i}}</a>
|
||||
<a class="btn" href="#">{{_i}}Right{{/i}}</a>
|
||||
</div>
|
||||
</div>
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#">1</a>
|
||||
<a class="btn" href="#">2</a>
|
||||
<a class="btn" href="#">3</a>
|
||||
</div>
|
||||
</pre>
|
||||
<h3>{{_i}}Toolbar example{{/i}}</h3>
|
||||
<p>{{_i}}Combine sets of <code><div class="btn-group"></code> into a <code><div class="btn-toolbar"></code> for more complex components.{{/i}}</p>
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#">1</a>
|
||||
@@ -66,18 +86,6 @@
|
||||
<a class="btn" href="#">8</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>{{_i}}Example markup{{/i}}</h3>
|
||||
<p>{{_i}}Here's how the HTML looks for a standard button group built with anchor tag buttons:{{/i}}</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#">1</a>
|
||||
<a class="btn" href="#">2</a>
|
||||
<a class="btn" href="#">3</a>
|
||||
</div>
|
||||
</pre>
|
||||
<p>{{_i}}And with a toolbar for multiple groups:{{/i}}</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
|
||||
+3
-3
@@ -58,7 +58,7 @@
|
||||
<div class="span3">
|
||||
<label>
|
||||
<h3><a href="./javascript.html#tooltips">{{_i}}Tooltips{{/i}}</a></h3>
|
||||
<p>{{_i}}A new take on the jQuery Tipsy plugin, Tooltips don't rely on images, use CSS3 for animations, and data-attributes for local title storage.{{/i}}</p>
|
||||
<p>{{_i}}A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.{{/i}}</p>
|
||||
</label>
|
||||
</div>
|
||||
<div class="span3">
|
||||
@@ -624,14 +624,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
|
||||
<div class="row">
|
||||
<div class="span3 columns">
|
||||
<h3>{{_i}}About Tooltips{{/i}}</h3>
|
||||
<p>{{_i}}Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.{{/i}}</p>
|
||||
<p>{{_i}}Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use css3 for animations, and data-attributes for local title storage.{{/i}}</p>
|
||||
<a href="assets/js/bootstrap-tooltip.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
|
||||
</div>
|
||||
<div class="span9 columns">
|
||||
<h2>{{_i}}Example use of Tooltips{{/i}}</h2>
|
||||
<p>{{_i}}Hover over the links below to see tooltips:{{/i}}</p>
|
||||
<div class="tooltip-demo well">
|
||||
<p class="muted" style="margin-bottom: 0;">{{_i}}Tight pants next level keffiyeh <a href="#" rel='tooltip' title="first tooltip">you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel <a href="#" rel='tooltip' title='Another tooltip'>have a</a> terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A <a href="#" rel='tooltip' title='Another one here too'>really ironic</a> artisan whatever keytar, scenester farm-to-table banksy Austin <a href="#" rel='tooltip' title='The last tip!'>twitter handle</a> freegan cred raw denim single-origin coffee viral.{{/i}}
|
||||
<p class="muted" style="margin-bottom: 0;">{{_i}}Tight pants next level keffiyeh <a href="#" rel="tooltip" title="first tooltip">you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel <a href="#" rel="tooltip" title="Another tooltip">have a</a> terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A <a href="#" rel="tooltip" title="Another one here too">really ironic</a> artisan whatever keytar, scenester farm-to-table banksy Austin <a href="#" rel="tooltip" title="The last tip!">twitter handle</a> freegan cred raw denim single-origin coffee viral.{{/i}}
|
||||
</p>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
Vendored
+3
-3
@@ -47,7 +47,7 @@
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>{{_i}}Operations{{/i}}</h3>
|
||||
<p>{{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}</p>
|
||||
<p>{{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiply, divide, add, and subtract your way to CSS sanity.{{/i}}</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@@ -641,8 +641,8 @@
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h3>{{_i}}Node with makefile{{/i}}</h3>
|
||||
<p>{{_i}}Install the LESS command line compiler with npm by running the following command:{{/i}}</p>
|
||||
<pre>$ npm install less</pre>
|
||||
<p>{{_i}}Install the LESS command line compiler globally with npm by running the following command:{{/i}}</p>
|
||||
<pre>$ npm install -g less</pre>
|
||||
<p>{{_i}}Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.{{/i}}</p>
|
||||
<p>{{_i}}Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).{{/i}}</p>
|
||||
</div><!-- /span4 -->
|
||||
|
||||
+19
-3
@@ -97,7 +97,8 @@
|
||||
<div class="row">
|
||||
<div class="span6">
|
||||
<p>{{_i}}With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column.{{/i}}</p>
|
||||
<h4>{{_i}}Example{{/i}}</h4>
|
||||
<h3>{{_i}}Example{{/i}}</h3>
|
||||
<p>{{_i}}Nested rows should include a set of columns that add up to the number of columns of it's parent. For example, two nested <code>.span3</code> columns should be placed within a <code>.span6</code>.{{/i}}</p>
|
||||
<div class="row show-grid">
|
||||
<div class="span6">
|
||||
{{_i}}Level 1 of column{{/i}}
|
||||
@@ -111,6 +112,21 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3>{{_i}}Fluid example{{/i}}</h3>
|
||||
<p>{{_i}}Nesting with fluid grids is a bit different: the number of nested columns doesn't need to match the parent. Instead, your columns are reset at each level because each row takes up 100% of the parent column.{{/i}}</p>
|
||||
<div class="row-fluid show-grid">
|
||||
<div class="span12">
|
||||
{{_i}}Fluid 12{{/i}}
|
||||
<div class="row-fluid show-grid">
|
||||
<div class="span6">
|
||||
{{_i}}Fluid 6{{/i}}
|
||||
</div>
|
||||
<div class="span6">
|
||||
{{_i}}Fluid 6{{/i}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="span6">
|
||||
<pre class="prettyprint linenums">
|
||||
@@ -239,7 +255,7 @@
|
||||
</div>
|
||||
<div class="span8">
|
||||
<h2>{{_i}}Supported devices{{/i}}</h2>
|
||||
<p>{{_i}}Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:{{/i}}</p>
|
||||
<p>{{_i}}Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:{{/i}}</p>
|
||||
<table class="table table-bordered table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -263,7 +279,7 @@
|
||||
<tr>
|
||||
<td>{{_i}}Landscape tablets{{/i}}</td>
|
||||
<td>768px to 980px</td>
|
||||
<td>44px</td>
|
||||
<td>42px</td>
|
||||
<td>20px</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
+12
-1
@@ -170,8 +170,19 @@
|
||||
<h1>{{_i}}Javascript plugins{{/i}}</h1>
|
||||
</div>
|
||||
<div class="alert alert-info">
|
||||
<strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}We're rewritten just about everything for our plugins, so head on over to <a href="./javascript.html">the Javascript page</a> to learn more.{{/i}}
|
||||
<strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}We've rewritten just about everything for our plugins, so head on over to <a href="./javascript.html">the Javascript page</a> to learn more.{{/i}}
|
||||
</div>
|
||||
<h3>{{_i}}Tooltips{{/i}}</h3>
|
||||
<ul>
|
||||
<li>{{_i}}The plugin method has been renamed from <code>twipsy()</code> to <code>tooltip()</code>, and the class name changed from <code>twipsy</code> to <code>tooltip</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>
|
||||
<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>
|
||||
|
||||
Reference in New Issue
Block a user