Commit 6aed49bf authored by Phil Hughes's avatar Phil Hughes

Merge branch '26296-update-styling-disabled-buttons' into 'master'

Resolve "Review styling of disabled buttons"

Closes #26296

See merge request gitlab-org/gitlab-ce!16501
parents 218136ac 7f6c4f42
......@@ -174,12 +174,13 @@
&.user-authored {
cursor: default;
opacity: 0.65;
background-color: $gray-light;
border-color: $theme-gray-200;
color: $gl-text-color-disabled;
&:hover,
&:active {
background-color: $white-light;
border-color: $border-color;
gl-emoji {
opacity: 0.4;
filter: grayscale(100%);
}
}
......
......@@ -220,14 +220,6 @@
@include btn-with-margin;
}
&.disabled {
pointer-events: auto !important;
}
&[disabled] {
pointer-events: none !important;
}
.fa-caret-down,
.fa-chevron-down {
margin-left: 5px;
......@@ -450,3 +442,28 @@
.btn-svg svg {
@include btn-svg;
}
// All disabled buttons, regardless of color, type, etc
%disabled {
background-color: $gray-light !important;
border-color: $theme-gray-200 !important;
color: $gl-text-color-disabled !important;
opacity: 1 !important;
cursor: default !important;
i {
color: $gl-text-color-disabled !important;
}
}
.btn.disabled,
.btn[disabled],
fieldset[disabled] .btn,
.dropdown-toggle[disabled],
[disabled].dropdown-menu-toggle {
@extend %disabled;
&:hover {
@extend %disabled;
}
}
......@@ -63,11 +63,6 @@
border-radius: $border-radius-base;
white-space: nowrap;
&[disabled] {
opacity: .65;
cursor: not-allowed;
}
&.no-outline {
outline: 0;
}
......
......@@ -164,6 +164,7 @@ $gl-text-color-tertiary: #949494;
$gl-text-color-quaternary: #d6d6d6;
$gl-text-color-inverted: rgba(255, 255, 255, 1);
$gl-text-color-secondary-inverted: rgba(255, 255, 255, .85);
$gl-text-color-disabled: #919191;
$gl-text-green: $green-600;
$gl-text-green-hover: $green-700;
$gl-text-red: $red-500;
......
......@@ -391,11 +391,17 @@
.dropdown-toggle {
float: right;
.toggle-icon {
i {
color: $white-light;
padding-right: 2px;
margin-top: 2px;
}
&[disabled] {
i {
color: $gl-text-color-disabled;
}
}
}
.dropdown-menu {
......
---
title: Set standard disabled state for all buttons
merge_request:
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment