mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Fix #12073: Consistent order of variations

Browse Source 
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
This commit is contained in:
Julian Thilo
2014-01-07 22:24:45 +01:00
parent 5f328dce88
commit 8fd177bfa7
19 changed files with 258 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/type.less
+24 -24
View File
@@ -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