Manually merged #712

This commit is contained in:
Kevin Ross 2015-11-19 09:33:35 -06:00
parent ccc46f3686
commit e275c689a5
6 changed files with 22 additions and 19 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -86,21 +86,7 @@ legend {
@import '_progress';
// Typography
.text-warning {
color: $btn-warning;
}
.text-primary {
color: $btn-primary;
}
.text-danger {
color: $btn-danger;
}
.text-success {
color: $btn-success;
}
.text-info {
color: $btn-info;
}
@import '_typography';
@import '_tabs';

17
sass/_typography.scss Normal file
View File

@ -0,0 +1,17 @@
// This file has been autogenerated by grunt task lessToSass. Any changes will be overwritten.
.text-warning {
color: $btn-warning;
}
.text-primary {
color: $btn-primary;
}
.text-danger {
color: $btn-danger;
}
.text-success {
color: $btn-success;
}
.text-info {
color: $btn-info;
}