diff --git a/assets/variables.scss b/assets/variables.scss index 53ccb5b3c..c8fcd77bb 100644 --- a/assets/variables.scss +++ b/assets/variables.scss @@ -54,10 +54,14 @@ $primary-dark: #ff95bb; $colours: ( 'pink': ('light': $primary, 'dark': $primary-dark), - 'red': ('light': $red, 'dark': $red-400), + 'red': ('light': $red-600, 'dark': $red-400), 'orange': ('light': $orange-600, 'dark': $orange-300), + 'brown': ('light': $orange-800, 'dark': $orange-500), + 'yellow': ('light': $yellow-600, 'dark': $yellow-300), 'green': ('light': $green, 'dark': $green-300), + 'teal': ('light': $teal-700, 'dark': $teal-300), 'blue': ('light': $blue-700, 'dark': $blue-200), - 'grey': ('light': $gray-600, 'dark': $gray-600), + 'purple': ('light': $purple, 'dark': $purple-300), + 'grey': ('light': $gray-600, 'dark': $gray-500), 'default':('light': $body-color, 'dark': $light), ); diff --git a/locale/_base/translations.suml b/locale/_base/translations.suml index e20dc8f6d..8447b8564 100644 --- a/locale/_base/translations.suml +++ b/locale/_base/translations.suml @@ -703,8 +703,12 @@ profile: pink: 'Pink' red: 'Red' orange: 'Orange' + yellow: 'Yellow' + teal: 'Teal' green: 'Green' blue: 'Blue' + purple: 'Purple' + brown: 'Brown' grey: 'Grey' styles: _: '(Style…)' diff --git a/locale/en/translations.suml b/locale/en/translations.suml index 583ae045e..7357db42f 100644 --- a/locale/en/translations.suml +++ b/locale/en/translations.suml @@ -870,8 +870,12 @@ profile: pink: 'Pink' red: 'Red' orange: 'Orange' + yellow: 'Yellow' + teal: 'Teal' green: 'Green' blue: 'Blue' + purple: 'Purple' + brown: 'Brown' grey: 'Grey' styles: _: '(Style…)' diff --git a/locale/expectedTranslations.js b/locale/expectedTranslations.js index 91e84300c..9a6e01e16 100644 --- a/locale/expectedTranslations.js +++ b/locale/expectedTranslations.js @@ -142,4 +142,8 @@ module.exports = [ 'profile.share.pronouns', 'profile.expendableList.more', 'profile.expendableList.show', + 'profile.opinions.colours.yellow', + 'profile.opinions.colours.teal', + 'profile.opinions.colours.purple', + 'profile.opinions.colours.brown', ]; diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml index a971b85f0..2bc629641 100644 --- a/locale/pl/translations.suml +++ b/locale/pl/translations.suml @@ -1418,8 +1418,12 @@ profile: pink: 'Różowy' red: 'Czerwony' orange: 'Pomarańczowy' + yellow: 'Żółty' green: 'Zielony' + teal: 'Seledynowy' blue: 'Niebieski' + purple: 'Fioletowy' + brown: 'Brązowy' grey: 'Szary' styles: _: '(Styl tekstu…)' diff --git a/src/styling.js b/src/styling.js index 775b8a26f..de234ae6f 100644 --- a/src/styling.js +++ b/src/styling.js @@ -1,2 +1,2 @@ -export const colours = ['', 'pink', 'red', 'orange', 'green', 'blue', 'grey']; +export const colours = ['', 'pink', 'red', 'orange', 'brown', 'yellow', 'green', 'teal', 'blue', 'purple', 'grey']; export const styles = ['', 'bold-italics', 'bold', 'italics', 'small'];