From 411cf409f3c9baffa4ef652033a9273fcc8e96bb Mon Sep 17 00:00:00 2001 From: Chris Mack Date: Thu, 29 Aug 2019 11:28:39 -0400 Subject: [PATCH 1/4] Update images for basic and plain buttons --- src/components/Button/README.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/components/Button/README.md b/src/components/Button/README.md index 86a6924dcee..ea0cbb27941 100644 --- a/src/components/Button/README.md +++ b/src/components/Button/README.md @@ -147,6 +147,18 @@ Use for actions that will delete merchant data or be otherwise difficult to reco ``` + + +![Destructive plain button for Android](/public_images/components/Button/android/plain-destructive@2x.png) + + + + + +![Destructive plain button for iOS](/public_images/components/Button/ios/plain-destructive@2x.png) + + + ### Primary button Use to highlight the most important actions in any experience. Don’t use more than one primary button in a section or screen to avoid overwhelming merchants. @@ -177,13 +189,13 @@ Use when the action will delete merchant data or be otherwise difficult to recov -![Destrutive plain and destructive basic button for Android](/public_images/components/Button/android/destructive@2x.png) +![Destructive basic button for Android](/public_images/components/Button/android/basic-destructive@2x.png) -![Destrutive plain and destructive basic button for iOS](/public_images/components/Button/ios/destructive@2x.png) +![Destructive basic button for iOS](/public_images/components/Button/ios/basic-destructive@2x.png) From e473fd54094fc94de31857fcd60eec7f6851d572 Mon Sep 17 00:00:00 2001 From: Chris Mack Date: Thu, 29 Aug 2019 11:29:18 -0400 Subject: [PATCH 2/4] Remove right-aligned textfield from mobile sections --- UNRELEASED.md | 3 +++ src/components/TextField/README.md | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/UNRELEASED.md b/UNRELEASED.md index e22a6ef38fa..f34f20cb3f0 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -16,6 +16,9 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f ### Documentation +- Added Android/iOS images for Plain destructive button ([#1881](https://github.com/Shopify/polaris-react/pull/2081)) +- Remove mobile mention from right-aligned text component guidelines ([#1881](https://github.com/Shopify/polaris-react/pull/2081)) + ### Development workflow ### Dependency upgrades diff --git a/src/components/TextField/README.md b/src/components/TextField/README.md index 48964fef7ca..223c4a78174 100644 --- a/src/components/TextField/README.md +++ b/src/components/TextField/README.md @@ -373,6 +373,8 @@ class LabelActionExample extends React.Component { } ``` + + ### TextField with right aligned text Use when input text should be aligned right. @@ -404,6 +406,8 @@ class RightAlignExample extends React.Component { } ``` + + ### Text field with placeholder text Use to provide a short, non-essential hint about the expected input. Placeholder text is low-contrast, so don’t rely on it for important information. From 1c041b3f7cbd99c9895814da4b10f705b9f3113e Mon Sep 17 00:00:00 2001 From: Kaelig Deloumeau-Prigent Date: Fri, 6 Sep 2019 13:04:11 -0700 Subject: [PATCH 3/4] Restrict example to be web-only --- src/components/TextField/README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/TextField/README.md b/src/components/TextField/README.md index 223c4a78174..6160267d14c 100644 --- a/src/components/TextField/README.md +++ b/src/components/TextField/README.md @@ -373,10 +373,10 @@ class LabelActionExample extends React.Component { } ``` - - ### TextField with right aligned text + + Use when input text should be aligned right. ```jsx @@ -406,8 +406,6 @@ class RightAlignExample extends React.Component { } ``` - - ### Text field with placeholder text Use to provide a short, non-essential hint about the expected input. Placeholder text is low-contrast, so don’t rely on it for important information. From 8cab88fde93ad30a4bab5075a4c7feb9d6675011 Mon Sep 17 00:00:00 2001 From: Kaelig Deloumeau-Prigent Date: Fri, 6 Sep 2019 13:05:11 -0700 Subject: [PATCH 4/4] Update UNRELEASED.md --- UNRELEASED.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UNRELEASED.md b/UNRELEASED.md index f34f20cb3f0..cf4814e7cca 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -16,8 +16,8 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f ### Documentation -- Added Android/iOS images for Plain destructive button ([#1881](https://github.com/Shopify/polaris-react/pull/2081)) -- Remove mobile mention from right-aligned text component guidelines ([#1881](https://github.com/Shopify/polaris-react/pull/2081)) +- Added Android/iOS images for Plain destructive button ([#2081](https://github.com/Shopify/polaris-react/pull/2081)) +- Removed mobile mention from right-aligned text component guidelines ([#2081](https://github.com/Shopify/polaris-react/pull/2081)) ### Development workflow