diff --git a/.changeset/cool-dolls-lie.md b/.changeset/cool-dolls-lie.md
new file mode 100644
index 00000000000..58e4f9e15d7
--- /dev/null
+++ b/.changeset/cool-dolls-lie.md
@@ -0,0 +1,5 @@
+---
+'@shopify/polaris': minor
+---
+
+Applied semantic type styles using the `Text` component
diff --git a/.changeset/lazy-flies-relate.md b/.changeset/lazy-flies-relate.md
new file mode 100644
index 00000000000..dfbc7504105
--- /dev/null
+++ b/.changeset/lazy-flies-relate.md
@@ -0,0 +1,5 @@
+---
+'@shopify/polaris': minor
+---
+
+Added `base`,`inherit`, `disabled`, and `text-inverse` tone options for Text component
diff --git a/.changeset/long-days-wonder.md b/.changeset/long-days-wonder.md
new file mode 100644
index 00000000000..e4ae45d6121
--- /dev/null
+++ b/.changeset/long-days-wonder.md
@@ -0,0 +1,5 @@
+---
+'polaris.shopify.com': patch
+---
+
+Added page for `typography/property-disallow-list` Stylelint rule
diff --git a/.changeset/nine-cameras-suffer.md b/.changeset/nine-cameras-suffer.md
new file mode 100644
index 00000000000..29c7e7d6ab2
--- /dev/null
+++ b/.changeset/nine-cameras-suffer.md
@@ -0,0 +1,5 @@
+---
+'@shopify/stylelint-polaris': minor
+---
+
+Added warning for `font-size`, `line-height`, and `font-weight` properties. Use the `Text` component as a preferred option.
diff --git a/.changeset/plenty-shoes-remain.md b/.changeset/plenty-shoes-remain.md
new file mode 100644
index 00000000000..453259034be
--- /dev/null
+++ b/.changeset/plenty-shoes-remain.md
@@ -0,0 +1,5 @@
+---
+'@shopify/polaris': minor
+---
+
+Updated plain/monochrome Button text size to bodySm for micro
diff --git a/polaris-react/postcss-mixins/text-style-input.css b/polaris-react/postcss-mixins/text-style-input.css
index baf4dd31117..767fa7f1ca4 100644
--- a/polaris-react/postcss-mixins/text-style-input.css
+++ b/polaris-react/postcss-mixins/text-style-input.css
@@ -6,6 +6,7 @@
letter-spacing: initial;
@media (--p-breakpoints-md-up) {
- font-size: var(--p-font-size-350);
+ font-size: var(--p-font-size-325);
+ line-height: var(--p-font-line-height-500);
}
}
diff --git a/polaris-react/src/components/AccountConnection/AccountConnection.stories.tsx b/polaris-react/src/components/AccountConnection/AccountConnection.stories.tsx
index 49654bf3690..710fc297ca2 100644
--- a/polaris-react/src/components/AccountConnection/AccountConnection.stories.tsx
+++ b/polaris-react/src/components/AccountConnection/AccountConnection.stories.tsx
@@ -39,11 +39,11 @@ export function Default() {
const details = connected ? 'Account connected' : 'No account connected';
const terms = connected ? null : (
-
+
By clicking Connect, you agree to accept Sample App’s{' '}
terms and conditions. You’ll pay a
commission rate of 15% on sales made through Sample App.
-
This order was archived on March 7, 2017 at 3:12pm EDT.
+
+ This order was archived on March 7, 2017 at 3:12pm EDT.
+
);
}
@@ -31,10 +33,10 @@ export function Default() {
export function Dismissible() {
return (
{}}>
-
+
Use your finance report to get detailed information about your business.{' '}
Let us know what you think
-
Make sure you know how these changes affect your store.
+
+ Make sure you know how these changes affect your store.
+
);
}
@@ -105,11 +109,11 @@ export function Critical() {
action={{content: 'Review risk analysis'}}
tone="critical"
>
-
+
Before fulfilling this order or capturing payment, please{' '}
review the Risk Analysis and determine if this order
is fraudulent.
-
Upload your store’s logo, change colors and fonts, and more.
+
+ Upload your store’s logo, change colors and fonts, and more.
+
);
}
@@ -30,7 +32,9 @@ export function WithSecondaryAction() {
primaryAction={{content: 'Customize checkout'}}
secondaryAction={{content: 'Learn more about customizing checkout'}}
>
-
Upload your store’s logo, change colors and fonts, and more.
+
+ Upload your store’s logo, change colors and fonts, and more.
+
);
}
@@ -43,7 +47,9 @@ export function Dismissable() {
primaryAction={{content: 'Customize checkout'}}
onDismiss={() => {}}
>
-
Upload your store’s logo, change colors and fonts, and more.
+
+ Upload your store’s logo, change colors and fonts, and more.
+
);
}
@@ -62,7 +68,9 @@ export function WithCustomTitle() {
illustration="https://cdn.shopify.com/s/assets/admin/checkout/settings-customizecart-705f57c725ac05be5a34ec20c05b94298cb8afd10aac7bd9c7ad02030f48cfa0.svg"
primaryAction={{content: 'Customize checkout'}}
>
-
Upload your store’s logo, change colors and fonts, and more.
+
+ Upload your store’s logo, change colors and fonts, and more.
+
);
}
@@ -82,7 +90,9 @@ export function WithIconableActions() {
variant: 'secondary',
}}
>
-
How do you like our app?
+
+ How do you like our app?
+
);
}
diff --git a/polaris-react/src/components/CalloutCard/CalloutCard.tsx b/polaris-react/src/components/CalloutCard/CalloutCard.tsx
index c5d8dcf7926..ccac74b6f20 100644
--- a/polaris-react/src/components/CalloutCard/CalloutCard.tsx
+++ b/polaris-react/src/components/CalloutCard/CalloutCard.tsx
@@ -82,11 +82,13 @@ export function CalloutCard({
-
+
{title}
- {children}
+
+ {children}
+
{buttonMarkup}
diff --git a/polaris-react/src/components/Card/Card.stories.tsx b/polaris-react/src/components/Card/Card.stories.tsx
index 3e9dfc8d72a..0afb1491a09 100644
--- a/polaris-react/src/components/Card/Card.stories.tsx
+++ b/polaris-react/src/components/Card/Card.stories.tsx
@@ -35,7 +35,9 @@ export function Default() {
Online store dashboard
-
View a summary of your online store’s performance.
+
+ View a summary of your online store’s performance.
+
);
@@ -48,7 +50,9 @@ export function WithResponsiveBorderRadius() {
Online store dashboard
-
View a summary of your online store’s performance.
+
+ View a summary of your online store’s performance.
+
);
@@ -61,7 +65,9 @@ export function WithResponsivePadding() {
Online store dashboard
-
View a summary of your online store’s performance.
+
+ View a summary of your online store’s performance.
+
);
@@ -74,7 +80,9 @@ export function WithSubdued() {
Online store dashboard
-
View a summary of your online store’s performance.
+
+ View a summary of your online store’s performance.
+
);
diff --git a/polaris-react/src/components/CheckableButton/CheckableButton.module.css b/polaris-react/src/components/CheckableButton/CheckableButton.module.css
index 6b4260fadf1..05a51d40a66 100644
--- a/polaris-react/src/components/CheckableButton/CheckableButton.module.css
+++ b/polaris-react/src/components/CheckableButton/CheckableButton.module.css
@@ -1,9 +1,5 @@
.CheckableButton {
color: var(--p-color-text);
- font-size: var(--p-font-size-300);
- font-weight: var(--p-font-weight-medium);
- line-height: var(--p-font-line-height-400);
- letter-spacing: initial;
display: flex;
align-items: center;
gap: calc(var(--p-space-300) + var(--p-space-025));
@@ -50,6 +46,8 @@
}
.Label {
+ display: flex;
+ align-items: center;
flex: 1;
white-space: nowrap;
overflow: hidden;
@@ -58,6 +56,4 @@
/* padding to fix the bottom of letters being cutoff by overflow: hidden */
padding: var(--p-space-025) 0;
- /* stylelint-disable-next-line polaris/typography/declaration-property-unit-disallowed-list -- custom label line height */
- line-height: 18px;
}
diff --git a/polaris-react/src/components/CheckableButton/CheckableButton.tsx b/polaris-react/src/components/CheckableButton/CheckableButton.tsx
index c2080753af6..f2f46bb4fe0 100644
--- a/polaris-react/src/components/CheckableButton/CheckableButton.tsx
+++ b/polaris-react/src/components/CheckableButton/CheckableButton.tsx
@@ -1,8 +1,8 @@
import React, {useRef, useImperativeHandle, forwardRef} from 'react';
import type {CheckboxHandles} from '../../types';
-import {classNames} from '../../utilities/css';
import {Checkbox} from '../Checkbox';
+import {Text} from '../Text';
import styles from './CheckableButton.module.css';
@@ -38,10 +38,8 @@ export const CheckableButton = forwardRef(function CheckableButton(
};
});
- const className = classNames(styles.CheckableButton);
-
return (
-
+
Your mailing list lets you contact customers or visitors who
have shown an interest in your store. Reach out to them with
exclusive offers or updates about your products.
-
+
Test link
diff --git a/polaris-react/src/components/Combobox/Combobox.stories.tsx b/polaris-react/src/components/Combobox/Combobox.stories.tsx
index 4bbd0c0bb30..b885f50dab0 100644
--- a/polaris-react/src/components/Combobox/Combobox.stories.tsx
+++ b/polaris-react/src/components/Combobox/Combobox.stories.tsx
@@ -565,13 +565,13 @@ export function WithMultiSelectAndVerticalContent() {
);
return (
-
View a summary of your online store’s performance.
+
+ View a summary of your online store’s performance.
+
@@ -80,17 +82,19 @@ export function TwoColumnsWithPrimaryAndSecondaryWidths() {
-
+
Use to follow a normal section with a secondary section to create
a 2/3 + 1/3 layout on detail pages (such as individual product or
order pages). Can also be used on any page that needs to structure
a lot of content. This layout stacks the columns on small screens.
-
+
-
Add tags to your order.
+
+ Add tags to your order.
+
@@ -462,7 +466,9 @@ export function AnnotatedWithBannerAtTheTop() {
{}}>
-
This order was archived on March 7, 2017 at 3:12pm EDT.
+
+ This order was archived on March 7, 2017 at 3:12pm EDT.
+
-
View a summary of your online store’s performance.
+
+ View a summary of your online store’s performance.
+
);
}
@@ -34,10 +36,10 @@ export function Default() {
export function WithHeaderActions() {
return (
-
+
Add variants if this product comes in multiple versions, like different
sizes or colors.
-
+
Two-step authentication adds an extra layer of security when logging
in to your account. A special code will be required each time you
log in, ensuring only you can access your account.
-
+
By signing up for the Shopify service (“Service”) or any of the
services of Shopify Inc. (“Shopify”) you are agreeing to be bound by
the following terms and conditions (“Terms of Service”). The Services
@@ -35,8 +35,8 @@ export function Default() {
update and change the Terms of Service by posting updates and changes
to the Shopify website. You are advised to check the Terms of Service
from time to time for any updates or changes that may impact you.
-
-
+
+
By signing up for the Shopify service (“Service”) or any of the
services of Shopify Inc. (“Shopify”) you are agreeing to be bound by
the following terms and conditions (“Terms of Service”). The Services
@@ -50,8 +50,8 @@ export function Default() {
update and change the Terms of Service by posting updates and changes
to the Shopify website. You are advised to check the Terms of Service
from time to time for any updates or changes that may impact you.
-
-
+
+
By signing up for the Shopify service (“Service”) or any of the
services of Shopify Inc. (“Shopify”) you are agreeing to be bound by
the following terms and conditions (“Terms of Service”). The Services
@@ -65,7 +65,7 @@ export function Default() {
update and change the Terms of Service by posting updates and changes
to the Shopify website. You are advised to check the Terms of Service
from time to time for any updates or changes that may impact you.
-
+
);
@@ -79,16 +79,18 @@ export function WithHorizonalScrollPrevention() {
horizontal={false}
>
-
Last updated on: September 6, 2022
+
+ Last updated on: September 6, 2022
+
-
+
Welcome to Shopify! By signing up for a Shopify Account (as defined in
Section 1) or by using any Shopify Services (as defined below), you
are agreeing to be bound by the following terms and conditions (the “
Terms of Service”).
-
+
-
+
As used in these Terms of Service, “we”, “
us”, “our” and “
Shopify” means the applicable Shopify Contracting
@@ -97,9 +99,9 @@ export function WithHorizonalScrollPrevention() {
as an individual), or the business employing the Shopify User (if
registering for or using a Shopify Service as a business) and any of
its affiliates.
-
+
-
+
Shopify provides a complete commerce platform that enables merchants
to unify their commerce activities. Among other features, this
platform includes a range of tools for merchants to build and
@@ -118,9 +120,9 @@ export function WithHorizonalScrollPrevention() {
https://www.shopify.com/legal/terms
.
-
+
-
+
You must read, agree with and accept all of the terms and conditions
contained or expressly referenced in these Terms of Service, including
Shopify’s
@@ -147,9 +149,9 @@ export function WithHorizonalScrollPrevention() {
Rules of Engagement for Sale of COVID-19 Related Products
.
-
+
-
+
Everyday language summaries are provided for convenience only and
appear in bold near each section, but these summaries are not
@@ -159,7 +161,7 @@ export function WithHorizonalScrollPrevention() {
services, you are agreeing to these terms. Be sure to occasionally
check back for updates.
-
+
Welcome to Shopify! By signing up for a Shopify Account (as defined in
Section 1) or by using any Shopify Services (as defined below), you
are agreeing to be bound by the following terms and conditions (the “
Terms of Service”).
-
+
-
+
As used in these Terms of Service, “we”, “
us”, “our” and “
Shopify” means the applicable Shopify Contracting
@@ -193,9 +197,9 @@ export function WithGutterAndThinDragHandle() {
as an individual), or the business employing the Shopify User (if
registering for or using a Shopify Service as a business) and any of
its affiliates.
-
+
-
+
Shopify provides a complete commerce platform that enables merchants
to unify their commerce activities. Among other features, this
platform includes a range of tools for merchants to build and
@@ -214,9 +218,9 @@ export function WithGutterAndThinDragHandle() {
https://www.shopify.com/legal/terms
.
-
+
-
+
You must read, agree with and accept all of the terms and conditions
contained or expressly referenced in these Terms of Service, including
Shopify’s
@@ -243,9 +247,9 @@ export function WithGutterAndThinDragHandle() {
Rules of Engagement for Sale of COVID-19 Related Products
.
-
+
-
+
Everyday language summaries are provided for convenience only and
appear in bold near each section, but these summaries are not
@@ -255,7 +259,7 @@ export function WithGutterAndThinDragHandle() {
services, you are agreeing to these terms. Be sure to occasionally
check back for updates.
-
+
);
@@ -268,47 +272,51 @@ export function ScrollToChildComponent() {
Account Terms
-
+
You must be 18 years or older or at least the age of majority in the
jurisdiction where you reside or from which you use this Service.
-
-
+
+
To access and use the Services, you must register for a Shopify
account (“Account”) by providing your full legal name, current
address, phone number, a valid email address, and any other
information indicated as required. Shopify may reject your application
for an Account, or cancel an existing Account, for any reason, in our
sole discretion.
-
-
+
+
You acknowledge that Shopify will use the email address you provide as
the primary method for communication.
-
-
+
+
You are responsible for keeping your password secure. Shopify cannot
and will not be liable for any loss or damage from your failure to
maintain the security of your Account and password.
-
-
+
+
You are responsible for all activity and content such as photos,
images, videos, graphics, written content, audio files, code,
information, or data uploaded, collected, generated, stored,
displayed, distributed, transmitted or exhibited on or in connection
with your Account (“Materials”).
-
-
+
+
A breach or violation of any term in the Terms of Service, including
the AUP, as determined in the sole discretion of Shopify will result
in an immediate termination of your services.
-
-
Which means
-
+
+
+ Which means
+
+
You are responsible for your Account and any Materials you upload to
the Shopify Service. Remember that with any violation of these terms
we will cancel your service.
-
+
-
If we need to reach you, we will send you an email.
+
+ If we need to reach you, we will send you an email.
+
+
Subject to section 2.1.2, the person signing up for the Service will
be the contracting party (“Account Owner”) for the purposes of our
Terms of Service and will be the person who is authorized to use any
corresponding account we may provide to the Account Owner in
connection with the Service.
-
-
+
+
If you are signing up for the Service on behalf of your employer, your
employer shall be the Account Owner. If you are signing up for the
Service on behalf of your employer, then you represent and warrant
that you have the authority to bind your employer to our Terms of
Service.
-
-
2.2 PayPal Express Checkout and Shopify Payments Accounts
+
Upon completion of sign up for the Service, Shopify will create a
PayPal Express Checkout account on your behalf, using your email
address. Depending on your location, Shopify may also create a Shopify
Payments account on your behalf.
-
-
+
+
You acknowledge that PayPal Express Checkout and/or Shopify Payments
will be your default payments gateway(s) and that it is your sole
responsibility as the Account Owner to activate and maintain these
@@ -347,10 +357,12 @@ export function ScrollToChildComponent() {
active, it is your responsibility to deactivate them. For the
avoidance of doubt, PayPal Express Checkout is a Third Party Service,
as defined in Section 15 of these Terms of Service.
-
-
2.3 Apple Pay for Safari Account
+
+
+ 2.3 Apple Pay for Safari Account
+
-
+
Upon completion of sign up for the Service, Shopify will create an
Apple Pay for Safari (“Apple Pay”) account on your behalf, using the
URL(s) and business name associated with your Account. Depending on
@@ -360,13 +372,13 @@ export function ScrollToChildComponent() {
Apple Pay account active, it is your responsibility to deactivate it.
For the avoidance of doubt, Apple Pay is a Third Party Service, as
defined in Section 15 of these Terms of Service.
-
-
+
+
If you use an Apple Pay supported payment gateway and your customers
have enabled Apple Pay on their device, customers may purchase goods
and services from your store using Apple Pay.
-
-
+
+
By using Apple Pay on your store, you are agreeing to be bound by the
Apple Pay Platform Web Merchant Terms and Conditions, as they may be
amended by Apple from time to time. If Apple amends the Apple Pay
@@ -383,25 +395,27 @@ export function ScrollToChildComponent() {
any changes to the Apple Pay Platform Web Merchant Terms, de-activate
your Apple Pay account and do not continue to use Apple Pay on your
store.
-
-
2.4 Google Payment
+
+
+ 2.4 Google Payment
+
-
+
Upon completion of sign up for the Service, if you have been enrolled
in Shopify Payments, Shopify will also create a Google Payment account
on your behalf. If you do not wish to keep your Google Payment account
active, it is your responsibility to deactivate it. For the avoidance
of doubt, Google Payment is a Third Party Service, as defined in
Section 15 of these Terms of Service.
-
+
-
+
If you use a Google Payment supported payment gateway and your
customers have enabled Google Payment, customers may purchase goods
and services from your store using Google Payment.
-
+
-
+
By using Google Payment on your store, you are agreeing to be bound by
the Google Payment API Terms of Service, as they may be amended by
Google from time to time. If Google amends the Google Payment API
@@ -418,49 +432,53 @@ export function ScrollToChildComponent() {
to any changes to the Google Payment API Terms of Service, de-activate
your Google Payment account and do not continue to use Google Payment
on your store.
-
+
-
2.5 Domain Names
+
+ 2.5 Domain Names
+
-
+
Upon purchasing a domain name through Shopify, domain registration
will be preset to automatically renew each year so long as your
Shopify Account remains active. You acknowledge that it is your sole
responsibility to deactivate the auto-renewal function should you
choose to do so.
-
-
Which means
-
+
+
+ Which means
+
+
The person signing up for the Shopify Service is responsible for the
account and is bound by these Terms of Service. If you signup on
behalf of your employer, your employer owns the account and is also
bound by our Terms of Service.
-
+
-
+
We automatically create accounts for you to accept payments. You are
responsible for activating and deactivating these accounts.
-
+
-
+
Any domain you purchase through us will automatically renew unless you
opt out.
-
+
General Conditions
-
+
You must read, agree with and accept all of the terms and conditions
contained in these Terms of Service, including the AUP and the Privacy
Policy before you may become a member of Shopify.
-
+
-
+
Technical support is only provided to paying Account holders and is
only available via email.
-
-
+
+
The Terms of Service shall be governed by and interpreted in
accordance with the laws of the Province of Ontario and the laws of
Canada applicable therein, without regard to principles of conflicts
@@ -470,8 +488,8 @@ export function ScrollToChildComponent() {
the Terms of Service. The United Nations Convention on Contracts for
the International Sale of Goods will not apply to these Terms of
Service and is hereby expressly excluded.
-
-
+
+
You acknowledge and agree that Shopify may amend these Terms of
Service at any time by posting the relevant amended and restated Terms
of Service on Shopify’s website, available at
@@ -484,46 +502,46 @@ export function ScrollToChildComponent() {
agreement to, and acceptance of, the amended Terms of Service. If you
do not agree to any changes to the Terms of Service, do not continue
to use the Service.
-
-
+
+
You may not use the Shopify service for any illegal or unauthorized
purpose nor may you, in the use of the Service, violate any laws in
your jurisdiction (including but not limited to copyright laws), the
laws applicable to you in your customer’s jurisdiction, or the laws of
Canada and the Province of Ontario. You will comply with all
applicable laws, rules and regulations in your use of the Service.
-
-
+
+
You agree not to reproduce, duplicate, copy, sell, resell or exploit
any portion of the Service, use of the Service, or access to the
Service without the express written permission by Shopify.
-
-
+
+
You shall not purchase search engine or other pay per click keywords
(such as Google AdWords), or domain names that use Shopify or Shopify
trademarks and/or variations and misspellings thereof.
-
-
+
+
Questions about the Terms of Service should be sent to
support@shopify.com.
-
-
+
+
You understand that your Materials (not including credit card
information), may be transferred unencrypted and involve (a)
transmissions over various networks; and (b) changes to conform and
adapt to technical requirements of connecting networks or devices.
Credit Card information is always encrypted during transfer over
networks.
-
-
+
+
You acknowledge and agree that your use of the Service, including
information transmitted to or stored by Shopify, is governed by its
privacy policy at
https://www.shopify.com/legal/privacy
-
-
+
+
The Terms of Service may be available in languages other than English.
To the extent of any inconsistencies or conflicts between these
English Terms of Service and Shopify’s Terms of Service available in
@@ -533,22 +551,24 @@ export function ScrollToChildComponent() {
https://www.shopify.com/legal/terms
will prevail.
-
-
Which means
-
+
+
+ Which means
+
+
The Shopify service belongs to us. You are not allowed to rip it off
or use it for any illegal or sketchy purpose.
-
+
-
+
If a dispute arises the issue will be dealt with in the Province of
Ontario.
-
+
-
+
Your Materials may be transferred unencrypted and may be altered, but
credit card information is always encrypted.
-
+
By signing up for the Shopify service (“Service”) or any of the
services of Shopify Inc. (“Shopify”) you are agreeing to be bound by
the following terms and conditions (“Terms of Service”). The Services
@@ -572,8 +592,8 @@ export function WithScrollHint() {
update and change the Terms of Service by posting updates and changes
to the Shopify website. You are advised to check the Terms of Service
from time to time for any updates or changes that may impact you.
-
-
+
+
By signing up for the Shopify service (“Service”) or any of the
services of Shopify Inc. (“Shopify”) you are agreeing to be bound by
the following terms and conditions (“Terms of Service”). The Services
@@ -587,8 +607,8 @@ export function WithScrollHint() {
update and change the Terms of Service by posting updates and changes
to the Shopify website. You are advised to check the Terms of Service
from time to time for any updates or changes that may impact you.
-
-
+
+
By signing up for the Shopify service (“Service”) or any of the
services of Shopify Inc. (“Shopify”) you are agreeing to be bound by
the following terms and conditions (“Terms of Service”). The Services
@@ -602,7 +622,7 @@ export function WithScrollHint() {
update and change the Terms of Service by posting updates and changes
to the Shopify website. You are advised to check the Terms of Service
from time to time for any updates or changes that may impact you.
-
+
);
@@ -616,7 +636,7 @@ export function OnScrolledToBottom() {
style={{height: '200px'}}
onScrolledToBottom={() => console.log('scrolled to bottom')}
>
-
+
By signing up for the Shopify service (“Service”) or any of the
services of Shopify Inc. (“Shopify”) you are agreeing to be bound by
the following terms and conditions (“Terms of Service”). The Services
@@ -630,8 +650,8 @@ export function OnScrolledToBottom() {
update and change the Terms of Service by posting updates and changes
to the Shopify website. You are advised to check the Terms of Service
from time to time for any updates or changes that may impact you.
-
-
+
+
By signing up for the Shopify service (“Service”) or any of the
services of Shopify Inc. (“Shopify”) you are agreeing to be bound by
the following terms and conditions (“Terms of Service”). The Services
@@ -645,8 +665,8 @@ export function OnScrolledToBottom() {
update and change the Terms of Service by posting updates and changes
to the Shopify website. You are advised to check the Terms of Service
from time to time for any updates or changes that may impact you.
-
-
+
+
By signing up for the Shopify service (“Service”) or any of the
services of Shopify Inc. (“Shopify”) you are agreeing to be bound by
the following terms and conditions (“Terms of Service”). The Services
@@ -660,7 +680,7 @@ export function OnScrolledToBottom() {
update and change the Terms of Service by posting updates and changes
to the Shopify website. You are advised to check the Terms of Service
from time to time for any updates or changes that may impact you.
-
+
);
@@ -679,47 +699,51 @@ export function UsingScrollToFromRef() {
Account Terms
-
+
You must be 18 years or older or at least the age of majority in the
jurisdiction where you reside or from which you use this Service.
-
-
+
+
To access and use the Services, you must register for a Shopify
account (“Account”) by providing your full legal name, current
address, phone number, a valid email address, and any other
information indicated as required. Shopify may reject your application
for an Account, or cancel an existing Account, for any reason, in our
sole discretion.
-
-
+
+
You acknowledge that Shopify will use the email address you provide as
the primary method for communication.
-
-
+
+
You are responsible for keeping your password secure. Shopify cannot
and will not be liable for any loss or damage from your failure to
maintain the security of your Account and password.
-
-
+
+
You are responsible for all activity and content such as photos,
images, videos, graphics, written content, audio files, code,
information, or data uploaded, collected, generated, stored,
displayed, distributed, transmitted or exhibited on or in connection
with your Account (“Materials”).
-
-
+
+
A breach or violation of any term in the Terms of Service, including
the AUP, as determined in the sole discretion of Shopify will result
in an immediate termination of your services.
-
-
Which means
-
+
+
+ Which means
+
+
You are responsible for your Account and any Materials you upload to
the Shopify Service. Remember that with any violation of these terms
we will cancel your service.
-
+
-
If we need to reach you, we will send you an email.
+
+ If we need to reach you, we will send you an email.
+
+
Subject to section 2.1.2, the person signing up for the Service will
be the contracting party (“Account Owner”) for the purposes of our
Terms of Service and will be the person who is authorized to use any
corresponding account we may provide to the Account Owner in
connection with the Service.
-
-
+
+
If you are signing up for the Service on behalf of your employer, your
employer shall be the Account Owner. If you are signing up for the
Service on behalf of your employer, then you represent and warrant
that you have the authority to bind your employer to our Terms of
Service.
-
-
2.2 PayPal Express Checkout and Shopify Payments Accounts
+
Upon completion of sign up for the Service, Shopify will create a
PayPal Express Checkout account on your behalf, using your email
address. Depending on your location, Shopify may also create a Shopify
Payments account on your behalf.
-
-
+
+
You acknowledge that PayPal Express Checkout and/or Shopify Payments
will be your default payments gateway(s) and that it is your sole
responsibility as the Account Owner to activate and maintain these
@@ -757,10 +783,12 @@ export function UsingScrollToFromRef() {
active, it is your responsibility to deactivate them. For the
avoidance of doubt, PayPal Express Checkout is a Third Party Service,
as defined in Section 15 of these Terms of Service.
-
-
2.3 Apple Pay for Safari Account
+
+
+ 2.3 Apple Pay for Safari Account
+
-
+
Upon completion of sign up for the Service, Shopify will create an
Apple Pay for Safari (“Apple Pay”) account on your behalf, using the
URL(s) and business name associated with your Account. Depending on
@@ -770,13 +798,13 @@ export function UsingScrollToFromRef() {
Apple Pay account active, it is your responsibility to deactivate it.
For the avoidance of doubt, Apple Pay is a Third Party Service, as
defined in Section 15 of these Terms of Service.
-
-
+
+
If you use an Apple Pay supported payment gateway and your customers
have enabled Apple Pay on their device, customers may purchase goods
and services from your store using Apple Pay.
-
-
+
+
By using Apple Pay on your store, you are agreeing to be bound by the
Apple Pay Platform Web Merchant Terms and Conditions, as they may be
amended by Apple from time to time. If Apple amends the Apple Pay
@@ -793,25 +821,27 @@ export function UsingScrollToFromRef() {
any changes to the Apple Pay Platform Web Merchant Terms, de-activate
your Apple Pay account and do not continue to use Apple Pay on your
store.
-
-
2.4 Google Payment
+
+
+ 2.4 Google Payment
+
-
+
Upon completion of sign up for the Service, if you have been enrolled
in Shopify Payments, Shopify will also create a Google Payment account
on your behalf. If you do not wish to keep your Google Payment account
active, it is your responsibility to deactivate it. For the avoidance
of doubt, Google Payment is a Third Party Service, as defined in
Section 15 of these Terms of Service.
-
+
-
+
If you use a Google Payment supported payment gateway and your
customers have enabled Google Payment, customers may purchase goods
and services from your store using Google Payment.
-
+
-
+
By using Google Payment on your store, you are agreeing to be bound by
the Google Payment API Terms of Service, as they may be amended by
Google from time to time. If Google amends the Google Payment API
@@ -828,49 +858,53 @@ export function UsingScrollToFromRef() {
to any changes to the Google Payment API Terms of Service, de-activate
your Google Payment account and do not continue to use Google Payment
on your store.
-
+
-
2.5 Domain Names
+
+ 2.5 Domain Names
+
-
+
Upon purchasing a domain name through Shopify, domain registration
will be preset to automatically renew each year so long as your
Shopify Account remains active. You acknowledge that it is your sole
responsibility to deactivate the auto-renewal function should you
choose to do so.
-
-
Which means
-
+
+
+ Which means
+
+
The person signing up for the Shopify Service is responsible for the
account and is bound by these Terms of Service. If you signup on
behalf of your employer, your employer owns the account and is also
bound by our Terms of Service.
-
+
-
+
We automatically create accounts for you to accept payments. You are
responsible for activating and deactivating these accounts.
-
+
-
+
Any domain you purchase through us will automatically renew unless you
opt out.
-
+
General Conditions
-
+
You must read, agree with and accept all of the terms and conditions
contained in these Terms of Service, including the AUP and the Privacy
Policy before you may become a member of Shopify.
-
+
-
+
Technical support is only provided to paying Account holders and is
only available via email.
-
-
+
+
The Terms of Service shall be governed by and interpreted in
accordance with the laws of the Province of Ontario and the laws of
Canada applicable therein, without regard to principles of conflicts
@@ -880,8 +914,8 @@ export function UsingScrollToFromRef() {
the Terms of Service. The United Nations Convention on Contracts for
the International Sale of Goods will not apply to these Terms of
Service and is hereby expressly excluded.
-
-
+
+
You acknowledge and agree that Shopify may amend these Terms of
Service at any time by posting the relevant amended and restated Terms
of Service on Shopify’s website, available at
@@ -894,46 +928,46 @@ export function UsingScrollToFromRef() {
agreement to, and acceptance of, the amended Terms of Service. If you
do not agree to any changes to the Terms of Service, do not continue
to use the Service.
-
-
+
+
You may not use the Shopify service for any illegal or unauthorized
purpose nor may you, in the use of the Service, violate any laws in
your jurisdiction (including but not limited to copyright laws), the
laws applicable to you in your customer’s jurisdiction, or the laws of
Canada and the Province of Ontario. You will comply with all
applicable laws, rules and regulations in your use of the Service.
-
-
+
+
You agree not to reproduce, duplicate, copy, sell, resell or exploit
any portion of the Service, use of the Service, or access to the
Service without the express written permission by Shopify.
-
-
+
+
You shall not purchase search engine or other pay per click keywords
(such as Google AdWords), or domain names that use Shopify or Shopify
trademarks and/or variations and misspellings thereof.
-
-
+
+
Questions about the Terms of Service should be sent to
support@shopify.com.
-
-
+
+
You understand that your Materials (not including credit card
information), may be transferred unencrypted and involve (a)
transmissions over various networks; and (b) changes to conform and
adapt to technical requirements of connecting networks or devices.
Credit Card information is always encrypted during transfer over
networks.
-
-
+
+
You acknowledge and agree that your use of the Service, including
information transmitted to or stored by Shopify, is governed by its
privacy policy at
https://www.shopify.com/legal/privacy
-
-
+
+
The Terms of Service may be available in languages other than English.
To the extent of any inconsistencies or conflicts between these
English Terms of Service and Shopify’s Terms of Service available in
@@ -943,22 +977,24 @@ export function UsingScrollToFromRef() {
https://www.shopify.com/legal/terms
will prevail.
-
-
Which means
-
+
+
+ Which means
+
+
The Shopify service belongs to us. You are not allowed to rip it off
or use it for any illegal or sketchy purpose.
-
+
-
+
If a dispute arises the issue will be dealt with in the Province of
Ontario.
-
+
-
+
Your Materials may be transferred unencrypted and may be altered, but
credit card information is always encrypted.
-
+
@@ -978,47 +1014,51 @@ export function UsingInstantScrollToFromRef() {
Account Terms
-
+
You must be 18 years or older or at least the age of majority in the
jurisdiction where you reside or from which you use this Service.
-
-
+
+
To access and use the Services, you must register for a Shopify
account (“Account”) by providing your full legal name, current
address, phone number, a valid email address, and any other
information indicated as required. Shopify may reject your application
for an Account, or cancel an existing Account, for any reason, in our
sole discretion.
-
-
+
+
You acknowledge that Shopify will use the email address you provide as
the primary method for communication.
-
-
+
+
You are responsible for keeping your password secure. Shopify cannot
and will not be liable for any loss or damage from your failure to
maintain the security of your Account and password.
-
-
+
+
You are responsible for all activity and content such as photos,
images, videos, graphics, written content, audio files, code,
information, or data uploaded, collected, generated, stored,
displayed, distributed, transmitted or exhibited on or in connection
with your Account (“Materials”).
-
-
+
+
A breach or violation of any term in the Terms of Service, including
the AUP, as determined in the sole discretion of Shopify will result
in an immediate termination of your services.
-
-
Which means
-
+
+
+ Which means
+
+
You are responsible for your Account and any Materials you upload to
the Shopify Service. Remember that with any violation of these terms
we will cancel your service.
-
+
-
If we need to reach you, we will send you an email.
+
+ If we need to reach you, we will send you an email.
+
+
Subject to section 2.1.2, the person signing up for the Service will
be the contracting party (“Account Owner”) for the purposes of our
Terms of Service and will be the person who is authorized to use any
corresponding account we may provide to the Account Owner in
connection with the Service.
-
-
+
+
If you are signing up for the Service on behalf of your employer, your
employer shall be the Account Owner. If you are signing up for the
Service on behalf of your employer, then you represent and warrant
that you have the authority to bind your employer to our Terms of
Service.
-
-
2.2 PayPal Express Checkout and Shopify Payments Accounts
+
Upon completion of sign up for the Service, Shopify will create a
PayPal Express Checkout account on your behalf, using your email
address. Depending on your location, Shopify may also create a Shopify
Payments account on your behalf.
-
-
+
+
You acknowledge that PayPal Express Checkout and/or Shopify Payments
will be your default payments gateway(s) and that it is your sole
responsibility as the Account Owner to activate and maintain these
@@ -1056,10 +1098,12 @@ export function UsingInstantScrollToFromRef() {
active, it is your responsibility to deactivate them. For the
avoidance of doubt, PayPal Express Checkout is a Third Party Service,
as defined in Section 15 of these Terms of Service.
-
-
2.3 Apple Pay for Safari Account
+
+
+ 2.3 Apple Pay for Safari Account
+
-
+
Upon completion of sign up for the Service, Shopify will create an
Apple Pay for Safari (“Apple Pay”) account on your behalf, using the
URL(s) and business name associated with your Account. Depending on
@@ -1069,13 +1113,13 @@ export function UsingInstantScrollToFromRef() {
Apple Pay account active, it is your responsibility to deactivate it.
For the avoidance of doubt, Apple Pay is a Third Party Service, as
defined in Section 15 of these Terms of Service.
-
-
+
+
If you use an Apple Pay supported payment gateway and your customers
have enabled Apple Pay on their device, customers may purchase goods
and services from your store using Apple Pay.
-
-
+
+
By using Apple Pay on your store, you are agreeing to be bound by the
Apple Pay Platform Web Merchant Terms and Conditions, as they may be
amended by Apple from time to time. If Apple amends the Apple Pay
@@ -1092,25 +1136,27 @@ export function UsingInstantScrollToFromRef() {
any changes to the Apple Pay Platform Web Merchant Terms, de-activate
your Apple Pay account and do not continue to use Apple Pay on your
store.
-
-
2.4 Google Payment
+
+
+ 2.4 Google Payment
+
-
+
Upon completion of sign up for the Service, if you have been enrolled
in Shopify Payments, Shopify will also create a Google Payment account
on your behalf. If you do not wish to keep your Google Payment account
active, it is your responsibility to deactivate it. For the avoidance
of doubt, Google Payment is a Third Party Service, as defined in
Section 15 of these Terms of Service.
-
+
-
+
If you use a Google Payment supported payment gateway and your
customers have enabled Google Payment, customers may purchase goods
and services from your store using Google Payment.
-
+
-
+
By using Google Payment on your store, you are agreeing to be bound by
the Google Payment API Terms of Service, as they may be amended by
Google from time to time. If Google amends the Google Payment API
@@ -1127,49 +1173,53 @@ export function UsingInstantScrollToFromRef() {
to any changes to the Google Payment API Terms of Service, de-activate
your Google Payment account and do not continue to use Google Payment
on your store.
-
+
-
2.5 Domain Names
+
+ 2.5 Domain Names
+
-
+
Upon purchasing a domain name through Shopify, domain registration
will be preset to automatically renew each year so long as your
Shopify Account remains active. You acknowledge that it is your sole
responsibility to deactivate the auto-renewal function should you
choose to do so.
-
-
Which means
-
+
+
+ Which means
+
+
The person signing up for the Shopify Service is responsible for the
account and is bound by these Terms of Service. If you signup on
behalf of your employer, your employer owns the account and is also
bound by our Terms of Service.
-
+
-
+
We automatically create accounts for you to accept payments. You are
responsible for activating and deactivating these accounts.
-
+
-
+
Any domain you purchase through us will automatically renew unless you
opt out.
-
+
General Conditions
-
+
You must read, agree with and accept all of the terms and conditions
contained in these Terms of Service, including the AUP and the Privacy
Policy before you may become a member of Shopify.
-
+
-
+
Technical support is only provided to paying Account holders and is
only available via email.
-
-
+
+
The Terms of Service shall be governed by and interpreted in
accordance with the laws of the Province of Ontario and the laws of
Canada applicable therein, without regard to principles of conflicts
@@ -1179,8 +1229,8 @@ export function UsingInstantScrollToFromRef() {
the Terms of Service. The United Nations Convention on Contracts for
the International Sale of Goods will not apply to these Terms of
Service and is hereby expressly excluded.
-
-
+
+
You acknowledge and agree that Shopify may amend these Terms of
Service at any time by posting the relevant amended and restated Terms
of Service on Shopify’s website, available at
@@ -1193,46 +1243,46 @@ export function UsingInstantScrollToFromRef() {
agreement to, and acceptance of, the amended Terms of Service. If you
do not agree to any changes to the Terms of Service, do not continue
to use the Service.
-
-
+
+
You may not use the Shopify service for any illegal or unauthorized
purpose nor may you, in the use of the Service, violate any laws in
your jurisdiction (including but not limited to copyright laws), the
laws applicable to you in your customer’s jurisdiction, or the laws of
Canada and the Province of Ontario. You will comply with all
applicable laws, rules and regulations in your use of the Service.
-
-
+
+
You agree not to reproduce, duplicate, copy, sell, resell or exploit
any portion of the Service, use of the Service, or access to the
Service without the express written permission by Shopify.
-
-
+
+
You shall not purchase search engine or other pay per click keywords
(such as Google AdWords), or domain names that use Shopify or Shopify
trademarks and/or variations and misspellings thereof.
-
-
+
+
Questions about the Terms of Service should be sent to
support@shopify.com.
-
-
+
+
You understand that your Materials (not including credit card
information), may be transferred unencrypted and involve (a)
transmissions over various networks; and (b) changes to conform and
adapt to technical requirements of connecting networks or devices.
Credit Card information is always encrypted during transfer over
networks.
-
-
+
+
You acknowledge and agree that your use of the Service, including
information transmitted to or stored by Shopify, is governed by its
privacy policy at
https://www.shopify.com/legal/privacy
-
-
+
+
The Terms of Service may be available in languages other than English.
To the extent of any inconsistencies or conflicts between these
English Terms of Service and Shopify’s Terms of Service available in
@@ -1242,22 +1292,24 @@ export function UsingInstantScrollToFromRef() {
https://www.shopify.com/legal/terms
will prevail.
-
-
Which means
-
+
+
+ Which means
+
+
The Shopify service belongs to us. You are not allowed to rip it off
or use it for any illegal or sketchy purpose.
-
+
-
+
If a dispute arises the issue will be dealt with in the Province of
Ontario.
-
+
-
+
Your Materials may be transferred unencrypted and may be altered, but
credit card information is always encrypted.
-
+
Welcome to Shopify! By signing up for a Shopify Account (as
defined in Section 1) or by using any Shopify Services (as defined
below), you are agreeing to be bound by the following terms and
conditions (the “Terms of Service”).
-
+
-
+
As used in these Terms of Service, “we”, “
us”, “our” and “
Shopify” means the applicable Shopify Contracting
@@ -1304,7 +1358,7 @@ export function WithShadowOverComplexChildren() {
Service as an individual), or the business employing the Shopify
User (if registering for or using a Shopify Service as a business)
and any of its affiliates.
-
+
@@ -1325,7 +1379,7 @@ export function WithShadowOverComplexChildren() {
-
+
Shopify provides a complete commerce platform that enables merchants
to unify their commerce activities. Among other features, this
platform includes a range of tools for merchants to build and
@@ -1344,8 +1398,8 @@ export function WithShadowOverComplexChildren() {
https://www.shopify.com/legal/terms
.
-
-
+
+
You must read, agree with and accept all of the terms and conditions
contained or expressly referenced in these Terms of Service,
including Shopify’s
@@ -1374,9 +1428,9 @@ export function WithShadowOverComplexChildren() {
Rules of Engagement for Sale of COVID-19 Related Products
.
-
+
-
+
Everyday language summaries are provided for convenience only and
appear in bold near each section, but these summaries are not
@@ -1386,7 +1440,7 @@ export function WithShadowOverComplexChildren() {
Shopify services, you are agreeing to these terms. Be sure to
occasionally check back for updates.
-
+
diff --git a/polaris-react/src/components/Select/Select.module.css b/polaris-react/src/components/Select/Select.module.css
index e78e45571d6..d0dfd1ffe97 100644
--- a/polaris-react/src/components/Select/Select.module.css
+++ b/polaris-react/src/components/Select/Select.module.css
@@ -68,22 +68,6 @@
min-height: var(--pg-control-height);
padding: var(--p-space-150) var(--p-space-200) var(--p-space-150)
var(--p-space-300);
-
- font-size: var(--p-font-size-400);
- line-height: var(--p-font-line-height-600);
-
- @media (--p-breakpoints-md-up) {
- line-height: var(--p-font-line-height-500);
- font-size: var(--p-font-size-325);
- }
-
- @media (--p-breakpoints-md-down) {
- /* stylelint-disable-next-line selector-max-combinators, selector-max-type -- generated by polaris-migrator DO NOT COPY */
- div > span {
- font-size: var(--p-font-size-400);
- line-height: var(--p-font-line-height-500);
- }
- }
}
.SelectedOption {
@@ -105,10 +89,10 @@
/* Even though the input is invisible, text styles apply to the options menu */
font-size: var(--p-font-size-400);
font-weight: var(--p-font-weight-regular);
+ line-height: var(--p-font-line-height-600);
/* Safari requires the font-family to be added to the