Commit 5139a19e authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Update styling of all disabled buttons

parent f17d7a4b
...@@ -173,13 +173,14 @@ ...@@ -173,13 +173,14 @@
} }
&.user-authored { &.user-authored {
cursor: default; cursor: not-allowed;
opacity: 0.65; background-color: $gray-light;
border-color: $theme-gray-200;
&:hover, color: $gl-text-color-disabled;
&:active {
background-color: $white-light; gl-emoji {
border-color: $border-color; opacity: 0.4;
filter: grayscale(100%);
} }
} }
......
...@@ -450,3 +450,20 @@ ...@@ -450,3 +450,20 @@
.btn-svg svg { .btn-svg svg {
@include btn-svg; @include btn-svg;
} }
// All disabled buttons, regardless of color
.btn.disabled,
.btn[disabled],
fieldset[disabled] .btn,
.dropdown-toggle[disabled],
[disabled].dropdown-menu-toggle {
background-color: $gray-light;
border-color: $theme-gray-200;
color: $gl-text-color-disabled;
opacity: 1;
cursor: not-allowed;
i {
color: $gl-text-color-disabled;
}
}
...@@ -63,11 +63,6 @@ ...@@ -63,11 +63,6 @@
border-radius: $border-radius-base; border-radius: $border-radius-base;
white-space: nowrap; white-space: nowrap;
&[disabled] {
opacity: .65;
cursor: not-allowed;
}
&.no-outline { &.no-outline {
outline: 0; outline: 0;
} }
......
...@@ -164,6 +164,7 @@ $gl-text-color-tertiary: #949494; ...@@ -164,6 +164,7 @@ $gl-text-color-tertiary: #949494;
$gl-text-color-quaternary: #d6d6d6; $gl-text-color-quaternary: #d6d6d6;
$gl-text-color-inverted: rgba(255, 255, 255, 1); $gl-text-color-inverted: rgba(255, 255, 255, 1);
$gl-text-color-secondary-inverted: rgba(255, 255, 255, .85); $gl-text-color-secondary-inverted: rgba(255, 255, 255, .85);
$gl-text-color-disabled: #919191;
$gl-text-green: $green-600; $gl-text-green: $green-600;
$gl-text-green-hover: $green-700; $gl-text-green-hover: $green-700;
$gl-text-red: $red-500; $gl-text-red: $red-500;
......
...@@ -391,11 +391,17 @@ ...@@ -391,11 +391,17 @@
.dropdown-toggle { .dropdown-toggle {
float: right; float: right;
.toggle-icon { i {
color: $white-light; color: $white-light;
padding-right: 2px; padding-right: 2px;
margin-top: 2px; margin-top: 2px;
} }
&[disabled] {
i {
color: $gl-text-color-disabled;
}
}
} }
.dropdown-menu { .dropdown-menu {
......
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