diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /app/assets/stylesheets/framework/buttons.scss | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/assets/stylesheets/framework/buttons.scss')
-rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 47 |
1 files changed, 5 insertions, 42 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index a8cc685d880..182c58c3931 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -166,8 +166,7 @@ line-height: $gl-btn-xs-line-height; } - &.btn-success, - &.btn-register { + &.btn-success { @include btn-green; } @@ -176,7 +175,6 @@ @include btn-outline($white, $green-600, $green-500, $green-100, $green-700, $green-500, $green-200, $green-600, $green-800); } - &.btn-remove, &.btn-danger { @include btn-outline($white, $red-500, $red-500, $red-100, $red-700, $red-500, $red-200, $red-600, $red-800); } @@ -200,18 +198,11 @@ @include btn-orange; } - &.btn-close, - &.btn-close-color { + &.btn-close { @include btn-outline($white, $orange-500, $orange-500, $orange-50, $orange-600, $orange-600, $orange-100, $orange-700, $orange-700); } - &.btn-spam { - @include btn-outline($white, $red-500, $red-500, $red-100, $red-700, $red-500, $red-200, $red-600, $red-800); - } - - &.btn-danger, - &.btn-remove, - &.btn-red { + &.btn-danger { @include btn-red; } @@ -219,11 +210,6 @@ float: right; } - &.btn-reopen, - .btn-reopen-color { - /* should be same as parent class for now */ - } - &.btn-grouped { @include btn-with-margin; } @@ -232,17 +218,6 @@ color: $gray-700; } - .fa-caret-down, - .fa-chevron-down { - margin-left: 5px; - } - - &.dropdown-toggle { - .fa-caret-down { - margin-left: 3px; - } - } - &.btn-text-field { width: 100%; text-align: left; @@ -276,11 +251,8 @@ width: 15px; } - svg, - .fa { - &:not(:last-child) { - margin-right: 5px; - } + svg:not(:last-child) { + margin-right: 5px; } } @@ -370,24 +342,15 @@ .btn-loading { &:not(.disabled) { - .fa, .spinner { display: none; } } - - .fa { - margin-right: 5px; - } } .btn-build { margin-left: 10px; - i { - color: $gl-text-color-secondary; - } - svg { fill: $gl-text-color-secondary; } |