Merge remote-tracking branch 'upstream/2.1.0-wip' into 2.1.0-wip

This commit is contained in:
Marcus Schwab
2012-06-11 02:04:14 -07:00
20 changed files with 4157 additions and 4040 deletions

View File

@@ -11,9 +11,6 @@
.border-radius(4px);
color: @warningText;
}
.alert-heading {
color: inherit;
}
// Adjust close link position
.alert .close {
@@ -28,7 +25,7 @@
.alert-success {
background-color: @successBackground;
border-color: @successBorder;
border-color: @successBorder;
color: @successText;
}
.alert-danger,