2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'master' into bg-variant

Conflicts:
	less/mixins.less
This commit is contained in:
Mark Otto
2014-01-18 14:40:17 -08:00
8 changed files with 117 additions and 48 deletions
+5 -20
View File
@@ -92,34 +92,19 @@ cite { font-style: normal; }
color: @text-muted;
}
.text-primary {
color: @brand-primary;
&:hover {
color: darken(@brand-primary, 10%);
}
.text-emphasis-variant(@brand-primary);
}
.text-success {
color: @state-success-text;
&:hover {
color: darken(@state-success-text, 10%);
}
.text-emphasis-variant(@state-success-text);
}
.text-info {
color: @state-info-text;
&:hover {
color: darken(@state-info-text, 10%);
}
.text-emphasis-variant(@state-info-text);
}
.text-warning {
color: @state-warning-text;
&:hover {
color: darken(@state-warning-text, 10%);
}
.text-emphasis-variant(@state-warning-text);
}
.text-danger {
color: @state-danger-text;
&:hover {
color: darken(@state-danger-text, 10%);
}
.text-emphasis-variant(@state-danger-text);
}
// Contextual backgrounds