clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-25 12:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'abbr' of https://github.com/jacobrask/bootstrap into jacobrask-abbr

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto 2012-02-19 15:38:34 -08:00
commit 59d570fc16
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

8
docs/assets/css/bootstrap.css vendored
View File

@ -417,12 +417,14 @@ em {
.muted {
color: #999999;
}
abbr {
font-size: 90%;
text-transform: uppercase;
abbr[title] {
border-bottom: 1px dotted #ddd;
cursor: help;
}
abbr.initialism {
font-size: 90%;
text-transform: uppercase;
}
blockquote {
padding: 0 0 0 15px;
margin: 0 0 18px;

8
docs/base-css.html
View File

@ -166,7 +166,8 @@
Wraps abbreviations and acronyms to show the expanded version on hover
</td>
<td>
Include optional <code>title</code> for expanded text
<p>Include optional <code>title</code> attribute for expanded text</p>
Use <code>.initialism</code> class for uppercase abbreviations.
</td>
</tr>
<tr>
@ -205,8 +206,9 @@
</div>
<div class="span4">
<h3>Example abbreviations</h3>
<p>Abbreviations are styled with uppercase text and a light dotted bottom border. They also have a help cursor on hover so users have extra indication something will be shown on hover.</p>
<p><abbr title="HyperText Markup Language">HTML</abbr> is the best thing since sliced bread.</p>
<p>Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.</p>
<p>Add the <code>initialism</code> class to an abbreviation to increase typographic harmony by giving it a slightly smaller text size.</p>
<p><abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.</p>
<p>An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.</p>
</div>
</div>

8
docs/templates/pages/base-css.mustache vendored
View File

@ -90,7 +90,8 @@
{{_i}}Wraps abbreviations and acronyms to show the expanded version on hover{{/i}}
</td>
<td>
{{_i}}Include optional <code>title</code> for expanded text{{/i}}
<p>{{_i}}Include optional <code>title</code> attribute for expanded text{{/i}}</p>
{{_i}}Use <code>.initialism</code> class for uppercase abbreviations.{{/i}}
</td>
</tr>
<tr>
@ -129,8 +130,9 @@
</div>
<div class="span4">
<h3>{{_i}}Example abbreviations{{/i}}</h3>
<p>{{_i}}Abbreviations are styled with uppercase text and a light dotted bottom border. They also have a help cursor on hover so users have extra indication something will be shown on hover.{{/i}}</p>
<p>{{_i}}<abbr title="HyperText Markup Language">HTML</abbr> is the best thing since sliced bread.{{/i}}</p>
<p>{{_i}}Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.{{/i}}</p>
<p>{{_i}}Add the <code>initialism</code> class to an abbreviation to increase typographic harmony by giving it a slightly smaller text size.{{/i}}</p>
<p>{{_i}}<abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.{{/i}}</p>
<p>{{_i}}An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.{{/i}}</p>
</div>
</div>

8
less/type.less
View File

@ -154,12 +154,14 @@ em {
}
// Abbreviations and acronyms
abbr {
font-size: 90%;
text-transform: uppercase;
abbr[title] {
border-bottom: 1px dotted #ddd;
cursor: help;
}
abbr.initialism {
font-size: 90%;
text-transform: uppercase;
}
// Blockquotes
blockquote {