diff options
| author | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
| commit | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (patch) | |
| tree | edb73c6ae943629dbdc51d3350a50a079f7a2f7e /less/type.less | |
| parent | 04161a8c753c5f9ef83dd1f0848a17e8c4ab155c (diff) | |
| parent | 7f153974e10980dccbdd485e63941b591e925148 (diff) | |
| download | bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.tar.xz bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/assets/css/docs.css
Diffstat (limited to 'less/type.less')
| -rw-r--r-- | less/type.less | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/less/type.less b/less/type.less index 585584470..91496dc8c 100644 --- a/less/type.less +++ b/less/type.less @@ -97,18 +97,6 @@ cite { font-style: normal; } color: darken(@brand-primary, 10%); } } -.text-warning { - color: @state-warning-text; - &:hover { - color: darken(@state-warning-text, 10%); - } -} -.text-danger { - color: @state-danger-text; - &:hover { - color: darken(@state-danger-text, 10%); - } -} .text-success { color: @state-success-text; &:hover { @@ -121,6 +109,18 @@ cite { font-style: normal; } color: darken(@state-info-text, 10%); } } +.text-warning { + color: @state-warning-text; + &:hover { + color: darken(@state-warning-text, 10%); + } +} +.text-danger { + color: @state-danger-text; + &:hover { + color: darken(@state-danger-text, 10%); + } +} // Contextual backgrounds // For now we'll leave these alongside the text classes until v4 when we can @@ -134,18 +134,6 @@ cite { font-style: normal; } background-color: darken(@brand-primary, 10%); } } -.bg-warning { - background-color: @state-warning-bg; - a&:hover { - background-color: darken(@state-warning-bg, 10%); - } -} -.bg-danger { - background-color: @state-danger-bg; - a&:hover { - background-color: darken(@state-danger-bg, 10%); - } -} .bg-success { background-color: @state-success-bg; a&:hover { @@ -158,6 +146,18 @@ cite { font-style: normal; } background-color: darken(@state-info-bg, 10%); } } +.bg-warning { + background-color: @state-warning-bg; + a&:hover { + background-color: darken(@state-warning-bg, 10%); + } +} +.bg-danger { + background-color: @state-danger-bg; + a&:hover { + background-color: darken(@state-danger-bg, 10%); + } +} // Page header |