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

fix: revert PR #377 manually since design tokens #396

Merged
merged 3 commits into from
Sep 9, 2024
Merged

fix: revert PR #377 manually since design tokens #396

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
0ca30c5
fix: revert portal "traffic" colors
wesleyboar Sep 9, 2024
b76123a
fix: revert portal message styles
wesleyboar Sep 9, 2024
de269bd
Merge branch 'main' into fix/revert-pr-377-manually-since-design-tokens
wesleyboar Sep 9, 2024
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
2 changes: 1 addition & 1 deletion dist/components/c-message--compact.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/core-styles.portal.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings/color--portal.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dist/settings/color--portal.v1.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dist/settings/color--portal.v2.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dist/tools/x-message--v1.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dist/tools/x-message.v1.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 51 additions & 6 deletions src/lib/_imports/components/c-message--compact.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,74 @@
@import url('../tools/x-message.css');
@import url('../tools/x-message.v1.css');
@import url('../tools/x-link.css');

@import url("./c-button.selectors.css");
@import url("./c-message.selectors.css");



:--c-message {
font-size: var(--global-font-size--small);
@mixin message-v1;
}

:--c-message--type-info:--c-message--scope-section:--c-message--has-icon {
&::before { display: none; }
:--c-message--scope-inline {
@mixin message-v1--scope-inline;
}
:--c-message--scope-section {
@mixin message-v1--scope-section;
}
:--c-message--scope-global {
@mixin message-v1--scope-global;
}

:--c-message--type-info {
@mixin message-v1--type-info color;
}
:--c-message--type-success {
@mixin message-v1--type-success color;
}
:--c-message--type-warning {
@mixin message-v1--type-warning color;
}
:--c-message--type-error {
@mixin message-v1--type-error color;
}
:--c-message--type-extra {
@mixin message-v1--type-extra color;
}

:--c-message--type-info:--c-message--scope-section {
@mixin message-v1--type-info---message-v1--scope-section;
}
:--c-message--type-success:--c-message--scope-section {
@mixin message-v1--type-success---message-v1--scope-section;

/* IDEA: Add icons (in v3) */
/*
@mixin message--has-icon---message--type-success;
@mixin message--has-icon---message--scope-section;
@mixin message--has-icon;
*/
}
:--c-message--type-warning:--c-message--scope-section {
@mixin message--has-icon---message--type-warning;
@mixin message-v1--type-warning---message-v1--scope-section;

/* IDEA: Add icons (in v3) */
/*
@mixin message--has-icon---message--type-success;
@mixin message--has-icon---message--scope-section;
@mixin message--has-icon;
*/
}
:--c-message--type-error:--c-message--scope-section {
@mixin message--has-icon---message--type-error;
@mixin message-v1--type-error---message-v1--scope-section;

/* IDEA: Add icons (in v3) */
/*
@mixin message--has-icon---message--type-success;
@mixin message--has-icon---message--scope-section;
@mixin message--has-icon;
*/
}
:--c-message--type-extra:--c-message--scope-section {
@mixin message-v1--type-extra---message-v1--scope-section;
}
17 changes: 2 additions & 15 deletions src/lib/_imports/settings/color--portal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
@import url("../settings/color.accent.css");

@design-tokens url('../../tokens/v2.json') format('style-dictionary3');
@import url("./color--portal.v1.css");
@import url("./color--portal.v2.css");

/* Set scope for accent colors */
@custom-selector :--light-context-safe
:root;
@custom-selector :--dark-context-safe
.u-dark-context;


/* Override other colors from base */
/* FAQ: Updating portal colors was delayed (to reduce complexity of TUP redesign) */
:root {
/* DEPRECATED */
--global-color-accent--alt: var(--global-color-accent--x-light);
--global-color-accent--weak: var(--global-color-accent--xx-light);
--global-color-success--weak: rgb( from design-token('color.success.medium') r g b / 0.5);
--global-color-warning--weak: rgb( from design-token('color.warning.medium') r g b / 0.5);
--global-color-danger--weak: rgb( from design-token('color.danger.medium') r g b / 0.5);
}
Loading
Loading