Skip to content

[ContextualSaveBar] Update icon from CircleAlertMajor to RiskMajor #11062

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

Merged
merged 3 commits into from
Oct 30, 2023
Merged

[ContextualSaveBar] Update icon from CircleAlertMajor to RiskMajor #11062

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
3fcce4c
[ContextualSaveBar] Update icon from CircleAlertMajor to RiskMajor
chloerice Oct 30, 2023
9e4e272
[ContextualSaveBar] Update logo to Shopify's
chloerice Oct 30, 2023
accfd8e
change log
chloerice Oct 30, 2023
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
5 changes: 5 additions & 0 deletions .changeset/hip-houses-accept.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/polaris': patch
---

Updated `ContextualSaveBar` icon to `RiskMajor` and updated logos in examples to Shopify logo
12 changes: 6 additions & 6 deletions polaris-react/src/components/ContextualSaveBar/ContextualSaveBar.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ export function Default() {
<div style={{height: '250px'}}>
<Frame
logo={{
width: 124,
width: 86,
contextualSaveBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-gray.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
}}
>
<ContextualSaveBar
Expand All @@ -38,9 +38,9 @@ export function WithFlushContents() {
<div style={{height: '250px'}}>
<Frame
logo={{
width: 124,
width: 86,
contextualSaveBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-gray.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
}}
>
<ContextualSaveBar
Expand All @@ -63,9 +63,9 @@ export function WithFullWidth() {
<div style={{height: '250px'}}>
<Frame
logo={{
width: 124,
width: 86,
contextualSaveBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-gray.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
}}
>
<ContextualSaveBar
Expand Down
27 changes: 12 additions & 15 deletions polaris-react/src/components/Frame/Frame.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,13 +312,12 @@ function InAnApplicationComponent() {
);

const logo = {
width: 124,
width: 86,
topBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-color.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
contextualSaveBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-gray.svg?6215648040070010999',
url: '#',
accessibilityLabel: 'Jaded Pixel',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
accessibilityLabel: 'Shopify',
};

return (
Expand Down Expand Up @@ -655,13 +654,12 @@ function WithAnOffsetComponent() {
);

const logo = {
width: 124,
width: 86,
topBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-color.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
contextualSaveBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-gray.svg?6215648040070010999',
url: '#',
accessibilityLabel: 'Jaded Pixel',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
accessibilityLabel: 'Shopify',
};

return (
Expand Down Expand Up @@ -1013,13 +1011,12 @@ function WithSidebarEnabled() {
);

const logo = {
width: 124,
width: 86,
topBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-color.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
contextualSaveBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-gray.svg?6215648040070010999',
url: '#',
accessibilityLabel: 'Jaded Pixel',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
accessibilityLabel: 'Shopify',
};

return (
Expand Down
4 changes: 2 additions & 2 deletions polaris-react/src/components/Frame/components/ContextualSaveBar/ContextualSaveBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {useCallback} from 'react';
import {CircleAlertMajor} from '@shopify/polaris-icons';
import {RiskMajor} from '@shopify/polaris-icons';

import {Button} from '../../../Button';
import {Image} from '../../../Image';
Expand Down Expand Up @@ -126,7 +126,7 @@ export function ContextualSaveBar({
{logoMarkup}
<div className={contentsClassName}>
<div className={styles.MessageContainer}>
<Icon source={CircleAlertMajor} />
<Icon source={RiskMajor} />
{message && (
<Text as="h2" variant="headingMd" tone="text-inverse" truncate>
{message}
Expand Down
6 changes: 3 additions & 3 deletions polaris-react/src/components/TopBar/TopBar.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ function TopBarWrapper({
}, []);

const logo = {
width: 92,
width: 86,
topBarSource:
'https://cdn.shopify.com/shopifycloud/brochure/assets/brand-assets/shopify-logo-monotone-white-7edf88561b256e005e9b9d003c283c39dcbd74ec844dfc9a3912edeec39b4d7e.svg',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
url: '#',
accessibilityLabel: 'Hem Canada',
accessibilityLabel: 'Shopify',
};

const userMenuMarkup = (
Expand Down
4 changes: 2 additions & 2 deletions polaris.shopify.com/pages/examples/contextual-save-bar-default.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ function Example() {
<div style={{height: '250px'}}>
<Frame
logo={{
width: 124,
width: 86,
contextualSaveBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-gray.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
}}
>
<ContextualSaveBar
Expand Down
4 changes: 2 additions & 2 deletions polaris.shopify.com/pages/examples/contextual-save-bar-with-flush-contents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ function Example() {
<div style={{height: '250px'}}>
<Frame
logo={{
width: 124,
width: 86,
contextualSaveBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-gray.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
}}
>
<ContextualSaveBar
Expand Down
4 changes: 2 additions & 2 deletions polaris.shopify.com/pages/examples/contextual-save-bar-with-full-width.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ function Example() {
<div style={{height: '250px'}}>
<Frame
logo={{
width: 124,
width: 86,
contextualSaveBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-gray.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
}}
>
<ContextualSaveBar
Expand Down
9 changes: 4 additions & 5 deletions polaris.shopify.com/pages/examples/frame-in-an-application.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,13 +292,12 @@ function FrameExample() {
);

const logo = {
width: 124,
width: 86,
topBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-color.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
contextualSaveBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-gray.svg?6215648040070010999',
url: '#',
accessibilityLabel: 'Jaded Pixel',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
accessibilityLabel: 'Shopify',
};

return (
Expand Down
9 changes: 4 additions & 5 deletions polaris.shopify.com/pages/examples/frame-with-an-offset.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,13 +292,12 @@ function FrameExample() {
);

const logo = {
width: 124,
width: 86,
topBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-color.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
contextualSaveBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-gray.svg?6215648040070010999',
url: '#',
accessibilityLabel: 'Jaded Pixel',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
accessibilityLabel: 'Shopify',
};

return (
Expand Down
7 changes: 3 additions & 4 deletions polaris.shopify.com/pages/examples/top-bar-default.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,12 @@ function TopBarExample() {
const handleNavigationToggle = useCallback(() => {
console.log('toggle navigation visibility');
}, []);

const logo = {
width: 124,
topBarSource:
'https://cdn.shopify.com/s/files/1/0446/6937/files/jaded-pixel-logo-color.svg?6215648040070010999',
'https://cdn.shopify.com/s/files/1/2376/3301/files/Shopify_Secondary_Inverted.png',
width: 86,
url: '#',
accessibilityLabel: 'Jaded Pixel',
accessibilityLabel: 'Shopify',
};

const userMenuMarkup = (
Expand Down