From 442afcab38cd59434eb53e364876181857d576e6 Mon Sep 17 00:00:00 2001 From: Andy O'Neill Date: Fri, 5 May 2023 14:04:50 -0400 Subject: [PATCH] fix: use looks secondary rather than tertiary color --- src/components/color-picker/color-picker.css | 2 +- .../icons/fill-horz-gradient-enabled.svg | 2 +- .../color-picker/icons/fill-radial-enabled.svg | 2 +- .../color-picker/icons/fill-solid-enabled.svg | 2 +- .../icons/fill-vert-gradient-enabled.svg | 2 +- src/components/color-picker/icons/swap.svg | 2 +- src/components/dropdown/dropdown-caret.svg | 2 +- src/components/dropdown/dropdown.css | 2 +- src/components/fixed-tools/icons/group.svg | 16 ++++++++-------- src/components/fixed-tools/icons/redo.svg | 2 +- src/components/fixed-tools/icons/send-back.svg | 2 +- .../fixed-tools/icons/send-backward.svg | 2 +- .../fixed-tools/icons/send-forward.svg | 2 +- src/components/fixed-tools/icons/send-front.svg | 2 +- src/components/fixed-tools/icons/undo.svg | 2 +- src/components/fixed-tools/icons/ungroup.svg | 14 +++++++------- src/components/font-dropdown/font-dropdown.css | 2 +- src/components/forms/input.css | 2 +- src/components/mode-tools/icons/copy.svg | 4 ++-- src/components/mode-tools/icons/curved-point.svg | 12 ++++++------ src/components/mode-tools/icons/delete.svg | 2 +- .../mode-tools/icons/flip-horizontal.svg | 4 ++-- .../mode-tools/icons/flip-vertical.svg | 4 ++-- src/components/mode-tools/icons/paste.svg | 4 ++-- .../mode-tools/icons/straight-point.svg | 4 ++-- .../paint-editor/icons/rotation-point.svg | 2 +- src/components/paint-editor/paint-editor.css | 2 +- .../tool-select-base/tool-select-base.css | 2 +- src/css/colors.css | 4 ++-- 29 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/components/color-picker/color-picker.css b/src/components/color-picker/color-picker.css index 15bf43c4..ae0463a2 100644 --- a/src/components/color-picker/color-picker.css +++ b/src/components/color-picker/color-picker.css @@ -80,7 +80,7 @@ } .active-swatch { - border: 1px solid $looks-tertiary; + border: 1px solid $looks-secondary; box-shadow: 0px 0px 0px 3px $looks-transparent; } diff --git a/src/components/color-picker/icons/fill-horz-gradient-enabled.svg b/src/components/color-picker/icons/fill-horz-gradient-enabled.svg index 88b14d87..36490a57 100644 --- a/src/components/color-picker/icons/fill-horz-gradient-enabled.svg +++ b/src/components/color-picker/icons/fill-horz-gradient-enabled.svg @@ -6,7 +6,7 @@ - + diff --git a/src/components/color-picker/icons/fill-radial-enabled.svg b/src/components/color-picker/icons/fill-radial-enabled.svg index 44336c2c..3cac3a2b 100644 --- a/src/components/color-picker/icons/fill-radial-enabled.svg +++ b/src/components/color-picker/icons/fill-radial-enabled.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/src/components/color-picker/icons/fill-solid-enabled.svg b/src/components/color-picker/icons/fill-solid-enabled.svg index 23afa639..2f8bb698 100644 --- a/src/components/color-picker/icons/fill-solid-enabled.svg +++ b/src/components/color-picker/icons/fill-solid-enabled.svg @@ -5,6 +5,6 @@ Created with Sketch. - + diff --git a/src/components/color-picker/icons/fill-vert-gradient-enabled.svg b/src/components/color-picker/icons/fill-vert-gradient-enabled.svg index 912d1aba..838c2da0 100644 --- a/src/components/color-picker/icons/fill-vert-gradient-enabled.svg +++ b/src/components/color-picker/icons/fill-vert-gradient-enabled.svg @@ -6,7 +6,7 @@ - + diff --git a/src/components/color-picker/icons/swap.svg b/src/components/color-picker/icons/swap.svg index 4d79e092..74afe479 100644 --- a/src/components/color-picker/icons/swap.svg +++ b/src/components/color-picker/icons/swap.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/src/components/dropdown/dropdown-caret.svg b/src/components/dropdown/dropdown-caret.svg index dd05d610..4c7f82bc 100644 --- a/src/components/dropdown/dropdown-caret.svg +++ b/src/components/dropdown/dropdown-caret.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/src/components/dropdown/dropdown.css b/src/components/dropdown/dropdown.css index d9d58083..aca3ce9a 100644 --- a/src/components/dropdown/dropdown.css +++ b/src/components/dropdown/dropdown.css @@ -7,7 +7,7 @@ $arrow-border-width: 14px; border-radius: 5px; overflow: visible; min-width: 3.5rem; - color: $looks-tertiary; + color: $looks-secondary; padding: .5rem; } diff --git a/src/components/fixed-tools/icons/group.svg b/src/components/fixed-tools/icons/group.svg index 0fd5abb8..1748fe58 100644 --- a/src/components/fixed-tools/icons/group.svg +++ b/src/components/fixed-tools/icons/group.svg @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/components/fixed-tools/icons/redo.svg b/src/components/fixed-tools/icons/redo.svg index aeeb00c5..c32f9449 100644 --- a/src/components/fixed-tools/icons/redo.svg +++ b/src/components/fixed-tools/icons/redo.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/src/components/fixed-tools/icons/send-back.svg b/src/components/fixed-tools/icons/send-back.svg index 80122540..7e60ac6c 100644 --- a/src/components/fixed-tools/icons/send-back.svg +++ b/src/components/fixed-tools/icons/send-back.svg @@ -7,7 +7,7 @@ - + diff --git a/src/components/fixed-tools/icons/send-backward.svg b/src/components/fixed-tools/icons/send-backward.svg index 407078a7..8d490574 100644 --- a/src/components/fixed-tools/icons/send-backward.svg +++ b/src/components/fixed-tools/icons/send-backward.svg @@ -7,7 +7,7 @@ - + diff --git a/src/components/fixed-tools/icons/send-forward.svg b/src/components/fixed-tools/icons/send-forward.svg index e6ec87f1..c611e8e7 100644 --- a/src/components/fixed-tools/icons/send-forward.svg +++ b/src/components/fixed-tools/icons/send-forward.svg @@ -7,7 +7,7 @@ - + diff --git a/src/components/fixed-tools/icons/send-front.svg b/src/components/fixed-tools/icons/send-front.svg index 7d106d3c..2941c4de 100644 --- a/src/components/fixed-tools/icons/send-front.svg +++ b/src/components/fixed-tools/icons/send-front.svg @@ -7,7 +7,7 @@ - + diff --git a/src/components/fixed-tools/icons/undo.svg b/src/components/fixed-tools/icons/undo.svg index f6b3fc7f..44c9517b 100644 --- a/src/components/fixed-tools/icons/undo.svg +++ b/src/components/fixed-tools/icons/undo.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/src/components/fixed-tools/icons/ungroup.svg b/src/components/fixed-tools/icons/ungroup.svg index 89e5cf1c..04d45fea 100644 --- a/src/components/fixed-tools/icons/ungroup.svg +++ b/src/components/fixed-tools/icons/ungroup.svg @@ -9,13 +9,13 @@ - - - - - - - + + + + + + + diff --git a/src/components/font-dropdown/font-dropdown.css b/src/components/font-dropdown/font-dropdown.css index 255947dc..a528a9f4 100644 --- a/src/components/font-dropdown/font-dropdown.css +++ b/src/components/font-dropdown/font-dropdown.css @@ -16,7 +16,7 @@ } .mod-menu-item:hover { - background: $looks-tertiary; + background: $looks-secondary; color: white; } diff --git a/src/components/forms/input.css b/src/components/forms/input.css index ca5639cd..09049a11 100644 --- a/src/components/forms/input.css +++ b/src/components/forms/input.css @@ -40,7 +40,7 @@ Edited to add input-range-small } .input-form:focus { - border-color: $looks-tertiary; + border-color: $looks-secondary; box-shadow: 0 0 0 $grid-unit $looks-transparent; } diff --git a/src/components/mode-tools/icons/copy.svg b/src/components/mode-tools/icons/copy.svg index cb057727..37f22e49 100644 --- a/src/components/mode-tools/icons/copy.svg +++ b/src/components/mode-tools/icons/copy.svg @@ -8,8 +8,8 @@ - - + + diff --git a/src/components/mode-tools/icons/curved-point.svg b/src/components/mode-tools/icons/curved-point.svg index 9c630534..fcad7bb0 100644 --- a/src/components/mode-tools/icons/curved-point.svg +++ b/src/components/mode-tools/icons/curved-point.svg @@ -6,12 +6,12 @@ - - - - - - + + + + + + diff --git a/src/components/mode-tools/icons/delete.svg b/src/components/mode-tools/icons/delete.svg index 1b1e06ee..91d41f00 100644 --- a/src/components/mode-tools/icons/delete.svg +++ b/src/components/mode-tools/icons/delete.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/src/components/mode-tools/icons/flip-horizontal.svg b/src/components/mode-tools/icons/flip-horizontal.svg index 7cc7e3ba..40c54500 100644 --- a/src/components/mode-tools/icons/flip-horizontal.svg +++ b/src/components/mode-tools/icons/flip-horizontal.svg @@ -12,8 +12,8 @@ - - + + diff --git a/src/components/mode-tools/icons/flip-vertical.svg b/src/components/mode-tools/icons/flip-vertical.svg index 65948d2a..b286a23e 100644 --- a/src/components/mode-tools/icons/flip-vertical.svg +++ b/src/components/mode-tools/icons/flip-vertical.svg @@ -12,8 +12,8 @@ - - + + diff --git a/src/components/mode-tools/icons/paste.svg b/src/components/mode-tools/icons/paste.svg index da9e5a04..069531db 100644 --- a/src/components/mode-tools/icons/paste.svg +++ b/src/components/mode-tools/icons/paste.svg @@ -8,8 +8,8 @@ - - + + diff --git a/src/components/mode-tools/icons/straight-point.svg b/src/components/mode-tools/icons/straight-point.svg index 6f1c20fe..a198dfa6 100644 --- a/src/components/mode-tools/icons/straight-point.svg +++ b/src/components/mode-tools/icons/straight-point.svg @@ -5,8 +5,8 @@ Created with Sketch. - - + + diff --git a/src/components/paint-editor/icons/rotation-point.svg b/src/components/paint-editor/icons/rotation-point.svg index 0324b2e2..5857252c 100755 --- a/src/components/paint-editor/icons/rotation-point.svg +++ b/src/components/paint-editor/icons/rotation-point.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/src/components/paint-editor/paint-editor.css b/src/components/paint-editor/paint-editor.css index a5cec6ec..35672d5c 100644 --- a/src/components/paint-editor/paint-editor.css +++ b/src/components/paint-editor/paint-editor.css @@ -172,7 +172,7 @@ $border-radius: 0.25rem; .bitmap-button { display: flex; border-radius: 5px; - background-color: $looks-tertiary; + background-color: $looks-secondary; padding: calc(2 * $grid-unit); line-height: 1.5rem; font-size: calc(3 * $grid-unit); diff --git a/src/components/tool-select-base/tool-select-base.css b/src/components/tool-select-base/tool-select-base.css index ed2f2ea3..9eda9115 100644 --- a/src/components/tool-select-base/tool-select-base.css +++ b/src/components/tool-select-base/tool-select-base.css @@ -16,7 +16,7 @@ $border-radius: .25rem; } .mod-tool-select.is-selected { - background-color: $looks-tertiary; + background-color: $looks-secondary; } .mod-tool-select:focus { diff --git a/src/css/colors.css b/src/css/colors.css index 0dfc94d3..7d003201 100644 --- a/src/css/colors.css +++ b/src/css/colors.css @@ -8,8 +8,8 @@ $ui-background-blue: #e8edf1; $text-primary: #575e75; -$looks-tertiary: #774DCB; -$looks-transparent: hsla(260, 54%, 54%, 0.35); /* 35% transparent version of looks-tertiary */ +$looks-secondary: #855CD6; +$looks-transparent: hsla(260, 60%, 60%, 0.35); /* 35% transparent version of looks-secondary */ $red-primary: #FF661A; $red-tertiary: #E64D00;