From 8eb376205631c11bc8be55e71dd58d69e2e35791 Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Mon, 15 Aug 2022 20:29:09 -0700 Subject: [PATCH] Standardize color ids --- .../tokens/color/default-theme.yaml | 16 ++++----- .../tokens/color/owncast-colors.yaml | 16 ++++----- web/styles/theme.less | 18 +++++----- web/styles/variables.css | 34 +++++++------------ 4 files changed, 38 insertions(+), 46 deletions(-) diff --git a/web/style-definitions/tokens/color/default-theme.yaml b/web/style-definitions/tokens/color/default-theme.yaml index 2d1dbaf38..12bf1a06e 100644 --- a/web/style-definitions/tokens/color/default-theme.yaml +++ b/web/style-definitions/tokens/color/default-theme.yaml @@ -37,18 +37,18 @@ theme: user-colors: comment: 'Colors used to display chat users.' 0: - value: '{color.owncast.user.1.value}' + value: '{color.owncast.user.0.value}' 1: - value: '{color.owncast.user.2.value}' + value: '{color.owncast.user.1.value}' 2: - value: '{color.owncast.user.3.value}' + value: '{color.owncast.user.2.value}' 3: - value: '{color.owncast.user.4.value}' + value: '{color.owncast.user.3.value}' 4: - value: '{color.owncast.user.5.value}' + value: '{color.owncast.user.4.value}' 5: - value: '{color.owncast.user.6.value}' + value: '{color.owncast.user.5.value}' 6: - value: '{color.owncast.user.7.value}' + value: '{color.owncast.user.6.value}' 7: - value: '{color.owncast.user.8.value}' + value: '{color.owncast.user.7.value}' diff --git a/web/style-definitions/tokens/color/owncast-colors.yaml b/web/style-definitions/tokens/color/owncast-colors.yaml index ca2299392..c1a353372 100644 --- a/web/style-definitions/tokens/color/owncast-colors.yaml +++ b/web/style-definitions/tokens/color/owncast-colors.yaml @@ -10,21 +10,21 @@ color: # GenerateRandomDisplayColor in the Go codebase so it knows the max # number of colors to use. user: - 1: + 0: value: 'rgb(244, 11, 11)' - 2: + 1: value: 'rgb(244, 128, 11)' - 3: + 2: value: 'rgb(244, 244, 11)' - 4: + 3: value: 'rgb(88, 244, 11)' - 5: + 4: value: 'rgb(11, 244, 244)' - 6: + 5: value: 'rgb(11, 166, 244)' - 7: + 6: value: 'rgb(102, 102, 255)' - 8: + 7: value: 'rgb(244, 11, 244)' text: diff --git a/web/styles/theme.less b/web/styles/theme.less index afb3c0006..20711a8d1 100644 --- a/web/styles/theme.less +++ b/web/styles/theme.less @@ -1,6 +1,6 @@ // Do not edit directly -// Generated on Sun, 14 Aug 2022 18:44:29 GMT +// Generated on Tue, 16 Aug 2022 03:27:53 GMT // // How to edit these values: // Edit the corresponding token file under the style-definitions directory @@ -49,14 +49,14 @@ @default-text-color: #030208; @color-unknown: #00ff00; @color-unknown-2: #ff0000; -@color-owncast-user-1: #f40b0b; -@color-owncast-user-2: #f4800b; -@color-owncast-user-3: #f4f40b; -@color-owncast-user-4: #58f40b; -@color-owncast-user-5: #0bf4f4; -@color-owncast-user-6: #0ba6f4; -@color-owncast-user-7: #6666ff; -@color-owncast-user-8: #f40bf4; +@color-owncast-user-0: #f40b0b; +@color-owncast-user-1: #f4800b; +@color-owncast-user-2: #f4f40b; +@color-owncast-user-3: #58f40b; +@color-owncast-user-4: #0bf4f4; +@color-owncast-user-5: #0ba6f4; +@color-owncast-user-6: #6666ff; +@color-owncast-user-7: #f40bf4; @color-owncast-text-primary: #030208; @color-owncast-text-secondary: #63638e; @color-owncast-text-highlight: #030208; diff --git a/web/styles/variables.css b/web/styles/variables.css index f834b02ae..9a3fd473a 100644 --- a/web/styles/variables.css +++ b/web/styles/variables.css @@ -1,6 +1,6 @@ /** * Do not edit directly - * Generated on Sun, 14 Aug 2022 18:44:29 GMT + * Generated on Tue, 16 Aug 2022 03:27:53 GMT * * How to edit these values: * Edit the corresponding token file under the style-definitions directory @@ -23,12 +23,8 @@ --theme-text-primary: #030208; /* The color of the text in the application. */ --theme-text-secondary: #63638e; --theme-text-link: #5353a6; - --theme-text-body-font-family: 'Open Sans', system-ui, -apple-system, BlinkMacSystemFont, - 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', - 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; - --theme-text-display-font-family: 'Poppins', system-ui, -apple-system, BlinkMacSystemFont, - 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', - 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; + --theme-text-body-font-family: 'Open Sans', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; + --theme-text-display-font-family: 'Poppins', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; --theme-background-primary: #fffcf2; /* The main background color of the page. */ --theme-background-secondary: #f0efe4; /* A secondary background color used in sections and controls. */ --theme-rounded-corners: 0.5em; @@ -55,14 +51,14 @@ --default-text-color: #030208; --color-unknown: #00ff00; --color-unknown-2: #ff0000; - --color-owncast-user-1: #f40b0b; - --color-owncast-user-2: #f4800b; - --color-owncast-user-3: #f4f40b; - --color-owncast-user-4: #58f40b; - --color-owncast-user-5: #0bf4f4; - --color-owncast-user-6: #0ba6f4; - --color-owncast-user-7: #6666ff; - --color-owncast-user-8: #f40bf4; + --color-owncast-user-0: #f40b0b; + --color-owncast-user-1: #f4800b; + --color-owncast-user-2: #f4f40b; + --color-owncast-user-3: #58f40b; + --color-owncast-user-4: #0bf4f4; + --color-owncast-user-5: #0ba6f4; + --color-owncast-user-6: #6666ff; + --color-owncast-user-7: #f40bf4; --color-owncast-text-primary: #030208; --color-owncast-text-secondary: #63638e; --color-owncast-text-highlight: #030208; @@ -71,10 +67,6 @@ --color-owncast-background-primary: #fffcf2; --color-owncast-background-secondary: #f0efe4; --rounded-corners: 0.5em; - --font-owncast-body: 'Open Sans', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, - 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', - 'Segoe UI Symbol', 'Noto Color Emoji'; - --font-owncast-display: 'Poppins', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', - Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', - 'Segoe UI Symbol', 'Noto Color Emoji'; + --font-owncast-body: 'Open Sans', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; + --font-owncast-display: 'Poppins', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; }