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
f61fb70e
Commit
f61fb70e
authored
8 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge branch 'v4-dev' of
https://github.com/twbs/bootstrap
into v4-dev
parents
7180b42a
08984ac8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_buttons.scss
+6
-6
scss/_buttons.scss
scss/_dropdown.scss
+0
-5
scss/_dropdown.scss
with
6 additions
and
11 deletions
+6
-11
scss/_buttons.scss
+
6
-
6
View file @
f61fb70e
...
...
@@ -73,22 +73,22 @@ fieldset[disabled] a.btn {
// Remove all backgrounds
.btn-outline-primary
{
@include
button-outline-variant
(
$btn-primary-bg
);
@include
button-outline-variant
(
$btn-primary-bg
,
$btn-primary-color
);
}
.btn-outline-secondary
{
@include
button-outline-variant
(
$btn-secondary-border
);
@include
button-outline-variant
(
$btn-secondary-border
,
$btn-secondary-color
);
}
.btn-outline-info
{
@include
button-outline-variant
(
$btn-info-bg
);
@include
button-outline-variant
(
$btn-info-bg
,
$btn-info-color
);
}
.btn-outline-success
{
@include
button-outline-variant
(
$btn-success-bg
);
@include
button-outline-variant
(
$btn-success-bg
,
$btn-success-color
);
}
.btn-outline-warning
{
@include
button-outline-variant
(
$btn-warning-bg
);
@include
button-outline-variant
(
$btn-warning-bg
,
$btn-warning-color
);
}
.btn-outline-danger
{
@include
button-outline-variant
(
$btn-danger-bg
);
@include
button-outline-variant
(
$btn-danger-bg
,
$btn-danger-color
);
}
...
...
This diff is collapsed.
Click to expand it.
scss/_dropdown.scss
+
0
-
5
View file @
f61fb70e
...
...
@@ -17,11 +17,6 @@
border-right
:
$caret-width
solid
transparent
;
border-left
:
$caret-width
solid
transparent
;
}
// Prevent the focus on the dropdown toggle when closing dropdowns
&
:focus
{
outline
:
0
;
}
}
.dropup
{
...
...
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