0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00

Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip

This commit is contained in:
Mark Otto 2012-11-03 13:19:53 -07:00
commit 7ea343d570
2 changed files with 4 additions and 4 deletions

View File

@ -226,7 +226,7 @@
</address> </address>
<address> <address>
<strong>Full Name</strong><br> <strong>Full Name</strong><br>
<a href="mailto:#">first.last@gmail.com</a> <a href="mailto:#">first.last@example.com</a>
</address> </address>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -239,7 +239,7 @@
&lt;address&gt; &lt;address&gt;
&lt;strong&gt;Full Name&lt;/strong&gt;&lt;br&gt; &lt;strong&gt;Full Name&lt;/strong&gt;&lt;br&gt;
&lt;a href="mailto:#"&gt;first.last@gmail.com&lt;/a&gt; &lt;a href="mailto:#"&gt;first.last@example.com&lt;/a&gt;
&lt;/address&gt; &lt;/address&gt;
</pre> </pre>

View File

@ -162,7 +162,7 @@
</address> </address>
<address> <address>
<strong>{{_i}}Full Name{{/i}}</strong><br> <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> </address>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -175,7 +175,7 @@
&lt;address&gt; &lt;address&gt;
&lt;strong&gt;{{_i}}Full Name{{/i}}&lt;/strong&gt;&lt;br&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; &lt;/address&gt;
</pre> </pre>