Skip to content

Handle RTL in modals #2864

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
chrisgarrity merged 3 commits into from
Aug 16, 2018
Merged

Handle RTL in modals #2864

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
72a6fac
Handle RTL in modals
chrisgarrity Aug 13, 2018
86c51bc
Mirror the unsupported browser image
chrisgarrity Aug 16, 2018
8796651
provide default mapDispatchToProps
chrisgarrity Aug 16, 2018
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
4 changes: 4 additions & 0 deletions src/components/browser-modal/browser-modal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
background-size: cover;
}

[dir="rtl"] .illustration {
transform: scaleX(-1);
}

.body {
background: $ui-white;
padding: 1.5rem 2.25rem;
Expand Down
95 changes: 49 additions & 46 deletions src/components/browser-modal/browser-modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,62 +22,65 @@ const BrowserModal = ({intl, ...props}) => (
overlayClassName={styles.modalOverlay}
onRequestClose={props.onBack}
>
<Box className={styles.illustration} />
<div dir={props.isRtl ? 'rtl' : 'ltr'} >
<Box className={styles.illustration} />

<Box className={styles.body}>
<h2>
<FormattedMessage {...messages.label} />
</h2>
<p>
{ /* eslint-disable max-len */ }
<FormattedMessage
defaultMessage="We're very sorry, but Scratch 3.0 does not support Internet Explorer, Vivaldi, Opera or Silk. We recommend trying a newer browser such as Google Chrome, Mozilla Firefox, or Microsoft Edge."
description="Unsupported browser description"
id="gui.unsupportedBrowser.description"
/>
{ /* eslint-enable max-len */ }
</p>

<Box className={styles.buttonRow}>
<button
className={styles.backButton}
onClick={props.onBack}
>
<Box className={styles.body}>
<h2>
<FormattedMessage {...messages.label} />
</h2>
<p>
{ /* eslint-disable max-len */ }
<FormattedMessage
defaultMessage="Back"
description="Button to go back in unsupported browser modal"
id="gui.unsupportedBrowser.back"
defaultMessage="We're very sorry, but Scratch 3.0 does not support Internet Explorer, Vivaldi, Opera or Silk. We recommend trying a newer browser such as Google Chrome, Mozilla Firefox, or Microsoft Edge."
description="Unsupported browser description"
id="gui.unsupportedBrowser.description"
/>
</button>
{ /* eslint-enable max-len */ }
</p>

<Box className={styles.buttonRow}>
<button
className={styles.backButton}
onClick={props.onBack}
>
<FormattedMessage
defaultMessage="Back"
description="Button to go back in unsupported browser modal"
id="gui.unsupportedBrowser.back"
/>
</button>

</Box>
<div className={styles.faqLinkText}>
<FormattedMessage
defaultMessage="To learn more, go to the {previewFaqLink}."
description="Invitation to try 3.0 preview"
id="gui.unsupportedBrowser.previewfaq"
values={{
previewFaqLink: (
<a
className={styles.faqLink}
href="//scratch.mit.edu/3faq"
>
<FormattedMessage
defaultMessage="FAQ"
description="link to Scratch 3.0 FAQ page"
id="gui.unsupportedBrowser.previewfaqlinktext"
/>
</a>
)
}}
/>
</div>
</Box>
<div className={styles.faqLinkText}>
<FormattedMessage
defaultMessage="To learn more, go to the {previewFaqLink}."
description="Invitation to try 3.0 preview"
id="gui.unsupportedBrowser.previewfaq"
values={{
previewFaqLink: (
<a
className={styles.faqLink}
href="//scratch.mit.edu/3faq"
>
<FormattedMessage
defaultMessage="FAQ"
description="link to Scratch 3.0 FAQ page"
id="gui.unsupportedBrowser.previewfaqlinktext"
/>
</a>
)
}}
/>
</div>
</Box>
</div>
</ReactModal>
);

BrowserModal.propTypes = {
intl: intlShape.isRequired,
isRtl: PropTypes.bool,
onBack: PropTypes.func.isRequired
};

Expand Down
2 changes: 1 addition & 1 deletion src/components/gui/gui.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const GUIComponent = props => {
<ImportModal />
) : null}
{isRendererSupported ? null : (
<WebGlModal />
<WebGlModal isRtl={isRtl} />
)}
{tipsLibraryVisible ? (
<TipsLibrary />
Expand Down
4 changes: 4 additions & 0 deletions src/components/import-modal/import-modal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ $sides: 20rem;
justify-content: flex-start;
}

[dir="rtl"] .header-item-close img {
transform: scaleX(-1);
}

.body {
background: $ui-white;
padding: 1.5rem 2.25rem;
Expand Down
192 changes: 97 additions & 95 deletions src/components/import-modal/import-modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,110 +42,112 @@ const ImportModal = ({intl, ...props}) => (
overlayClassName={styles.modalOverlay}
onRequestClose={props.onCancel}
>
<Box>
<div className={styles.header}>
<div
className={classNames(
styles.headerItem,
styles.headerItemClose
)}
>
<CloseButton
buttonType="back"
size={CloseButton.SIZE_LARGE}
onClick={props.onGoBack}
/>
</div>
<div
className={classNames(
styles.headerItem,
styles.headerItemTitle
)}
>
<h2>
{intl.formatMessage({...messages.title})}
</h2>
</div>
<div className={classNames(styles.headerItem, styles.headerItemFilter)}>
{null}
<div dir={props.isRtl ? 'rtl' : 'ltr'} >
<Box>
<div className={styles.header}>
<div
className={classNames(
styles.headerItem,
styles.headerItemClose
)}
>
<CloseButton
buttonType="back"
size={CloseButton.SIZE_LARGE}
onClick={props.onGoBack}
/>
</div>
<div
className={classNames(
styles.headerItem,
styles.headerItemTitle
)}
>
<h2>
{intl.formatMessage({...messages.title})}
</h2>
</div>
<div className={classNames(styles.headerItem, styles.headerItemFilter)}>
{null}
</div>
</div>
</div>
</Box>
</Box>

<Box className={styles.body}>
<p>
{intl.formatMessage({...messages.formDescription})}
</p>
<Box
className={classNames(styles.inputRow,
(props.hasValidationError ? styles.badInputContainer : styles.okInputContainer))
}
>
<input
autoFocus
placeholder={props.placeholder}
value={props.inputValue}
onChange={props.onChange}
onKeyPress={props.onKeyPress}
/>
<button
className={styles.okButton}
title={intl.formatMessage({
defaultMessage: 'View Project',
description: 'Tooltip for View button',
id: 'gui.importModal.viewprojecttooltip'
})}
onClick={props.onViewProject}
<Box className={styles.body}>
<p>
{intl.formatMessage({...messages.formDescription})}
</p>
<Box
className={classNames(styles.inputRow,
(props.hasValidationError ? styles.badInputContainer : styles.okInputContainer))
}
>
<FormattedMessage
defaultMessage="View"
description="Label for button to load a scratch 2.0 project"
id="gui.importModal.viewproject"
<input
autoFocus
placeholder={props.placeholder}
value={props.inputValue}
onChange={props.onChange}
onKeyPress={props.onKeyPress}
/>
</button>
</Box>
{props.hasValidationError ?
<Box className={styles.errorRow}>
<p>
<button
className={styles.okButton}
title={intl.formatMessage({
defaultMessage: 'View Project',
description: 'Tooltip for View button',
id: 'gui.importModal.viewprojecttooltip'
})}
onClick={props.onViewProject}
>
<FormattedMessage
{...messages[`${props.errorMessage}`]}
defaultMessage="View"
description="Label for button to load a scratch 2.0 project"
id="gui.importModal.viewproject"
/>
</p>
</Box> : null
}
<Box className={styles.buttonRow}>
<button
onClick={props.onGoBack}
>
</button>
</Box>
{props.hasValidationError ?
<Box className={styles.errorRow}>
<p>
<FormattedMessage
{...messages[`${props.errorMessage}`]}
/>
</p>
</Box> : null
}
<Box className={styles.buttonRow}>
<button
onClick={props.onGoBack}
>
<FormattedMessage
defaultMessage="Go Back"
description="Label for button to back out of importing a project"
id="gui.importInfo.goback"
/>
</button>
</Box>
<Box className={styles.faqLinkText}>
<FormattedMessage
defaultMessage="Go Back"
description="Label for button to back out of importing a project"
id="gui.importInfo.goback"
defaultMessage="To learn more, go to the {previewFaqLink}."
description="Invitation to try 3.0 preview"
id="gui.importInfo.previewfaq"
values={{
previewFaqLink: (
<a
className={styles.faqLink}
href="//scratch.mit.edu/3faq"
>
<FormattedMessage
defaultMessage="FAQ"
description="link to Scratch 3.0 FAQ page"
id="gui.importInfo.previewfaqlinktext"
/>
</a>
)
}}
/>
</button>
</Box>
<Box className={styles.faqLinkText}>
<FormattedMessage
defaultMessage="To learn more, go to the {previewFaqLink}."
description="Invitation to try 3.0 preview"
id="gui.importInfo.previewfaq"
values={{
previewFaqLink: (
<a
className={styles.faqLink}
href="//scratch.mit.edu/3faq"
>
<FormattedMessage
defaultMessage="FAQ"
description="link to Scratch 3.0 FAQ page"
id="gui.importInfo.previewfaqlinktext"
/>
</a>
)
}}
/>
</Box>
</Box>
</Box>
</div>
</ReactModal>
);

Expand Down
15 changes: 13 additions & 2 deletions src/components/preview-modal/preview-modal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,28 @@
color: white;
}

.button-row button + button {
[dir="ltr"] .button-row button + button {
margin-left: 0.5rem;
}

[dir="rtl"] .button-row button + button {
margin-right: 0.5rem;
}

.cat-icon {
margin-left: .125rem;
width: 1.5rem;
height: 1.5rem;
vertical-align: middle;
}

[dir="ltr"] .cat-icon {
margin-left: .125rem;
}

[dir="rtl"] .cat-icon {
margin-right: .125rem;
}

.faq-link-text {
margin: 2rem 0 .5rem 0;
font-size: .875rem;
Expand Down
Loading