mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch '2.2.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
This commit is contained in:
Mark Otto
2012-11-03 13:44:01 -07:00
parent 1477e081d4 5d6cf2ee19
commit a249d1c8ee
16 changed files with 164 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/templates/pages/base-css.mustache
Vendored
+3 -3
View File
@@ -127,7 +127,7 @@
{{! Abbreviations }}
<h2 id="abbreviations">{{_i}}Abbreviations{{/i}}</h2>
<p>{{_i}}Stylized implemenation of HTML's <code>&lt;abbr&gt;</code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}</p>
<p>{{_i}}Stylized implementation of HTML's <code>&lt;abbr&gt;</code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}</p>
<h3><code>&lt;abbr&gt;</code></h3>
<p>{{_i}}For expanded text on long hover of an abbreviation, include the <code>title</code> attribute.{{/i}}</p>
@@ -162,7 +162,7 @@
</address>
<address>
<strong>{{_i}}Full Name{{/i}}</strong><br>
<a href="mailto:#">{{_i}}first.last@gmail.com{{/i}}</a>
<a href="mailto:#">{{_i}}first.last@example.com{{/i}}</a>
</address>
</div>
<pre class="prettyprint linenums">
@@ -175,7 +175,7 @@
&lt;address&gt;
&lt;strong&gt;{{_i}}Full Name{{/i}}&lt;/strong&gt;&lt;br&gt;
&lt;a href="mailto:#"&gt;{{_i}}first.last@gmail.com{{/i}}&lt;/a&gt;
&lt;a href="mailto:#"&gt;{{_i}}first.last@example.com{{/i}}&lt;/a&gt;
&lt;/address&gt;
</pre>
docs/templates/pages/components.mustache
Vendored
+3
View File
@@ -1575,6 +1575,9 @@
</tbody>
</table>
<h3>{{_i}}Easily collapsible{{/i}}</h3>
<p>{{_i}}For easy implementation, labels and badges will simply collapse (via CSS's <code>:empty</code> selector) when no content exists within.{{/i}}</p>
</section>
docs/templates/pages/customize.mustache
Vendored
-1
View File
@@ -73,7 +73,6 @@
</div><!-- /span -->
<div class="span3">
<h3>{{_i}}Miscellaneous{{/i}}</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> {{_i}}Media object{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> {{_i}}Wells{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> {{_i}}Close icon{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> {{_i}}Utilities{{/i}}</label>
docs/templates/pages/javascript.mustache
Vendored
+3 -3
View File
@@ -65,7 +65,7 @@ $("#myModal").modal('show') // initializes and invokes show immed
<h3>{{_i}}Events{{/i}}</h3>
<p>{{_i}}Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.{{/i}}</p>
<p>{{_i}}All infinitive events provide preventDefault functionality. This provides the abililty to stop the execution of an action before it starts.{{/i}}</p>
<p>{{_i}}All infinitive events provide preventDefault functionality. This provides the ability to stop the execution of an action before it starts.{{/i}}</p>
<pre class="prettyprint linenums">
$('#myModal').on('show', function (e) {
if (!data) return e.preventDefault() // stops modal from being shown
@@ -437,7 +437,7 @@ $('#myModal').on('hidden', function () {
<h3>{{_i}}Methods{{/i}}</h3>
<h4>$().dropdown('toggle')</h4>
<p>{{_i}}A programatic api for toggling menus for a given navbar or tabbed navigation.{{/i}}</p>
<p>{{_i}}A programmatic api for toggling menus for a given navbar or tabbed navigation.{{/i}}</p>
</section>
@@ -566,7 +566,7 @@ $('[data-spy="scroll"]').each(function () {
<h2>{{_i}}Example tabs{{/i}}</h2>
<p>{{_i}}Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.{{/i}}</p>
<p>{{_i}}Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.{{/i}}</p>
<div class="bs-docs-example">
<ul id="myTab" class="nav nav-tabs">
<li class="active"><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
docs/templates/pages/scaffolding.mustache
Vendored
-1
View File
@@ -159,7 +159,6 @@
<!-- Layouts (Default and fluid)
================================================== -->
<section id="layouts">