Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t
### Enhancements

- [ColorPicker] Add an inset box-shadow to make it easier to see the draggers ([#4948](https://github.com/Shopify/polaris-react/pull/4948))

- Tightened up the Navigation component UI density. ([#4874](https://github.com/Shopify/polaris-react/pull/4874))
- Updated the Navigation IA ([#4902](https://github.com/Shopify/polaris-react/pull/4902))
- Added new `duplicateRootItem` prop to a Navigation Section to support new mobile Navigation IA ([#4902](https://github.com/Shopify/polaris-react/pull/4902))
- Updated mobile behaviour of Navigation to only show one sub-section at a time ([#4902](https://github.com/Shopify/polaris-react/pull/4902))
- Remove the info icon and external link guidance from FooterHelp ([#4982](https://github.com/Shopify/polaris-react/pull/4982))

### Bug fixes

Expand Down
17 changes: 1 addition & 16 deletions src/components/FooterHelp/FooterHelp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,15 @@ $border-radius: 999px;
display: flex;
justify-content: center;
margin: spacing(loose) 0;
width: 100%;

@include page-content-when-not-fully-condensed {
margin: spacing(loose);
width: auto;
}
}

.Content {
display: inline-flex;
align-items: center;
padding: spacing(loose) spacing(loose) spacing(loose) spacing();
width: 100%;
justify-content: center;

@include page-content-when-not-fully-condensed {
margin: spacing(loose);
width: auto;
}
}

.Icon {
margin-right: spacing(tight);
}

.Text {
@include text-style-input;
}
20 changes: 2 additions & 18 deletions src/components/FooterHelp/FooterHelp.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import React from 'react';
import {InfoMinor} from '@shopify/polaris-icons';

import {classNames} from '../../utilities/css';
import {Icon, IconProps} from '../Icon';

import styles from './FooterHelp.scss';

Expand All @@ -12,21 +8,9 @@ export interface FooterHelpProps {
}

export function FooterHelp({children}: FooterHelpProps) {
const className = classNames(styles.FooterHelp);

const iconProps: IconProps = {
source: InfoMinor,
color: 'highlight',
};

return (
<div className={className}>
<div className={styles.Content}>
<div className={styles.Icon}>
<Icon {...iconProps} />
</div>
<div className={styles.Text}>{children}</div>
</div>
<div className={styles.FooterHelp}>
<div className={styles.Text}>{children}</div>
</div>
);
}
2 changes: 1 addition & 1 deletion src/components/FooterHelp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Use to direct merchants to more information related to the product or feature th
```jsx
<FooterHelp>
Learn more about{' '}
<Link external url="https://help.shopify.com/manual/orders/fulfill-orders">
<Link url="https://help.shopify.com/manual/orders/fulfill-orders">
fulfilling orders
</Link>
</FooterHelp>
Expand Down
9 changes: 0 additions & 9 deletions src/components/FooterHelp/tests/FooterHelp.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React from 'react';
import {InfoMinor} from '@shopify/polaris-icons';
import {mountWithApp} from 'tests/utilities';

import {Icon} from '../../Icon';
import {FooterHelp} from '../FooterHelp';

describe('<FooterHelp />', () => {
Expand All @@ -14,11 +12,4 @@ describe('<FooterHelp />', () => {
children,
});
});

it('renders the help icon', () => {
const footerHelp = mountWithApp(<FooterHelp>{children}</FooterHelp>);
expect(footerHelp).toContainReactComponent(Icon, {
source: InfoMinor,
});
});
});