fix: pass yarn ready

pull/2522/head
William Grant 3 years ago
parent 07f2fcabd4
commit 36d38bd2ed

@ -45,7 +45,7 @@ export const AboutView = () => {
return (
<SessionTheme>
<StyledContent>
<img src="images/session/session_icon.png" width="250" height="250" />
<img src="images/session/session_icon.png" width="250" height="250" alt="session icon" />
<div className="version">{`v${window.getVersion()}`}</div>
<div className="commitHash">{window.getCommitHash() || ''}</div>

@ -108,9 +108,11 @@ export const SessionEmojiPanel = forwardRef<HTMLDivElement, Props>((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<HTMLDivElement, Props>((props: Props
default:
setPanelBackgroundRGB(hexColorToRGB(THEMES.CLASSIC_DARK.COLOR1));
setPanelTextRGB(hexColorToRGB(THEMES.CLASSIC_DARK.COLOR6));
break;
}
}, [theme]);

@ -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);'}
}
`;

@ -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;

@ -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;

@ -281,6 +281,7 @@ export const getThemeColors = (): Array<ThemeType> => [
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,

@ -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,

@ -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 };

@ -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;

@ -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;

Loading…
Cancel
Save