Commit d2655aef authored by Lyza Danger Gardner's avatar Lyza Danger Gardner

Introduce interim `$grey-mid` color for consolidation purposes

Introduce a new color variable, `$grey-mid`, which sits between
`$color-5` and `$color-6` in the current palette scale and fills a
large gap.

Remove `$gray-dark` and `$color-dove-gray` after migrating to `$grey-mid`.
parent 6f76cc03
...@@ -110,7 +110,7 @@ $adder-transition-duration: 80ms; ...@@ -110,7 +110,7 @@ $adder-transition-duration: 80ms;
font-family: h; font-family: h;
font-size: 18px; font-size: 18px;
background: transparent !important; background: transparent !important;
color: var.$gray-dark !important; color: var.$grey-mid !important;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
...@@ -126,10 +126,10 @@ $adder-transition-duration: 80ms; ...@@ -126,10 +126,10 @@ $adder-transition-duration: 80ms;
} }
.annotator-adder-actions .annotator-adder-actions__button:hover { .annotator-adder-actions .annotator-adder-actions__button:hover {
color: var.$gray-dark !important; color: var.$grey-mid !important;
.annotator-adder-actions__label { .annotator-adder-actions__label {
color: var.$gray-dark !important; color: var.$grey-mid !important;
} }
} }
...@@ -137,6 +137,6 @@ $adder-transition-duration: 80ms; ...@@ -137,6 +137,6 @@ $adder-transition-duration: 80ms;
font-size: 11px; font-size: 11px;
margin: 2px 0px; margin: 2px 0px;
font-family: sans-serif; font-family: sans-serif;
color: var.$gray-dark !important; color: var.$grey-mid !important;
transition: color $adder-transition-duration; transition: color $adder-transition-duration;
} }
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
@mixin primary-action-btn { @mixin primary-action-btn {
color: var.$grey-1; color: var.$grey-1;
background-color: var.$color-dove-gray; background-color: var.$grey-mid;
height: 35px; height: 35px;
border: none; border: none;
border-radius: 2px; border-radius: 2px;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
// of related options to the right // of related options to the right
.annotation-publish-control__btn { .annotation-publish-control__btn {
$text-color: var.$grey-1; $text-color: var.$grey-1;
$default-background-color: var.$color-dove-gray; $default-background-color: var.$grey-mid;
$hover-background-color: var.$grey-6; $hover-background-color: var.$grey-6;
$h-padding: 9px; $h-padding: 9px;
$height: 35px; $height: 35px;
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
margin-left: 8px; margin-left: 8px;
border: none; border: none;
background-color: var.$color-dove-gray; background-color: var.$grey-mid;
border-top-right-radius: $border-radius; border-top-right-radius: $border-radius;
border-bottom-right-radius: $border-radius; border-bottom-right-radius: $border-radius;
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
button[aria-expanded='true'] &-separator { button[aria-expanded='true'] &-separator {
// hide the 1px vertical separator when the dropdown arrow // hide the 1px vertical separator when the dropdown arrow
// is hovered or menu is open // is hovered or menu is open
background-color: var.$color-dove-gray; background-color: var.$grey-mid;
} }
// 1px vertical separator between label and dropdown arrow // 1px vertical separator between label and dropdown arrow
......
@use "../../variables" as var; @use "../../variables" as var;
.new-note__create { .new-note__create {
background-color: var.$color-dove-gray; background-color: var.$grey-mid;
border: none; border: none;
border-radius: 3px; border-radius: 3px;
color: #fff; color: #fff;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
flex-flow: row nowrap; flex-flow: row nowrap;
position: relative; position: relative;
color: var.$gray-dark; color: var.$grey-mid;
} }
.search-input__icon { .search-input__icon {
......
...@@ -66,11 +66,11 @@ ...@@ -66,11 +66,11 @@
padding: 1px 3px 0 3px; padding: 1px 3px 0 3px;
&:hover { &:hover {
color: var.$gray-dark; color: var.$grey-mid;
} }
&.is-active { &.is-active {
color: var.$gray-dark; color: var.$grey-mid;
} }
&--refresh { &--refresh {
......
...@@ -16,8 +16,10 @@ $gray-light: #969696 !default; ...@@ -16,8 +16,10 @@ $gray-light: #969696 !default;
$grey-5: #7a7a7a; $grey-5: #7a7a7a;
$gray: #777 !default; $gray: #777 !default;
$color-dove-gray: #626262; // Interim color variable for migration purposes, as the step between `$grey-5`
$gray-dark: #585858; // and `$grey-6` is large. Represents `base-mid` in proposed future palette,
// minus blue tint.
$grey-mid: #595959;
$grey-6: #3f3f3f; $grey-6: #3f3f3f;
...@@ -30,7 +32,7 @@ $black: #000 !default; ...@@ -30,7 +32,7 @@ $black: #000 !default;
$brand: #bd1c2b; $brand: #bd1c2b;
$highlight: #58cef4; $highlight: #58cef4;
$button-text-color: $gray-dark !default; $button-text-color: $grey-mid !default;
$button-background-start: $white !default; $button-background-start: $white !default;
$button-background-end: #f0f0f0 !default; $button-background-end: #f0f0f0 !default;
$button-background-gradient: to bottom, $button-background-start, $button-background-gradient: to bottom, $button-background-start,
...@@ -85,7 +87,7 @@ $success-color: #1cbd41 !default; ...@@ -85,7 +87,7 @@ $success-color: #1cbd41 !default;
// Scaffolding // Scaffolding
// ------------------------- // -------------------------
$body-background: $white !default; $body-background: $white !default;
$text-color: $gray-dark !default; $text-color: $grey-mid !default;
// Links // Links
// ------------------------- // -------------------------
......
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