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

feat: Gradient ai updates #4184

Merged
merged 5 commits into from
Feb 5, 2024
Merged

feat: Gradient ai updates #4184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dde077b
feat: update card AI styles to latest tile AI styles
lee-chase Jan 31, 2024
2e9d003
chore: snapshot update
lee-chase Jan 31, 2024
948642e
feat: update ai gradient on side panel
lee-chase Jan 31, 2024
525c773
chore: update carbon versions for ai
lee-chase Feb 5, 2024
11edeea
Merge branch main into gradientAIUpdates
lee-chase Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions cspell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"version": "0.1",
"language": "en",
"dictionaries": ["contributors", "html", "packages"],
"dictionaries": [
"contributors",
"html",
"packages"
],
"dictionaryDefinitions": [
{
"name": "contributors",
Expand Down Expand Up @@ -68,6 +72,7 @@
"autodocs",
"automerge",
"buildhome",
"callout",
"checkmark",
"codemods",
"codesandbox",
Expand Down Expand Up @@ -110,8 +115,8 @@
"rowgroup",
"rowheader",
"rowindex",
"scrollend",
"sbdocs",
"scrollend",
"semibold",
"serializers",
"setsize",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"@carbon/ibm-products-styles": "^2.22.0",
"@carbon/layout": "^11.20.1",
"@carbon/motion": "^11.16.1",
"@carbon/react": "^1.48.1",
"@carbon/react": "^1.49.0",
"@carbon/storybook-addon-theme": "^2.0.6",
"@carbon/themes": "^11.29.1",
"@carbon/themes": "^11.30.0",
"@carbon/type": "^11.25.1",
"@storybook/addon-actions": "^7.6.2",
"@storybook/addon-controls": "^7.6.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/ibm-products-community/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@carbon/grid": "^11.21.1",
"@carbon/layout": "^11.20.1",
"@carbon/motion": "^11.16.1",
"@carbon/react": "^1.48.1",
"@carbon/themes": "^11.29.1",
"@carbon/react": "^1.49.0",
"@carbon/themes": "^11.30.0",
"@carbon/type": "^11.25.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/ibm-products-styles/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@carbon/grid": "^11.21.1",
"@carbon/layout": "^11.20.1",
"@carbon/motion": "^11.16.1",
"@carbon/themes": "^11.29.1",
"@carbon/themes": "^11.30.0",
"@carbon/type": "^11.25.1"
}
}
59 changes: 49 additions & 10 deletions packages/ibm-products-styles/src/__tests__/__snapshots__/styles.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2375,6 +2375,9 @@ p.c4p--about-modal__copyright-text:first-child {
.c4p--side-panel__container.c4p--side-panel__container--condensed-actions {
--c4p--side-panel--actions-height: 3rem;
}
.c4p--side-panel__container.c4p--side-panel__container--slide-in, .c4p--side-panel__container.c4p--side-panel__container:not(:has(+ .c4p--side-panel__overlay)), .c4p--side-panel__container.c4p--side-panel__container--has-no-overlay {
box-shadow: 0 0.125rem 0.25rem var(--cds-overlay, rgba(22, 22, 22, 0.5));
}
.c4p--side-panel__container .c4p--side-panel__actions-container {
width: 100%;
}
Expand All @@ -2386,8 +2389,9 @@ p.c4p--about-modal__copyright-text:first-child {
left: 0;
border-right: 1px solid var(--cds-border-subtle-02, #e0e0e0);
}
.c4p--side-panel__container.c4p--side-panel__container--slide-in, .c4p--side-panel__container.c4p--side-panel__container:not(:has(+ .c4p--side-panel__overlay)), .c4p--side-panel__container.c4p--side-panel__container--has-no-overlay {
box-shadow: 0 0.125rem 0.25rem var(--cds-overlay, rgba(22, 22, 22, 0.5));
.c4p--side-panel__container.c4p--side-panel__container.c4p--side-panel__container--has-slug {
border-color: transparent;
box-shadow: inset 0 -80px 70px -65px var(--cds-ai-inner-shadow, rgba(69, 137, 255, 0.2)), 0 4px 10px 2px var(--cds-ai-drop-shadow, rgba(15, 98, 254, 0.32));
}
.c4p--side-panel__container .c4p--side-panel__header {
--c4p--side-panel--title-padding-bottom: 1rem;
Expand Down Expand Up @@ -2546,9 +2550,8 @@ p.c4p--about-modal__copyright-text:first-child {
.c4p--side-panel__container .c4p--side-panel__header--has-action-toolbar + .c4p--side-panel__inner-content {
padding-top: 0.5rem;
}
.c4p--side-panel__container.c4p--side-panel__container--has-slug .c4p--side-panel__inner-content {
background-image: linear-gradient(0deg, var(--cds-ai-inner-shadow, rgba(69, 137, 255, 0.2)) 0%, 15%, var(--cds-ai-aura-end, rgba(255, 255, 255, 0)) 50%, transparent 100%);
border-block-end-color: var(--cds-ai-border-strong, #4589ff);
.c4p--side-panel__container.c4p--side-panel__container--has-slug .c4p--side-panel--scrolls {
background: linear-gradient(to top, var(--cds-ai-aura-start, rgba(69, 137, 255, 0.1)) 0%, var(--cds-ai-aura-end, rgba(255, 255, 255, 0)) 50%) padding-box, linear-gradient(to top, var(--cds-layer), var(--cds-layer)) padding-box, linear-gradient(to bottom, var(--cds-ai-border-start, #78a9ff), var(--cds-ai-border-end, #d0e2ff)) border-box, linear-gradient(to top, var(--cds-layer), var(--cds-layer)) border-box;
}
.c4p--side-panel__container .c4p--side-panel__inner-content.c4p--side-panel__inner-content--static {
padding-top: 1rem;
Expand Down Expand Up @@ -5389,7 +5392,6 @@ th.c4p--datagrid__select-all-toggle-on.button {
}

.c4p--card .cds--slug {
background: linear-gradient(to top, var(--cds-ai-aura-start, rgba(69, 137, 255, 0.1)) 0%, var(--cds-ai-aura-end, rgba(255, 255, 255, 0)) 50%) padding-box, linear-gradient(to top, var(--cds-background, #ffffff), var(--cds-background, #ffffff)) padding-box, linear-gradient(to bottom, var(--cds-ai-border-start, #78a9ff), var(--cds-ai-border-end, #d0e2ff)) border-box, linear-gradient(to top, var(--cds-background, #ffffff), var(--cds-background, #ffffff)) border-box;
position: absolute;
top: 1rem;
right: 1rem;
Expand Down Expand Up @@ -5418,15 +5420,17 @@ th.c4p--datagrid__select-all-toggle-on.button {
}

.c4p--card--has-slug {
background: linear-gradient(to top, var(--cds-ai-aura-start, rgba(69, 137, 255, 0.1)) 0%, var(--cds-ai-aura-end, rgba(255, 255, 255, 0)) 50%) padding-box, linear-gradient(to top, var(--cds-background, #ffffff), var(--cds-background, #ffffff)) padding-box, linear-gradient(to bottom, var(--cds-ai-border-start, #78a9ff), var(--cds-ai-border-end, #d0e2ff)) border-box, linear-gradient(to top, var(--cds-background, #ffffff), var(--cds-background, #ffffff)) border-box;
border: 1px solid var(--cds-border-tile);
background: linear-gradient(to top, var(--cds-ai-aura-start, rgba(69, 137, 255, 0.1)) 0%, var(--cds-ai-aura-end, rgba(255, 255, 255, 0)) 50%) padding-box, linear-gradient(to top, var(--cds-layer), var(--cds-layer)) padding-box, linear-gradient(to bottom, var(--cds-ai-border-start, #78a9ff), var(--cds-ai-border-end, #d0e2ff)) border-box, linear-gradient(to top, var(--cds-layer), var(--cds-layer)) border-box;
border: 1px solid transparent;
box-shadow: inset 0 -80px 70px -65px var(--cds-ai-inner-shadow, rgba(69, 137, 255, 0.2)), 0 4px 10px 2px var(--cds-ai-drop-shadow, rgba(15, 98, 254, 0.32));
}

.c4p--card__clickable.c4p--card--has-slug::before {
background: linear-gradient(0deg, var(--cds-slug-callout-aura-start-hover-01, rgba(255, 255, 255, 0.5)) 0%, var(--cds-slug-callout-aura-end-hover-01, rgba(255, 255, 255, 0)) 50%, transparent 50%), linear-gradient(0deg, var(--cds-slug-callout-aura-start-hover-02, rgba(208, 226, 255, 0.5)) 0%, var(--cds-slug-callout-aura-end-hover-02, rgba(255, 255, 255, 0)) 50%, transparent 50%), linear-gradient(180deg, var(--cds-slug-callout-gradient-top-hover, rgba(224, 224, 224, 0.55)) 0%, var(--cds-slug-callout-gradient-bottom-hover, rgba(209, 209, 209, 0.55)) 100%) rgba(0, 0, 0, 0.01);
background: linear-gradient(to top, var(--cds-ai-aura-hover-start, rgba(69, 137, 255, 0.4)) 0%, 15%, var(--cds-ai-aura-hover-end, rgba(255, 255, 255, 0)) 50%) padding-box, linear-gradient(to top, var(--cds-ai-aura-hover-background, #edf5ff), var(--cds-ai-aura-hover-background, #edf5ff)) padding-box, linear-gradient(to bottom, var(--cds-ai-border-start, #78a9ff), var(--cds-ai-border-end, #d0e2ff)) border-box, linear-gradient(to top, var(--cds-ai-aura-hover-background, #edf5ff), var(--cds-ai-aura-hover-background, #edf5ff)) border-box;
position: absolute;
display: block;
block-size: 100%;
box-shadow: inset 0 -80px 70px -65px var(--cds-ai-inner-shadow, rgba(69, 137, 255, 0.2));
content: "";
inline-size: 100%;
inset-block-start: 0;
Expand Down Expand Up @@ -6012,6 +6016,9 @@ button.c4p--add-select__global-filter-toggle--open {
}
.c4p--notifications-panel__container {
--cds-ai-aura-end: rgba(0, 0, 0, 0);
--cds-ai-aura-hover-background: #333333;
--cds-ai-aura-hover-end: rgba(0, 0, 0, 0);
--cds-ai-aura-hover-start: rgba(69, 137, 255, 0.4);
--cds-ai-aura-start: rgba(69, 137, 255, 0.1);
--cds-ai-border-end: rgba(166, 200, 255, 0.24);
--cds-ai-border-start: #4589ff;
Expand Down Expand Up @@ -6045,6 +6052,15 @@ button.c4p--add-select__global-filter-toggle--open {
--cds-border-tile-01: #525252;
--cds-border-tile-02: #6f6f6f;
--cds-border-tile-03: #8d8d8d;
--cds-chat-avatar-agent: #f4f4f4;
--cds-chat-avatar-bot: #4589ff;
--cds-chat-avatar-user: #f4f4f4;
--cds-chat-bubble-agent: #262626;
--cds-chat-bubble-agent-border: #525252;
--cds-chat-bubble-user: #393939;
--cds-chat-prompt-background: #161616;
--cds-chat-prompt-border-end: rgba(38, 38, 38, 0);
--cds-chat-prompt-border-start: #262626;
--cds-field-01: #262626;
--cds-field-02: #393939;
--cds-field-03: #525252;
Expand Down Expand Up @@ -8634,7 +8650,6 @@ button.c4p--add-select__global-filter-toggle--open {
}
.c4p--page-header .c4p--page-header__title-row {
--title-row-margin-top: 0.125rem; /* spacing needed in case of editable title, otherwise top of focus indicator hidden */
margin-top: var(--title-row-margin-top);
margin-bottom: 0;
transform: translateY(0.125rem);
}
Expand Down Expand Up @@ -9827,6 +9842,9 @@ button.c4p--add-select__global-filter-toggle--open {
*/
.c4p--web-terminal {
--cds-ai-aura-end: rgba(0, 0, 0, 0);
--cds-ai-aura-hover-background: #474747;
--cds-ai-aura-hover-end: rgba(0, 0, 0, 0);
--cds-ai-aura-hover-start: rgba(69, 137, 255, 0.4);
--cds-ai-aura-start: rgba(69, 137, 255, 0.1);
--cds-ai-border-end: rgba(166, 200, 255, 0.24);
--cds-ai-border-start: #4589ff;
Expand Down Expand Up @@ -9860,6 +9878,15 @@ button.c4p--add-select__global-filter-toggle--open {
--cds-border-tile-01: #6f6f6f;
--cds-border-tile-02: #8d8d8d;
--cds-border-tile-03: #a8a8a8;
--cds-chat-avatar-agent: #f4f4f4;
--cds-chat-avatar-bot: #4589ff;
--cds-chat-avatar-user: #f4f4f4;
--cds-chat-bubble-agent: #262626;
--cds-chat-bubble-agent-border: #525252;
--cds-chat-bubble-user: #393939;
--cds-chat-prompt-background: #161616;
--cds-chat-prompt-border-end: rgba(38, 38, 38, 0);
--cds-chat-prompt-border-start: #262626;
--cds-field-01: #393939;
--cds-field-02: #525252;
--cds-field-03: #6f6f6f;
Expand Down Expand Up @@ -10254,6 +10281,9 @@ button.c4p--add-select__global-filter-toggle--open {

.c4p--web-terminal__documentation-overflow {
--cds-ai-aura-end: rgba(0, 0, 0, 0);
--cds-ai-aura-hover-background: #333333;
--cds-ai-aura-hover-end: rgba(0, 0, 0, 0);
--cds-ai-aura-hover-start: rgba(69, 137, 255, 0.4);
--cds-ai-aura-start: rgba(69, 137, 255, 0.1);
--cds-ai-border-end: rgba(166, 200, 255, 0.24);
--cds-ai-border-start: #4589ff;
Expand Down Expand Up @@ -10287,6 +10317,15 @@ button.c4p--add-select__global-filter-toggle--open {
--cds-border-tile-01: #525252;
--cds-border-tile-02: #6f6f6f;
--cds-border-tile-03: #8d8d8d;
--cds-chat-avatar-agent: #f4f4f4;
--cds-chat-avatar-bot: #4589ff;
--cds-chat-avatar-user: #f4f4f4;
--cds-chat-bubble-agent: #262626;
--cds-chat-bubble-agent-border: #525252;
--cds-chat-bubble-user: #393939;
--cds-chat-prompt-background: #161616;
--cds-chat-prompt-border-end: rgba(38, 38, 38, 0);
--cds-chat-prompt-border-start: #262626;
--cds-field-01: #262626;
--cds-field-02: #393939;
--cds-field-03: #525252;
Expand Down
11 changes: 6 additions & 5 deletions packages/ibm-products-styles/src/components/Card/_card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,6 @@ $block-class: #{c4p-settings.$pkg-prefix}--card;
}

.#{$block-class} .#{c4p-settings.$carbon-prefix}--slug {
@include utilities.callout-gradient();

position: absolute;
top: $spacing-05;
right: $spacing-05;
Expand Down Expand Up @@ -173,17 +171,20 @@ $block-class: #{c4p-settings.$pkg-prefix}--card;
}

.#{$block-class}--has-slug {
@include utilities.callout-gradient();
@include utilities.callout-gradient('default', 0, 'layer');

border: 1px solid $border-tile;
border: 1px solid transparent;
box-shadow: inset 0 -80px 70px -65px $ai-inner-shadow,
0 4px 10px 2px $ai-drop-shadow;
}

.#{$block-class}__clickable.#{$block-class}--has-slug::before {
@include utilities.callout-gradient('hover');
@include utilities.callout-gradient('hover', 0, 'layer');

position: absolute;
display: block;
block-size: 100%;
box-shadow: inset 0 -80px 70px -65px $ai-inner-shadow;
content: '';
inline-size: 100%;
inset-block-start: 0;
Expand Down
19 changes: 12 additions & 7 deletions packages/ibm-products-styles/src/components/SidePanel/_side-panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ $action-set-block-class: #{c4p-settings.$pkg-prefix}--action-set;
--#{$block-class}--actions-height: #{$spacing-09};
}

&.#{$block-class}__container--slide-in,
&.#{$block-class}__container:not(:has(+ .#{$block-class}__overlay)),
&.#{$block-class}__container--has-no-overlay {
box-shadow: 0 $spacing-01 $spacing-02 $overlay;
}

.#{$block-class}__actions-container {
width: 100%;
}
Expand All @@ -110,11 +116,10 @@ $action-set-block-class: #{c4p-settings.$pkg-prefix}--action-set;
left: 0;
border-right: 1px solid $border-subtle-02;
}

&.#{$block-class}__container--slide-in,
&.#{$block-class}__container:not(:has(+ .#{$block-class}__overlay)),
&.#{$block-class}__container--has-no-overlay {
box-shadow: 0 $spacing-01 $spacing-02 $overlay;
&.#{$block-class}__container.#{$block-class}__container--has-slug {
border-color: transparent;
box-shadow: inset 0 -80px 70px -65px $ai-inner-shadow,
0 4px 10px 2px $ai-drop-shadow;
}

.#{$block-class}__header {
Expand Down Expand Up @@ -304,8 +309,8 @@ $action-set-block-class: #{c4p-settings.$pkg-prefix}--action-set;
padding-top: $spacing-03;
}

&.#{$block-class}__container--has-slug .#{$block-class}__inner-content {
@include utilities.ai-gradient('bottom');
&.#{$block-class}__container--has-slug .#{$block-class}--scrolls {
@include utilities.callout-gradient('default', 0, 'layer');
}

.#{$block-class}__inner-content.#{$block-class}__inner-content--static {
Expand Down
4 changes: 2 additions & 2 deletions packages/ibm-products/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
"@carbon/grid": "^11.21.1",
"@carbon/layout": "^11.20.1",
"@carbon/motion": "^11.16.1",
"@carbon/react": "^1.48.1",
"@carbon/themes": "^11.29.1",
"@carbon/react": "^1.49.0",
"@carbon/themes": "^11.30.0",
"@carbon/type": "^11.25.1",
"react": "^16.8.6 || ^17.0.1 || ^18.2.0",
"react-dom": "^16.8.6 || ^17.0.1 || ^18.2.0"
Expand Down
3 changes: 1 addition & 2 deletions packages/ibm-products/src/components/Card/Card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,7 @@ export let Card = forwardRef(
[`${blockClass}__productive`]: productive,
[`${blockClass}__clickable`]: clickable,
[`${blockClass}__media-left`]: mediaPosition === 'left',
[`${blockClass}--has-slug`]:
(clickable && slug === true) || typeof slug === 'object',
[`${blockClass}--has-slug`]: !!slug,
},
className
),
Expand Down
4 changes: 2 additions & 2 deletions packages/ibm-products/src/components/Card/CardHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ export let CardHeader = ({

let normalizedSlug;
if (slug) {
if (inClickableCard) {
if (inClickableCard || typeof slug === 'boolean') {
normalizedSlug = hollowSlugIcon;
} else if (typeof slug !== 'boolean') {
} else {
normalizedSlug = React.cloneElement(slug, {
size:
(label && title) || (title && titleSize === 'large') ? 'sm' : 'xs',
Expand Down