mirror of
https://github.com/twbs/bootstrap.git
synced 2025-09-01 17:32:41 +02:00
fix up buttons after recess property order
This commit is contained in:
4
docs/assets/css/bootstrap.css
vendored
4
docs/assets/css/bootstrap.css
vendored
@@ -2694,6 +2694,10 @@ button.close {
|
|||||||
color: rgba(255, 255, 255, 0.75);
|
color: rgba(255, 255, 255, 0.75);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.btn {
|
||||||
|
border-color: #ccc;
|
||||||
|
}
|
||||||
|
|
||||||
.btn-primary {
|
.btn-primary {
|
||||||
background-color: #0074cc;
|
background-color: #0074cc;
|
||||||
*background-color: #0055cc;
|
*background-color: #0055cc;
|
||||||
|
@@ -41,6 +41,7 @@
|
|||||||
-moz-border-radius-bottomleft: 4px;
|
-moz-border-radius-bottomleft: 4px;
|
||||||
border-bottom-left-radius: 4px;
|
border-bottom-left-radius: 4px;
|
||||||
}
|
}
|
||||||
|
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
|
||||||
.btn-group > .btn:last-child,
|
.btn-group > .btn:last-child,
|
||||||
.btn-group > .dropdown-toggle {
|
.btn-group > .dropdown-toggle {
|
||||||
-webkit-border-top-right-radius: 4px;
|
-webkit-border-top-right-radius: 4px;
|
||||||
|
@@ -131,6 +131,9 @@
|
|||||||
|
|
||||||
// Set the backgrounds
|
// Set the backgrounds
|
||||||
// -------------------------
|
// -------------------------
|
||||||
|
.btn {
|
||||||
|
border-color: #ccc; // reset here as of 2.0.3 due to Recess property order
|
||||||
|
}
|
||||||
.btn-primary {
|
.btn-primary {
|
||||||
.buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
|
.buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@
|
|||||||
// -------------------------
|
// -------------------------
|
||||||
@btnBackground: @white;
|
@btnBackground: @white;
|
||||||
@btnBackgroundHighlight: darken(@white, 10%);
|
@btnBackgroundHighlight: darken(@white, 10%);
|
||||||
@btnBorder: darken(@white, 20%);
|
@btnBorder: #ccc;
|
||||||
|
|
||||||
@btnPrimaryBackground: @linkColor;
|
@btnPrimaryBackground: @linkColor;
|
||||||
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
|
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
|
||||||
|
Reference in New Issue
Block a user