Skip to content
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

Signup: Fix Themes step horizontal scroll #11299

Merged
merged 4 commits into from
Feb 10, 2017
Merged

Signup: Fix Themes step horizontal scroll #11299

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
123711e
Fix Themes step horizontal scroll
bisko Feb 9, 2017
6b28615
Fix leftover horizontal scroll
bisko Feb 9, 2017
81c51c1
Update the way header texts are set
bisko Feb 10, 2017
3fab71e
Update code according to code review
bisko Feb 10, 2017
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
Prev Previous commit
Next Next commit
Update the way header texts are set
  • Loading branch information
@bisko
bisko committed Feb 10, 2017
commit 81c51c104fc79e5a70167c63ebe16a4a6e1155fb
13 changes: 6 additions & 7 deletions client/signup/steps/theme-selection/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ class ThemeSelectionStep extends Component {
};

renderThemesList() {

const pressableWrapperClassName = classNames( {
'theme-selection__pressable-wrapper': true,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this key is always true I think classnames allows single strings as arguments. Also, check which is more common in calypso: classnames or classNames

Copy link
Contributor Author

@bisko bisko Feb 10, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

 344 classNames(
 106 classnames(

'is-hidden': ! this.state.showPressable,
Expand Down Expand Up @@ -125,13 +124,13 @@ class ThemeSelectionStep extends Component {
const defaultDependencies = this.props.useHeadstart ? { themeSlugWithRepo: 'pub/twentysixteen' } : undefined;
const { translate } = this.props;

let headerText = translate( 'Choose a theme.' );
let subHeaderText = translate( 'No need to overthink it. You can always switch to a different theme later.' );
const headerText = this.state.showPressable
? translate( 'Upload your WordPress Theme' )
: translate( 'Choose a theme.' );

if ( this.state.showPressable ) {
headerText = translate( 'Upload your WordPress Theme' );
subHeaderText = translate( 'Our partner Pressable is here to help you' );
}
const subHeaderText = this.state.showPressable
? translate( 'Our partner Pressable is here to help you' )
: translate( 'No need to overthink it. You can always switch to a different theme later.' );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add context for translators. The other strings may not need it, but this one probably does.


return (
<StepWrapper
Expand Down