rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
Code Issues Actions Packages Releases Activity

Add @btn-color variable and use in buttons and carets; fixes dropup caret as well

Browse Source
This commit is contained in:
Mark Otto 2013-02-02 13:03:18 -08:00
parent 94e256c016
commit c64aa26d06
4 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docs/assets/css/bootstrap.css vendored
View File

@ -1679,7 +1679,7 @@ input[type="button"].btn-block {
}
.btn {
color: #fff;
color: #ffffff;
background-color: #a7a9aa;
border-color: #a7a9aa;
}
@ -3245,9 +3245,12 @@ button.close {
*/
.caret {
border-top-color: #fff;
border-bottom-color: #fff;
.btn .caret {
border-top-color: #ffffff;
}
.dropup .btn .caret {
border-bottom-color: #ffffff;
}
.btn-group {
@ -3344,19 +3347,10 @@ button.close {
margin-left: 0;
}
.btn-large .caret {
margin-top: 6px;
}
.btn-large .caret {
border-width: 5px;
}
.btn-mini .caret,
.btn-small .caret {
margin-top: 8px;
}
.dropup .btn-large .caret {
border-bottom-width: 5px;
}

15
less/button-groups.less
View File

@ -3,9 +3,11 @@
// --------------------------------------------------
// Button carets
.caret {
border-top-color: #fff;
border-bottom-color: #fff;
.btn .caret {
border-top-color: @btn-color;
}
.dropup .btn .caret {
border-bottom-color: @btn-color;
}
// Make the div behave like a button
@ -104,16 +106,9 @@
margin-left: 0;
}
// Carets in other button sizes
.btn-large .caret {
margin-top: 6px;
}
.btn-large .caret {
border-width: 5px;
}
.btn-mini .caret,
.btn-small .caret {
margin-top: 8px;
}
// Upside down carets for .dropup
.dropup .btn-large .caret {
border-bottom-width: 5px;

2
less/buttons.less
View File

@ -115,7 +115,7 @@ input[type="button"] {
// --------------------------------------------------
.btn {
color: #fff;
color: @btn-color;
background-color: @btn-background;
border-color: @btn-border;
&:hover,

1
less/variables.less
View File

@ -82,6 +82,7 @@
// Buttons
// -------------------------
@btn-color: #fff;
@btn-background: #a7a9aa;
@btn-border: @btn-background;