mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +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>