Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: Colors #25969

Merged
merged 3 commits into from
Jun 23, 2022
Merged

Chore: Colors #25969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0ab868
regression: sidebar colors
juliajforesti Jun 23, 2022
0b9de80
update Button and IconButton flags
juliajforesti Jun 23, 2022
6cdc2dd
Merge remote-tracking branch 'origin/develop' into fix/colors
ggazzo Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/meteor/app/mentions/client/mentionLink.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

&:hover {
opacity: 0.6;
color: var(--mention-link-text-color);
}

&--me {
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/client/sidebar/Item/Condensed.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ export const Actions = Template.bind({});
Actions.args = {
actions: (
<>
<IconButton secondarySuccess icon='phone' />
<IconButton secondaryDanger icon='circle-cross' />
<IconButton secondaryInfo icon='trash' />
<IconButton secondary success icon='phone' />
<IconButton secondary danger icon='circle-cross' />
<IconButton secondary info icon='trash' />
<IconButton secondary icon='phone' />
</>
),
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/client/sidebar/Item/Extended.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ export const Actions = Template.bind({});
Actions.args = {
actions: (
<>
<IconButton secondarySuccess icon='phone' />
<IconButton secondaryDanger icon='circle-cross' />
<IconButton secondaryInfo icon='trash' />
<IconButton secondary success icon='phone' />
<IconButton secondary danger icon='circle-cross' />
<IconButton secondary info icon='trash' />
<IconButton secondary icon='phone' />
</>
),
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/client/sidebar/Item/Medium.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ export const Actions = Template.bind({});
Actions.args = {
actions: (
<>
<IconButton secondarySuccess icon='phone' />
<IconButton secondaryDanger icon='circle-cross' />
<IconButton secondaryInfo icon='trash' />
<IconButton secondary success icon='phone' />
<IconButton secondary danger icon='circle-cross' />
<IconButton secondary info icon='trash' />
<IconButton secondary icon='phone' />
</>
),
Expand Down
29 changes: 19 additions & 10 deletions apps/meteor/client/sidebar/hooks/useSidebarPaletteColor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,15 @@ const getStyle = (
--rcx-color-neutral-800: ${toVar(colors.n200)};
--rcx-color-neutral-900: ${toVar(colors.n100)};

--rcx-color-primary-100: ${toVar(colors.p900)};
--rcx-color-primary-200: ${toVar(colors.p800)};
--rcx-color-primary-300: ${toVar(colors.p700)};
--rcx-color-primary-400: ${toVar(colors.p600)};
--rcx-color-primary-500: ${toVar(colors.p500)};
--rcx-color-primary-600: ${toVar(colors.p400)};
--rcx-color-primary-700: ${toVar(colors.p300)};
--rcx-color-primary-800: ${toVar(colors.p200)};
--rcx-color-primary-900: ${toVar(colors.p100)};
--rcx-color-primary-100: ${toVar(colors.b900)};
--rcx-color-primary-200: ${toVar(colors.b800)};
--rcx-color-primary-300: ${toVar(colors.b700)};
--rcx-color-primary-400: ${toVar(colors.b600)};
--rcx-color-primary-500: ${toVar(colors.b500)};
--rcx-color-primary-600: ${toVar(colors.b400)};
--rcx-color-primary-700: ${toVar(colors.b300)};
--rcx-color-primary-800: ${toVar(colors.b200)};
--rcx-color-primary-900: ${toVar(colors.b100)};

--rcx-button-colors-icon-active-border-color: ${toVar(colors.n900)};
--rcx-button-colors-icon-active-background-color: ${toVar(colors.n800)};
Expand Down Expand Up @@ -186,11 +186,20 @@ const getStyle = (
--rcx-divider-color: ${h2r(toVar(colors.n900), 0.4)};
--rcx-color-foreground-alternative: ${toVar(colors.n100)};
--rcx-color-foreground-hint: ${toVar(colors.n600)};

}

.rcx-badge--danger {
--rcx-badge-colors-danger-background-color: ${toVar(colors.r500)}
}
.rcx-badge--primary {
--rcx-badge-colors-primary-background-color: ${toVar(colors.b500)}
}

.rcx-sidebar {
background-color: ${toVar(colors.sibebarSurface)};
}
`
`
)(isIE11 ? ':root' : modifier);

const useSidebarPaletteColorIE11 = () => {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/permissions/EditRolePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const EditRolePage = ({ role }: { role?: IRole }): ReactElement => {
{t('Save')}
</Button>
{!role?.protected && role?._id && (
<Button secondaryDanger onClick={handleDelete}>
<Button secondary danger onClick={handleDelete}>
{t('Delete')}
</Button>
)}
Expand Down
2 changes: 1 addition & 1 deletion ...eteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const UsersInRoleTableRow = ({ user, onRemove }: UsersInRoleTableRowProps): Reac
</TableCell>
<TableCell withTruncatedText>{email}</TableCell>
<TableCell withTruncatedText>
<Button small square secondaryDanger onClick={handleRemove}>
<Button small square secondary danger onClick={handleRemove}>
<Icon name='trash' size='x20' />
</Button>
</TableCell>
Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/client/views/admin/settings/Section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ function Section({ groupId, hasReset = true, sectionName, tabName = '', solo, he
{hasReset && canReset && (
<Button
children={t('Reset_section_settings')}
secondaryDanger
secondary
danger
marginBlockStart={'x16'}
data-section={sectionName}
onClick={handleResetSectionClick}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/settings/groups/OAuthGroupPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function OAuthGroupPage({ _id, ...group }: OAuthGroupPageProps): ReactElement {
solo={solo}
>
<div className='submit'>
<Button secondaryDanger onClick={handleRemoveCustomOAuthButtonClick}>
<Button secondary danger onClick={handleRemoveCustomOAuthButtonClick}>
{t('Remove_custom_oauth')}
</Button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/omnichannel/facebook/FacebookPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const FacebookPage: FC<FacebookPageProps> = ({ pages, enabled, hasToken, onToggl
</Box>
<ButtonGroup stretch vertical>
<Button onClick={onRefresh}>{t('Reload_Pages')}</Button>
<Button secondaryDanger onClick={onDisable}>
<Button secondary danger onClick={onDisable}>
{t('Disable')}
</Button>
</ButtonGroup>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/contextualBar/OTR/components/OTREstablished.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const OTREstablished = ({ onClickRefresh, onClickEnd }: OTREstablishedProps): Re
return (
<ButtonGroup stretch>
<Button onClick={onClickRefresh}>{t('Refresh_keys')}</Button>
<Button secondaryDanger onClick={onClickEnd}>
<Button secondary danger onClick={onClickEnd}>
{t('End_OTR')}
</Button>
</ButtonGroup>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/contextualBar/VideoConference/BBB/CallBBB.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const CallBBB: FC<CallBBBProps> = ({ handleClose, canManageCall, live, startCall
</Button>
)}
{live && canManageCall && (
<Button secondaryDanger onClick={endCall}>
<Button secondary danger onClick={endCall}>
{t('BBB_End_Meeting')}
</Button>
)}
Expand Down