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

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

This commit is contained in:
Mark Otto
2013-08-18 15:30:02 -07:00
5 changed files with 26 additions and 24 deletions
+5 -5
View File
@@ -22,11 +22,11 @@
& .btn-default .caret {
border-bottom-color: @btn-default-color;
}
& .btn-primary,
& .btn-success,
& .btn-warning,
& .btn-danger,
& .btn-info {
.btn-primary,
.btn-success,
.btn-warning,
.btn-danger,
.btn-info {
.caret {
border-bottom-color: #fff;
}
+10 -8
View File
@@ -54,14 +54,16 @@ textarea {
a {
color: @link-color;
text-decoration: none;
}
a:hover,
a:focus {
color: @link-hover-color;
text-decoration: underline;
}
a:focus {
.tab-focus();
&:hover,
&:focus {
color: @link-hover-color;
text-decoration: underline;
}
&:focus {
.tab-focus();
}
}