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

Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
This commit is contained in:
Mark Otto
2013-02-05 19:39:49 -08:00
parent cb0fed6693 c55329085e
commit 15c7e73abd
19 changed files with 126 additions and 6159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/buttons.less
+8 -5
View File
@@ -25,13 +25,14 @@
.ie7-restore-left-whitespace(); // Give IE7 some love
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
// Hover state
&:hover {
// Hover/focus state
&:hover,
&:focus {
color: @grayDark;
text-decoration: none;
background-position: 0 -15px;
// transition is only when going to hover, otherwise the background
// transition is only when going to hover/focus, otherwise the background
// behind the gradient (there for IE<=9 fallback) gets mismatched
.transition(background-position .1s linear);
}
@@ -214,12 +215,14 @@ input[type="submit"].btn {
color: @linkColor;
.border-radius(0);
}
.btn-link:hover {
.btn-link:hover,
.btn-link:focus {
color: @linkColorHover;
text-decoration: underline;
background-color: transparent;
}
.btn-link[disabled]:hover {
.btn-link[disabled]:hover,
.btn-link[disabled]:focus {
color: @grayDark;
text-decoration: none;
}