Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'assets/stylesheets/bootstrap/_buttons.scss')
-rw-r--r--assets/stylesheets/bootstrap/_buttons.scss42
1 files changed, 19 insertions, 23 deletions
diff --git a/assets/stylesheets/bootstrap/_buttons.scss b/assets/stylesheets/bootstrap/_buttons.scss
index 607f24a..c6dbb5d 100644
--- a/assets/stylesheets/bootstrap/_buttons.scss
+++ b/assets/stylesheets/bootstrap/_buttons.scss
@@ -58,7 +58,11 @@ fieldset[disabled] a.btn {
@each $color, $value in $theme-colors {
.btn-outline-#{$color} {
- @include button-outline-variant($value, #fff);
+ @if $color == "light" {
+ @include button-outline-variant($value, $gray-900);
+ } @else {
+ @include button-outline-variant($value, $white);
+ }
}
}
@@ -71,36 +75,28 @@ fieldset[disabled] a.btn {
.btn-link {
font-weight: $font-weight-normal;
color: $link-color;
+ background-color: transparent;
border-radius: 0;
- &,
- &:active,
- &.active,
- &:disabled {
+ @include hover {
+ color: $link-hover-color;
+ text-decoration: $link-hover-decoration;
background-color: transparent;
- @include box-shadow(none);
+ border-color: transparent;
}
- &,
+
&:focus,
- &:active {
+ &.focus {
border-color: transparent;
box-shadow: none;
}
- @include hover {
- border-color: transparent;
- }
- @include hover-focus {
- color: $link-hover-color;
- text-decoration: $link-hover-decoration;
- background-color: transparent;
- }
- &:disabled {
- color: $btn-link-disabled-color;
- @include hover-focus {
- text-decoration: none;
- }
+ &:disabled,
+ &.disabled {
+ color: $btn-link-disabled-color;
}
+
+ // No need for an active state here
}
@@ -109,11 +105,11 @@ fieldset[disabled] a.btn {
//
.btn-lg {
- @include button-size($input-btn-padding-y-lg, $input-btn-padding-x-lg, $font-size-lg, $line-height-lg, $btn-border-radius-lg);
+ @include button-size($input-btn-padding-y-lg, $input-btn-padding-x-lg, $font-size-lg, $input-btn-line-height-lg, $btn-border-radius-lg);
}
.btn-sm {
- @include button-size($input-btn-padding-y-sm, $input-btn-padding-x-sm, $font-size-sm, $line-height-sm, $btn-border-radius-sm);
+ @include button-size($input-btn-padding-y-sm, $input-btn-padding-x-sm, $font-size-sm, $input-btn-line-height-sm, $btn-border-radius-sm);
}