diff options
| author | Mark Otto <[email protected]> | 2012-11-02 09:36:51 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-02 09:36:51 -0700 |
| commit | 1477e081d46ebf6a5e6acb06debb7edb1a324918 (patch) | |
| tree | 4467cd66b0999856636cda0c486004c63e25f119 /less/type.less | |
| parent | 7732d8b9b06d359be7096880135f9ff546a898a2 (diff) | |
| parent | d0c75bbc8324a552b93817b1f565fa798f6574cf (diff) | |
| download | bootstrap-1477e081d46ebf6a5e6acb06debb7edb1a324918.tar.xz bootstrap-1477e081d46ebf6a5e6acb06debb7edb1a324918.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/getting-started.html
docs/templates/pages/getting-started.mustache
less/accordion.less
less/alerts.less
less/breadcrumbs.less
less/buttons.less
less/code.less
less/dropdowns.less
less/forms.less
less/navbar.less
less/progress-bars.less
less/responsive-navbar.less
less/tables.less
less/thumbnails.less
less/tooltip.less
less/wells.less
Diffstat (limited to 'less/type.less')
| -rw-r--r-- | less/type.less | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/less/type.less b/less/type.less index 4c3948e91..0aa8c802c 100644 --- a/less/type.less +++ b/less/type.less @@ -20,33 +20,27 @@ p { // Emphasis & misc // ------------------------- -small { - font-size: 85%; // Ex: 14px base font * 85% = about 12px -} -strong { - font-weight: bold; -} -em { - font-style: italic; -} -cite { - font-style: normal; -} +// Ex: 14px base font * 85% = about 12px +small { font-size: 85%; } + +strong { font-weight: bold; } +em { font-style: italic; } +cite { font-style: normal; } // Utility classes -.muted { - color: @grayLight; -} -.text-warning { color: @warningText; } +.muted { color: @grayLight; } +a.muted:hover { color: darken(@grayLight, 10%); } + +.text-warning { color: @warningText; } a.text-warning:hover { color: darken(@warningText, 10%); } -.text-error { color: @errorText; } -a.text-error:hover { color: darken(@errorText, 10%); } +.text-error { color: @errorText; } +a.text-error:hover { color: darken(@errorText, 10%); } -.text-info { color: @infoText; } -a.text-info:hover { color: darken(@infoText, 10%); } +.text-info { color: @infoText; } +a.text-info:hover { color: darken(@infoText, 10%); } -.text-success { color: @successText; } +.text-success { color: @successText; } a.text-success:hover { color: darken(@successText, 10%); } @@ -158,7 +152,9 @@ hr { } // Abbreviations and acronyms -abbr[title] { +abbr[title], +// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257 +abbr[data-original-title] { cursor: help; border-bottom: 1px dotted @grayLight; } |