Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
c64aa26d
Commit
c64aa26d
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Add @btn-color variable and use in buttons and carets; fixes dropup caret as well
parent
94e256c0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/css/bootstrap.css
+7
-13
docs/assets/css/bootstrap.css
less/button-groups.less
+5
-10
less/button-groups.less
less/buttons.less
+1
-1
less/buttons.less
less/variables.less
+1
-0
less/variables.less
with
14 additions
and
24 deletions
+14
-24
docs/assets/css/bootstrap.css
+
7
-
13
View file @
c64aa26d
...
...
@@ -1679,7 +1679,7 @@ input[type="button"].btn-block {
}
.btn
{
color
:
#fff
;
color
:
#fff
fff
;
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
;
}
...
...
This diff is collapsed.
Click to expand it.
less/button-groups.less
+
5
-
10
View file @
c64aa26d
...
...
@@ -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;
...
...
This diff is collapsed.
Click to expand it.
less/buttons.less
+
1
-
1
View file @
c64aa26d
...
...
@@ -115,7 +115,7 @@ input[type="button"] {
// --------------------------------------------------
.btn {
color:
#fff
;
color:
@btn-color
;
background-color: @btn-background;
border-color: @btn-border;
&:hover,
...
...
This diff is collapsed.
Click to expand it.
less/variables.less
+
1
-
0
View file @
c64aa26d
...
...
@@ -82,6 +82,7 @@
// Buttons
// -------------------------
@btn-color: #fff;
@btn-background: #a7a9aa;
@btn-border: @btn-background;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment