mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-08 17:22:31 +03:00
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
This commit is contained in:
+18
-22
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user