Commit 0ec5066c authored by Austin Regnery's avatar Austin Regnery Committed by Vitaly Slobodin

Replaced colors with common names

Uses final mapping of hex values to colors and sets default color

Updated HEX and Names to match colorcode.is

Matches the hex values to colors from colorcode

Fixed capitalization mistakes

Remaps the names to match the hex values

Updates the colors and default color

Ran yarn prettier

Regenerated gitlab pot

Replaced RGB in test

Updated GraphQL schema

Added a changelog

Added MR number and author
parent aad3e7ac
...@@ -80,27 +80,27 @@ module LabelsHelper ...@@ -80,27 +80,27 @@ module LabelsHelper
def suggested_colors def suggested_colors
{ {
'#0033CC' => s_('SuggestedColors|UA blue'), '#009966' => s_('SuggestedColors|Green-cyan'),
'#428BCA' => s_('SuggestedColors|Moderate blue'), '#8fbc8f' => s_('SuggestedColors|Dark sea green'),
'#44AD8E' => s_('SuggestedColors|Lime green'), '#3cb371' => s_('SuggestedColors|Medium sea green'),
'#A8D695' => s_('SuggestedColors|Feijoa'), '#00b140' => s_('SuggestedColors|Green screen'),
'#5CB85C' => s_('SuggestedColors|Slightly desaturated green'), '#013220' => s_('SuggestedColors|Dark green'),
'#69D100' => s_('SuggestedColors|Bright green'), '#6699cc' => s_('SuggestedColors|Blue-gray'),
'#004E00' => s_('SuggestedColors|Very dark lime green'), '#0000ff' => s_('SuggestedColors|Blue'),
'#34495E' => s_('SuggestedColors|Very dark desaturated blue'), '#e6e6fa' => s_('SuggestedColors|Lavendar'),
'#7F8C8D' => s_('SuggestedColors|Dark grayish cyan'), '#9400d3' => s_('SuggestedColors|Dark violet'),
'#A295D6' => s_('SuggestedColors|Slightly desaturated blue'), '#330066' => s_('SuggestedColors|Deep violet'),
'#5843AD' => s_('SuggestedColors|Dark moderate blue'), '#808080' => s_('SuggestedColors|Gray'),
'#8E44AD' => s_('SuggestedColors|Dark moderate violet'), '#36454f' => s_('SuggestedColors|Charcoal grey'),
'#FFECDB' => s_('SuggestedColors|Very pale orange'), '#f7e7ce' => s_('SuggestedColors|Champagne'),
'#AD4363' => s_('SuggestedColors|Dark moderate pink'), '#c21e56' => s_('SuggestedColors|Rose red'),
'#D10069' => s_('SuggestedColors|Strong pink'), '#cc338b' => s_('SuggestedColors|Magenta-pink'),
'#CC0033' => s_('SuggestedColors|Strong red'), '#dc143c' => s_('SuggestedColors|Crimson'),
'#FF0000' => s_('SuggestedColors|Pure red'), '#ff0000' => s_('SuggestedColors|Red'),
'#D9534F' => s_('SuggestedColors|Soft red'), '#cd5b45' => s_('SuggestedColors|Dark coral'),
'#D1D100' => s_('SuggestedColors|Strong yellow'), '#eee600' => s_('SuggestedColors|Titanium yellow'),
'#F0AD4E' => s_('SuggestedColors|Soft orange'), '#ed9121' => s_('SuggestedColors|Carrot orange'),
'#AD8D43' => s_('SuggestedColors|Dark moderate orange') '#c39953' => s_('SuggestedColors|Aztec Gold')
} }
end end
......
...@@ -12,7 +12,7 @@ class Label < ApplicationRecord ...@@ -12,7 +12,7 @@ class Label < ApplicationRecord
cache_markdown_field :description, pipeline: :single_line cache_markdown_field :description, pipeline: :single_line
DEFAULT_COLOR = '#428BCA' DEFAULT_COLOR = '#6699cc'
default_value_for :color, DEFAULT_COLOR default_value_for :color, DEFAULT_COLOR
......
---
title: Update the HEX values and names of the color options for labels
merge_request: 50393
author:
type: changed
...@@ -14840,7 +14840,7 @@ input LabelCreateInput { ...@@ -14840,7 +14840,7 @@ input LabelCreateInput {
(e.g. #FFAABB) or one of the CSS color names in (e.g. #FFAABB) or one of the CSS color names in
https://developer.mozilla.org/en-US/docs/Web/CSS/color_value#Color_keywords. https://developer.mozilla.org/en-US/docs/Web/CSS/color_value#Color_keywords.
""" """
color: String = "#428BCA" color: String = "#6699cc"
""" """
Description of the label. Description of the label.
......
...@@ -40547,7 +40547,7 @@ ...@@ -40547,7 +40547,7 @@
"name": "String", "name": "String",
"ofType": null "ofType": null
}, },
"defaultValue": "\"#428BCA\"" "defaultValue": "\"#6699cc\""
}, },
{ {
"name": "clientMutationId", "name": "clientMutationId",
...@@ -28433,67 +28433,67 @@ msgstr "" ...@@ -28433,67 +28433,67 @@ msgstr ""
msgid "Suggested solutions help link" msgid "Suggested solutions help link"
msgstr "" msgstr ""
msgid "SuggestedColors|Bright green" msgid "SuggestedColors|Aztec Gold"
msgstr "" msgstr ""
msgid "SuggestedColors|Dark grayish cyan" msgid "SuggestedColors|Blue"
msgstr "" msgstr ""
msgid "SuggestedColors|Dark moderate blue" msgid "SuggestedColors|Blue-gray"
msgstr "" msgstr ""
msgid "SuggestedColors|Dark moderate orange" msgid "SuggestedColors|Carrot orange"
msgstr "" msgstr ""
msgid "SuggestedColors|Dark moderate pink" msgid "SuggestedColors|Champagne"
msgstr "" msgstr ""
msgid "SuggestedColors|Dark moderate violet" msgid "SuggestedColors|Charcoal grey"
msgstr "" msgstr ""
msgid "SuggestedColors|Feijoa" msgid "SuggestedColors|Crimson"
msgstr "" msgstr ""
msgid "SuggestedColors|Lime green" msgid "SuggestedColors|Dark coral"
msgstr "" msgstr ""
msgid "SuggestedColors|Moderate blue" msgid "SuggestedColors|Dark green"
msgstr "" msgstr ""
msgid "SuggestedColors|Pure red" msgid "SuggestedColors|Dark sea green"
msgstr "" msgstr ""
msgid "SuggestedColors|Slightly desaturated blue" msgid "SuggestedColors|Dark violet"
msgstr "" msgstr ""
msgid "SuggestedColors|Slightly desaturated green" msgid "SuggestedColors|Deep violet"
msgstr "" msgstr ""
msgid "SuggestedColors|Soft orange" msgid "SuggestedColors|Gray"
msgstr "" msgstr ""
msgid "SuggestedColors|Soft red" msgid "SuggestedColors|Green screen"
msgstr "" msgstr ""
msgid "SuggestedColors|Strong pink" msgid "SuggestedColors|Green-cyan"
msgstr "" msgstr ""
msgid "SuggestedColors|Strong red" msgid "SuggestedColors|Lavendar"
msgstr "" msgstr ""
msgid "SuggestedColors|Strong yellow" msgid "SuggestedColors|Magenta-pink"
msgstr "" msgstr ""
msgid "SuggestedColors|UA blue" msgid "SuggestedColors|Medium sea green"
msgstr "" msgstr ""
msgid "SuggestedColors|Very dark desaturated blue" msgid "SuggestedColors|Red"
msgstr "" msgstr ""
msgid "SuggestedColors|Very dark lime green" msgid "SuggestedColors|Rose red"
msgstr "" msgstr ""
msgid "SuggestedColors|Very pale orange" msgid "SuggestedColors|Titanium yellow"
msgstr "" msgstr ""
msgid "Suggestion is not applicable as the suggestion was not found." msgid "Suggestion is not applicable as the suggestion was not found."
......
...@@ -79,7 +79,7 @@ describe('DropdownCreateLabelComponent', () => { ...@@ -79,7 +79,7 @@ describe('DropdownCreateLabelComponent', () => {
const colorItemEl = colorsListContainerEl.querySelectorAll('a')[0]; const colorItemEl = colorsListContainerEl.querySelectorAll('a')[0];
expect(colorItemEl.dataset.color).toBe(vm.suggestedColors[0].colorCode); expect(colorItemEl.dataset.color).toBe(vm.suggestedColors[0].colorCode);
expect(colorItemEl.getAttribute('style')).toBe('background-color: rgb(0, 51, 204);'); expect(colorItemEl.getAttribute('style')).toBe('background-color: rgb(0, 153, 102);');
}); });
it('renders color input element', () => { it('renders color input element', () => {
......
...@@ -16,27 +16,27 @@ export const mockLabels = [ ...@@ -16,27 +16,27 @@ export const mockLabels = [
]; ];
export const mockSuggestedColors = { export const mockSuggestedColors = {
'#0033CC': 'UA blue', '#009966': 'Green-cyan',
'#428BCA': 'Moderate blue', '#8fbc8f': 'Dark sea green',
'#44AD8E': 'Lime green', '#3cb371': 'Medium sea green',
'#A8D695': 'Feijoa', '#00b140': 'Green screen',
'#5CB85C': 'Slightly desaturated green', '#013220': 'Dark green',
'#69D100': 'Bright green', '#6699cc': 'Blue-gray',
'#004E00': 'Very dark lime green', '#0000ff': 'Blue',
'#34495E': 'Very dark desaturated blue', '#e6e6fa': 'Lavendar',
'#7F8C8D': 'Dark grayish cyan', '#9400d3': 'Dark violet',
'#A295D6': 'Slightly desaturated blue', '#330066': 'Deep violet',
'#5843AD': 'Dark moderate blue', '#808080': 'Gray',
'#8E44AD': 'Dark moderate violet', '#36454f': 'Charcoal grey',
'#FFECDB': 'Very pale orange', '#f7e7ce': 'Champagne',
'#AD4363': 'Dark moderate pink', '#c21e56': 'Rose red',
'#D10069': 'Strong pink', '#cc338b': 'Magenta-pink',
'#CC0033': 'Strong red', '#dc143c': 'Crimson',
'#FF0000': 'Pure red', '#ff0000': 'Red',
'#D9534F': 'Soft red', '#cd5b45': 'Dark coral',
'#D1D100': 'Strong yellow', '#eee600': 'Titanium yellow',
'#F0AD4E': 'Soft orange', '#ed9121': 'Carrot orange',
'#AD8D43': 'Dark moderate orange', '#c39953': 'Aztec Gold',
}; };
export const mockConfig = { export const mockConfig = {
......
...@@ -50,25 +50,25 @@ export const mockConfig = { ...@@ -50,25 +50,25 @@ export const mockConfig = {
}; };
export const mockSuggestedColors = { export const mockSuggestedColors = {
'#0033CC': 'UA blue', '#009966': 'Green-cyan',
'#428BCA': 'Moderate blue', '#8fbc8f': 'Dark sea green',
'#44AD8E': 'Lime green', '#3cb371': 'Medium sea green',
'#A8D695': 'Feijoa', '#00b140': 'Green screen',
'#5CB85C': 'Slightly desaturated green', '#013220': 'Dark green',
'#69D100': 'Bright green', '#6699cc': 'Blue-gray',
'#004E00': 'Very dark lime green', '#0000ff': 'Blue',
'#34495E': 'Very dark desaturated blue', '#e6e6fa': 'Lavendar',
'#7F8C8D': 'Dark grayish cyan', '#9400d3': 'Dark violet',
'#A295D6': 'Slightly desaturated blue', '#330066': 'Deep violet',
'#5843AD': 'Dark moderate blue', '#808080': 'Gray',
'#8E44AD': 'Dark moderate violet', '#36454f': 'Charcoal grey',
'#FFECDB': 'Very pale orange', '#f7e7ce': 'Champagne',
'#AD4363': 'Dark moderate pink', '#c21e56': 'Rose red',
'#D10069': 'Strong pink', '#cc338b': 'Magenta-pink',
'#CC0033': 'Strong red', '#dc143c': 'Crimson',
'#FF0000': 'Pure red', '#ff0000': 'Red',
'#D9534F': 'Soft red', '#cd5b45': 'Dark coral',
'#D1D100': 'Strong yellow', '#eee600': 'Titanium yellow',
'#F0AD4E': 'Soft orange', '#ed9121': 'Carrot orange',
'#AD8D43': 'Dark moderate orange', '#c39953': 'Aztec Gold',
}; };
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