feat: styled pill container and added some more colors

pull/2521/head
William Grant 3 years ago
parent 5dd00e4dc2
commit 64792689b8

@ -40,10 +40,11 @@ const StyledPillInner = styled.div<PillContainerProps>`
margin: ${props => props.margin || ''}; margin: ${props => props.margin || ''};
border-radius: 300px; border-radius: 300px;
cursor: ${props => (props.disableHover ? 'unset' : 'pointer')}; cursor: ${props => (props.disableHover ? 'unset' : 'pointer')};
border: 1px solid var(--color-pill-divider); border: 1px solid var(--border-color);
transition: var(--default-duration); transition: var(--default-duration);
&:hover { &:hover {
background: ${props => (props.disableHover ? 'none' : 'var(--color-clickable-hovered)')}; background: ${props =>
props.disableHover ? 'none' : 'var(--button-solid-background-hover-color)'};
} }
`; `;

@ -467,6 +467,7 @@ export const SessionGlobalStyles = createGlobalStyle`
--primary-color: ${THEMES.CLASSIC_LIGHT.PRIMARY}; --primary-color: ${THEMES.CLASSIC_LIGHT.PRIMARY};
--danger-color: ${COLORS.DANGER.LIGHT}; --danger-color: ${COLORS.DANGER.LIGHT};
--transparent-color: ${COLORS.TRANSPARENT}; --transparent-color: ${COLORS.TRANSPARENT};
--white-color: ${COLORS.WHITE};
/* Backgrounds */ /* Backgrounds */
--background-primary-color: ${THEMES.CLASSIC_LIGHT.COLOR6}; --background-primary-color: ${THEMES.CLASSIC_LIGHT.COLOR6};
@ -513,14 +514,7 @@ export const SessionGlobalStyles = createGlobalStyle`
/* TODO Theming probably consolidate this */ /* TODO Theming probably consolidate this */
/* Buttons */ /* Buttons */
/* TODO Theming are solid buttons ever disabled? */ /* Outline (Default) */
/* Solid */
--button-solid-background-color: var(--background-primary-color);
--button-solid-background-hover-color: ${THEMES.CLASSIC_LIGHT.COLOR4};
--button-solid-text-color: var(--text-primary-color);
--button-solid-text-hover-color: var(--text-primary-color);
/* Outline */
--button-outline-background-color: var(--transparent-color); --button-outline-background-color: var(--transparent-color);
--button-outline-background-hover-color: rgba(${hexColorToRGB( --button-outline-background-hover-color: rgba(${hexColorToRGB(
THEMES.CLASSIC_LIGHT.COLOR0 THEMES.CLASSIC_LIGHT.COLOR0
@ -532,6 +526,18 @@ export const SessionGlobalStyles = createGlobalStyle`
--button-outline-border-hover-color: var(--text-primary-color); --button-outline-border-hover-color: var(--text-primary-color);
--button-outline-disabled-color: var(--text-secondary-color); --button-outline-disabled-color: var(--text-secondary-color);
/* TODO Theming are solid buttons ever disabled? */
/* Solid */
/* TODO Theming - Should Pills have their own colors */
/* Also used for Pills */
--button-solid-background-color: var(--background-primary-color);
--button-solid-background-hover-color: ${THEMES.CLASSIC_LIGHT.COLOR4};
--button-solid-text-color: var(--text-primary-color);
--button-solid-text-hover-color: var(--text-primary-color);
--button-solid-disabled-color: var(--text-secondary-color);
/* TODO Theming - Only light themes have shadows? */
--button-solid-shadow-color: rgba(${hexColorToRGB(THEMES.CLASSIC_LIGHT.COLOR0)}, 0.25);
/* Icons */ /* Icons */
--button-icon-background-color: var(--transparent-color); --button-icon-background-color: var(--transparent-color);
--button-icon-stroke-color: var(--text-secondary-color); --button-icon-stroke-color: var(--text-secondary-color);

@ -23,9 +23,14 @@ type Colors = {
CONNECTING: string; CONNECTING: string;
ERROR: string; ERROR: string;
}; };
SESSION: string;
TRANSPARENT: string; TRANSPARENT: string;
WHITE: string;
}; };
// Session Brand Color
const sessionGreen = '#00f782';
// Primary (can override theme default) // Primary (can override theme default)
const primaryGreen = '#31F196'; const primaryGreen = '#31F196';
const primaryBlue = '#57C9FA'; const primaryBlue = '#57C9FA';
@ -47,6 +52,9 @@ const pathError = '#EA5545';
// Transparent // Transparent
const transparent = 'transparent'; const transparent = 'transparent';
// White
const white = '#FFFFFF';
const COLORS: Colors = { const COLORS: Colors = {
PRIMARY: { PRIMARY: {
GREEN: primaryGreen, GREEN: primaryGreen,
@ -66,7 +74,9 @@ const COLORS: Colors = {
CONNECTING: pathConnecting, CONNECTING: pathConnecting,
ERROR: pathError, ERROR: pathError,
}, },
SESSION: sessionGreen,
TRANSPARENT: transparent, TRANSPARENT: transparent,
WHITE: white,
}; };
// Themes // Themes

Loading…
Cancel
Save