Skip to content

Commit

Permalink
Fix/revert-pr-377-manually-since-design-tokens (#396)
Browse files Browse the repository at this point in the history
* fix: revert portal "traffic" colors

* fix: revert portal message styles
  • Loading branch information
wesleyboar authored Sep 9, 2024
1 parent 910bece commit dea44a7
Show file tree
Hide file tree
Showing 12 changed files with 189 additions and 24 deletions.
2 changes: 1 addition & 1 deletion dist/components/c-message--compact.css

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings/color--portal.css

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

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

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

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

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

0 comments on commit dea44a7

Please sign in to comment.