From 8c5a334a09c86a1f8b70b5833c1201659f16c27b Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Fri, 20 Jan 2023 23:22:45 -0800 Subject: [PATCH] Fix customized button border color --- .../tokens/color/default-theme.yaml | 2 +- web/styles/ant-overrides.scss | 4 +- web/styles/theme.less | 4 +- web/styles/variables.css | 90 +++++-------------- 4 files changed, 28 insertions(+), 72 deletions(-) diff --git a/web/style-definitions/tokens/color/default-theme.yaml b/web/style-definitions/tokens/color/default-theme.yaml index 6630daacb..8b59a4d15 100644 --- a/web/style-definitions/tokens/color/default-theme.yaml +++ b/web/style-definitions/tokens/color/default-theme.yaml @@ -147,7 +147,7 @@ theme: value: 'var(--theme-color-palette-10)' comment: '{theme.color.palette.10.comment}' border: - value: 'var(--theme-color-palette-4)' + value: 'var(--theme-color-action)' comment: '{theme.color.palette.4.comment}' border-disabled: value: 'var(--theme-color-action-disabled)' diff --git a/web/styles/ant-overrides.scss b/web/styles/ant-overrides.scss index 044a8bbf4..b9186e6b5 100644 --- a/web/styles/ant-overrides.scss +++ b/web/styles/ant-overrides.scss @@ -25,7 +25,7 @@ BUTTONS .ant-btn-default { color: currentColor; border-width: 2px; - border-color: transparent; + border-color: var(--theme-color-components-primary-button-border); border-radius: var(--theme-rounded-corners); background-color: rgba(0, 0, 0, 0.1); &:hover, @@ -43,6 +43,7 @@ BUTTONS border-width: 2px; border-radius: var(--theme-rounded-corners); color: var(--theme-color-components-primary-button-text); + border-color: var(--theme-color-components-primary-button-border); &:hover, &:focus { @@ -59,7 +60,6 @@ BUTTONS } background-color: var(--theme-color-components-primary-button-background); color: var(--theme-color-components-primary-button-text); - border-color: var(--theme-color-components-primary-button-background); &:hover { background-color: var(--theme-color-action-hover); color: var(--theme-color-components-primary-button-text); diff --git a/web/styles/theme.less b/web/styles/theme.less index b1dd0640d..42b77fd70 100644 --- a/web/styles/theme.less +++ b/web/styles/theme.less @@ -1,6 +1,6 @@ // Do not edit directly -// Generated on Thu, 19 Jan 2023 03:14:14 GMT +// Generated on Sat, 21 Jan 2023 07:20:28 GMT // // How to edit these values: // Edit the corresponding token file under the style-definitions directory @@ -75,7 +75,7 @@ @theme-color-components-primary-button-background-disabled: var(--theme-color-action-disabled); // Disabled background @theme-color-components-primary-button-text: var(--theme-color-palette-4); // Light secondary @theme-color-components-primary-button-text-disabled: var(--theme-color-palette-10); // Neutral gray light -@theme-color-components-primary-button-border: var(--theme-color-palette-4); // Light secondary +@theme-color-components-primary-button-border: var(--theme-color-action); // Light secondary @theme-color-components-primary-button-border-disabled: var(--theme-color-action-disabled); // Disabled background @theme-color-components-secondary-button-background: var(--theme-color-palette-4); // Light secondary @theme-color-components-secondary-button-background-disabled: transparent; diff --git a/web/styles/variables.css b/web/styles/variables.css index bda2c32b1..a35494c7c 100644 --- a/web/styles/variables.css +++ b/web/styles/variables.css @@ -1,6 +1,6 @@ /** * Do not edit directly - * Generated on Thu, 19 Jan 2023 03:14:14 GMT + * Generated on Sat, 21 Jan 2023 07:20:28 GMT * * How to edit these values: * Edit the corresponding token file under the style-definitions directory @@ -35,12 +35,8 @@ --theme-rounded-corners: 9px; /* How much corners are rounded in places in the UI. */ --theme-unknown-1: green; /* This should never be used and it means something is wrong. */ --theme-unknown-2: red; /* This should never be used and it means something is wrong. */ - --theme-text-body-font-family: var( - --font-owncast-body - ); /* The font family used for the body text. */ - --theme-text-display-font-family: var( - --font-owncast-display - ); /* The font family used for the display/header text. */ + --theme-text-body-font-family: var(--font-owncast-body); /* The font family used for the body text. */ + --theme-text-display-font-family: var(--font-owncast-display); /* The font family used for the display/header text. */ --theme-color-users-0: var(--color-owncast-user-0); --theme-color-users-1: var(--color-owncast-user-1); --theme-color-users-2: var(--color-owncast-user-2); @@ -77,74 +73,38 @@ --theme-color-warning: var(--theme-color-palette-warning); /* Warning */ --theme-color-components-text-on-light: var(--theme-color-palette-0); /* Dark primary */ --theme-color-components-text-on-dark: var(--theme-color-palette-3); /* Light primary */ - --theme-color-components-primary-button-background: var( - --theme-color-action - ); /* Text link/secondary light text */ - --theme-color-components-primary-button-background-disabled: var( - --theme-color-action-disabled - ); /* Disabled background */ + --theme-color-components-primary-button-background: var(--theme-color-action); /* Text link/secondary light text */ + --theme-color-components-primary-button-background-disabled: var(--theme-color-action-disabled); /* Disabled background */ --theme-color-components-primary-button-text: var(--theme-color-palette-4); /* Light secondary */ - --theme-color-components-primary-button-text-disabled: var( - --theme-color-palette-10 - ); /* Neutral gray light */ - --theme-color-components-primary-button-border: var( - --theme-color-palette-4 - ); /* Light secondary */ - --theme-color-components-primary-button-border-disabled: var( - --theme-color-action-disabled - ); /* Disabled background */ - --theme-color-components-secondary-button-background: var( - --theme-color-palette-4 - ); /* Light secondary */ + --theme-color-components-primary-button-text-disabled: var(--theme-color-palette-10); /* Neutral gray light */ + --theme-color-components-primary-button-border: var(--theme-color-action); /* Light secondary */ + --theme-color-components-primary-button-border-disabled: var(--theme-color-action-disabled); /* Disabled background */ + --theme-color-components-secondary-button-background: var(--theme-color-palette-4); /* Light secondary */ --theme-color-components-secondary-button-background-disabled: transparent; - --theme-color-components-secondary-button-text: var( - --theme-color-action-disabled - ); /* Disabled background */ - --theme-color-components-secondary-button-text-disabled: var( - --theme-color-action-disabled - ); /* Disabled background */ - --theme-color-components-secondary-button-border: var( - --theme-color-action - ); /* Text link/secondary light text */ - --theme-color-components-secondary-button-border-disabled: var( - --theme-color-action-disabled - ); /* Disabled background */ + --theme-color-components-secondary-button-text: var(--theme-color-action-disabled); /* Disabled background */ + --theme-color-components-secondary-button-text-disabled: var(--theme-color-action-disabled); /* Disabled background */ + --theme-color-components-secondary-button-border: var(--theme-color-action); /* Text link/secondary light text */ + --theme-color-components-secondary-button-border-disabled: var(--theme-color-action-disabled); /* Disabled background */ --theme-color-components-chat-background: var(--theme-color-palette-1); /* Dark primary */ --theme-color-components-chat-text: var(--theme-color-palette-15); /* Lighter background */ - --theme-color-components-content-background: var( - --theme-color-palette-15 - ); /* Lighter background */ - --theme-color-components-modal-header-background: var( - --theme-color-palette-1 - ); /* Dark secondary */ + --theme-color-components-content-background: var(--theme-color-palette-15); /* Lighter background */ + --theme-color-components-modal-header-background: var(--theme-color-palette-1); /* Dark secondary */ --theme-color-components-modal-header-text: var(--theme-color-palette-3); /* Light primary */ - --theme-color-components-modal-content-background: var( - --theme-color-palette-3 - ); /* Light primary */ + --theme-color-components-modal-content-background: var(--theme-color-palette-3); /* Light primary */ --theme-color-components-modal-content-text: var(--theme-color-palette-0); /* Dark primary */ --theme-color-components-menu-background: var(--theme-color-palette-3); /* Light primary */ --theme-color-components-menu-item-text: var(--theme-color-palette-0); /* Dark primary */ --theme-color-components-menu-item-bg: transparent; --theme-color-components-menu-item-hover-bg: rgba(0, 0, 0, 0.05); --theme-color-components-menu-item-focus-bg: rgba(0, 0, 0, 0.1); - --theme-color-components-form-field-background: var( - --theme-color-palette-4 - ); /* Light secondary */ - --theme-color-components-form-field-placeholder: var( - --theme-color-action-disabled - ); /* Disabled background */ + --theme-color-components-form-field-background: var(--theme-color-palette-4); /* Light secondary */ + --theme-color-components-form-field-placeholder: var(--theme-color-action-disabled); /* Disabled background */ --theme-color-components-form-field-text: var(--theme-color-palette-0); /* Dark primary */ --theme-color-components-form-field-border: var(--theme-color-palette-0); /* Dark primary */ --theme-color-components-video-background: var(--theme-color-palette-2); /* Dark alternate */ - --theme-color-components-video-live-indicator: var( - --theme-color-palette-7 - ); /* The Live dot indicator in the control bar of the video player */ - --theme-color-components-video-status-bar-background: var( - --theme-color-palette-2 - ); /* The background color of the video status bar */ - --theme-color-components-video-status-bar-foreground: var( - --theme-color-palette-4 - ); /* The foreground color of the video status bar */ + --theme-color-components-video-live-indicator: var(--theme-color-palette-7); /* The Live dot indicator in the control bar of the video player */ + --theme-color-components-video-status-bar-background: var(--theme-color-palette-2); /* The background color of the video status bar */ + --theme-color-components-video-status-bar-foreground: var(--theme-color-palette-4); /* The foreground color of the video status bar */ --owncast-purple-25: rgba(120, 113, 255, 0.25); --color-unknown: #7a5cf3; --color-unknown-2: #fffffe; @@ -174,10 +134,6 @@ --color-owncast-palette-15: #eff1f4; /* Lighter background */ --color-owncast-palette-error: #ff4b39; /* Error */ --color-owncast-palette-warning: #ffc655; /* Warning */ - --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'; }