From 36d38bd2eda75be2813c1c152a7d35deb8c79eb8 Mon Sep 17 00:00:00 2001 From: William Grant Date: Wed, 12 Oct 2022 17:12:44 +1100 Subject: [PATCH] fix: pass yarn ready --- ts/components/AboutView.tsx | 2 +- ts/components/conversation/SessionEmojiPanel.tsx | 3 ++- ts/components/icon/SessionIconButton.tsx | 2 +- ts/themes/classicDark.ts | 4 +--- ts/themes/classicLight.ts | 4 +--- ts/themes/constants/colors.tsx | 1 + ts/themes/globals.tsx | 2 +- ts/themes/index.ts | 8 ++++---- ts/themes/oceanDark.ts | 5 ++--- ts/themes/oceanLight.ts | 5 ++--- 10 files changed, 16 insertions(+), 20 deletions(-) diff --git a/ts/components/AboutView.tsx b/ts/components/AboutView.tsx index 3af5df44a..11b81beb9 100644 --- a/ts/components/AboutView.tsx +++ b/ts/components/AboutView.tsx @@ -45,7 +45,7 @@ export const AboutView = () => { return ( - + session icon
{`v${window.getVersion()}`}
{window.getCommitHash() || ''}
diff --git a/ts/components/conversation/SessionEmojiPanel.tsx b/ts/components/conversation/SessionEmojiPanel.tsx index e3dffaf1b..0f08deec5 100644 --- a/ts/components/conversation/SessionEmojiPanel.tsx +++ b/ts/components/conversation/SessionEmojiPanel.tsx @@ -108,9 +108,11 @@ export const SessionEmojiPanel = forwardRef((props: Props switch (theme) { case 'ocean-dark': setPanelBackgroundRGB(hexColorToRGB(THEMES.OCEAN_DARK.COLOR1)); + // tslint:disable: no-non-null-assertion setPanelTextRGB(hexColorToRGB(THEMES.OCEAN_DARK.COLOR7!)); break; case 'ocean-light': + // tslint:disable: no-non-null-assertion setPanelBackgroundRGB(hexColorToRGB(THEMES.OCEAN_LIGHT.COLOR7!)); setPanelTextRGB(hexColorToRGB(THEMES.OCEAN_LIGHT.COLOR1)); break; @@ -122,7 +124,6 @@ export const SessionEmojiPanel = forwardRef((props: Props default: setPanelBackgroundRGB(hexColorToRGB(THEMES.CLASSIC_DARK.COLOR1)); setPanelTextRGB(hexColorToRGB(THEMES.CLASSIC_DARK.COLOR6)); - break; } }, [theme]); diff --git a/ts/components/icon/SessionIconButton.tsx b/ts/components/icon/SessionIconButton.tsx index 8bf5abdd6..e92e6c7c5 100644 --- a/ts/components/icon/SessionIconButton.tsx +++ b/ts/components/icon/SessionIconButton.tsx @@ -32,7 +32,7 @@ const StyledSessionIconButton = styled.div<{ color?: string; isSelected?: boolea } &:hover svg path { - ${props => !props.color && `fill: var(--button-icon-stroke-hover-color);`} + ${props => !props.color && 'fill: var(--button-icon-stroke-hover-color);'} } `; diff --git a/ts/themes/classicDark.ts b/ts/themes/classicDark.ts index d61fed4ba..75fc350a9 100644 --- a/ts/themes/classicDark.ts +++ b/ts/themes/classicDark.ts @@ -2,7 +2,7 @@ import { hexColorToRGB } from '../util/hexColorToRGB'; import { COLORS, THEMES } from './constants/colors'; import { ThemeColorVariables } from './variableColors'; -const classicDark: ThemeColorVariables = { +export const classicDark: ThemeColorVariables = { '--danger-color': THEMES.CLASSIC_DARK.DANGER, '--disabled-color': THEMES.CLASSIC_DARK.DISABLED, @@ -155,5 +155,3 @@ const classicDark: ThemeColorVariables = { '--call-buttons-dropdown-color': 'var(--text-primary-color)', '--call-buttons-dropdown-shadow': '0 0 4px 0 var(grey-color)', }; - -export default classicDark; diff --git a/ts/themes/classicLight.ts b/ts/themes/classicLight.ts index aa392bb17..62c86df91 100644 --- a/ts/themes/classicLight.ts +++ b/ts/themes/classicLight.ts @@ -2,7 +2,7 @@ import { hexColorToRGB } from '../util/hexColorToRGB'; import { COLORS, THEMES } from './constants/colors'; import { ThemeColorVariables } from './variableColors'; -const classicLight: ThemeColorVariables = { +export const classicLight: ThemeColorVariables = { '--danger-color': THEMES.CLASSIC_LIGHT.DANGER, '--disabled-color': THEMES.CLASSIC_LIGHT.DISABLED, @@ -155,5 +155,3 @@ const classicLight: ThemeColorVariables = { '--call-buttons-dropdown-color': 'var(--text-primary-color)', '--call-buttons-dropdown-shadow': '0 0 4px 0 var(grey-color)', }; - -export default classicLight; diff --git a/ts/themes/constants/colors.tsx b/ts/themes/constants/colors.tsx index 996637788..102e95cc5 100644 --- a/ts/themes/constants/colors.tsx +++ b/ts/themes/constants/colors.tsx @@ -281,6 +281,7 @@ export const getThemeColors = (): Array => [ id: 'ocean-light', title: window.i18n('oceanLightThemeTitle'), style: { + // tslint:disable: no-non-null-assertion background: THEMES.OCEAN_LIGHT.COLOR7!, border: THEMES.OCEAN_LIGHT.COLOR3, receivedBackground: THEMES.OCEAN_LIGHT.COLOR1, diff --git a/ts/themes/globals.tsx b/ts/themes/globals.tsx index 623e5930e..d9d29d32d 100644 --- a/ts/themes/globals.tsx +++ b/ts/themes/globals.tsx @@ -126,7 +126,7 @@ export const THEME_GLOBALS: ThemeGlobals = { '--grey-color': COLORS.GREY, '--shadow-color': 'var(--black-color)', - '--drop-shadow': `0 0 4px 0 var(--shadow-color)`, + '--drop-shadow': '0 0 4px 0 var(--shadow-color)', '--context-menu-shadow-color': `rgba(${hexColorToRGB(COLORS.BLACK)}, 0.22)`, '--button-path-default-color': COLORS.PATH.DEFAULT, diff --git a/ts/themes/index.ts b/ts/themes/index.ts index 540c53113..ff5ea154f 100644 --- a/ts/themes/index.ts +++ b/ts/themes/index.ts @@ -1,6 +1,6 @@ -import classicLight from './classicLight'; -import classicDark from './classicDark'; -import oceanLight from './oceanLight'; -import oceanDark from './oceanDark'; +import { classicLight } from './classicLight'; +import { classicDark } from './classicDark'; +import { oceanLight } from './oceanLight'; +import { oceanDark } from './oceanDark'; export { classicLight, classicDark, oceanLight, oceanDark }; diff --git a/ts/themes/oceanDark.ts b/ts/themes/oceanDark.ts index dd7bc5c80..d61609df4 100644 --- a/ts/themes/oceanDark.ts +++ b/ts/themes/oceanDark.ts @@ -1,8 +1,9 @@ +/* tslint:disable: no-non-null-assertion */ import { hexColorToRGB } from '../util/hexColorToRGB'; import { COLORS, THEMES } from './constants/colors'; import { ThemeColorVariables } from './variableColors'; -const oceanDark: ThemeColorVariables = { +export const oceanDark: ThemeColorVariables = { '--danger-color': THEMES.OCEAN_DARK.DANGER, '--disabled-color': THEMES.OCEAN_DARK.DISABLED, @@ -155,5 +156,3 @@ const oceanDark: ThemeColorVariables = { '--call-buttons-dropdown-color': 'var(--text-primary-color)', '--call-buttons-dropdown-shadow': '0 0 4px 0 var(grey-color)', }; - -export default oceanDark; diff --git a/ts/themes/oceanLight.ts b/ts/themes/oceanLight.ts index aae9ecd44..255e92349 100644 --- a/ts/themes/oceanLight.ts +++ b/ts/themes/oceanLight.ts @@ -1,8 +1,9 @@ +/* tslint:disable: no-non-null-assertion */ import { hexColorToRGB } from '../util/hexColorToRGB'; import { COLORS, THEMES } from './constants/colors'; import { ThemeColorVariables } from './variableColors'; -const oceanLight: ThemeColorVariables = { +export const oceanLight: ThemeColorVariables = { '--danger-color': THEMES.OCEAN_LIGHT.DANGER, '--disabled-color': THEMES.OCEAN_LIGHT.DISABLED, @@ -155,5 +156,3 @@ const oceanLight: ThemeColorVariables = { '--call-buttons-dropdown-color': 'var(--text-primary-color)', '--call-buttons-dropdown-shadow': '0 0 4px 0 var(grey-color)', }; - -export default oceanLight;