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
d3b3b4c4
Commit
d3b3b4c4
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Fixes
#6474
: remove duplicate .btn border colors to make @btn-border work
parent
d7c93fc6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/css/bootstrap.css
+2
-7
docs/assets/css/bootstrap.css
less/buttons.less
+0
-5
less/buttons.less
less/variables.less
+1
-1
less/variables.less
with
3 additions
and
13 deletions
+3
-13
docs/assets/css/bootstrap.css
+
2
-
7
View file @
d3b3b4c4
...
...
@@ -3169,11 +3169,11 @@ button.close {
background-image
:
-o-linear-gradient
(
top
,
#ffffff
,
#e6e6e6
);
background-image
:
linear-gradient
(
to
bottom
,
#ffffff
,
#e6e6e6
);
background-repeat
:
repeat-x
;
border
:
1px
solid
#
bbbbbb
;
border
:
1px
solid
#
cccccc
;
*
border
:
0
;
border-color
:
#e6e6e6
#e6e6e6
#bfbfbf
;
border-color
:
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.25
);
border-bottom-color
:
#
a2a2a2
;
border-bottom-color
:
#
b3b3b3
;
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;
...
...
@@ -3308,11 +3308,6 @@ input[type="button"].btn-block {
color
:
rgba
(
255
,
255
,
255
,
0.75
);
}
.btn
{
border-color
:
#c5c5c5
;
border-color
:
rgba
(
0
,
0
,
0
,
0.15
)
rgba
(
0
,
0
,
0
,
0.15
)
rgba
(
0
,
0
,
0
,
0.25
);
}
.btn-primary
{
color
:
#ffffff
;
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
...
...
This diff is collapsed.
Click to expand it.
less/buttons.less
+
0
-
5
View file @
d3b3b4c4
...
...
@@ -141,11 +141,6 @@ input[type="button"] {
// Set the backgrounds
// -------------------------
.btn {
// reset here as of 2.0.3 due to Recess property order
border-color: #c5c5c5;
border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25);
}
.btn-primary {
.buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
}
...
...
This diff is collapsed.
Click to expand it.
less/variables.less
+
1
-
1
View file @
d3b3b4c4
...
...
@@ -86,7 +86,7 @@
// -------------------------
@btnBackground: @white;
@btnBackgroundHighlight: darken(@white, 10%);
@btnBorder: #
bbb
;
@btnBorder: #
ccc
;
@btnPrimaryBackground: @linkColor;
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%);
...
...
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