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

Bug/10040 input copy #10183

Merged
merged 12 commits into from
Feb 18, 2025
Merged

Bug/10040 input copy #10183

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f0838f6
Update copy in constants.
zutigrm Feb 5, 2025
f950067
Update copy in UserInputPreview.
zutigrm Feb 5, 2025
56a9664
Remove extra padding.
zutigrm Feb 5, 2025
df83217
Update layout spacing for desktop and wider desktop screens.
zutigrm Feb 5, 2025
bd19b8b
Merge remote-tracking branch 'origin/develop' into bug/10040-input-copy.
zutigrm Feb 6, 2025
8cfc69b
Increase the column size.
zutigrm Feb 6, 2025
f33468a
Make a horizontal spacing between equal columns.
zutigrm Feb 6, 2025
4a26f0b
Unset padding for user preview in settings.
zutigrm Feb 6, 2025
68f2e38
Merge remote-tracking branch 'origin/develop' into bug/10040-input-copy.
zutigrm Feb 12, 2025
977c600
Update per CR feedback.
zutigrm Feb 12, 2025
5e22669
Merge remote-tracking branch 'origin/develop' into bug/10040-input-copy.
zutigrm Feb 14, 2025
0bb61a1
Add bp-xxxlarge and replace the usage of wpdb3.
zutigrm Feb 14, 2025
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 assets/js/components/user-input/UserInputPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ export default function UserInputPreview( props ) {
<UserInputPreviewGroup
slug={ USER_INPUT_QUESTIONS_GOALS }
title={ __(
'What are your top goals for this site?',
'What are your top 3 goals for this site?',
'google-site-kit'
) }
values={ settings?.goals?.values || [] }
Expand Down
2 changes: 1 addition & 1 deletion assets/js/components/user-input/UserInputQuestionInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default function UserInputQuestionInfo( { slug, questionNumber } ) {
<Fragment>
<Cell
className="googlesitekit-user-input__question-instructions"
lgSize={ 5 }
lgSize={ 6 }
mdSize={ 8 }
smSize={ 4 }
>
Expand Down
18 changes: 8 additions & 10 deletions assets/js/components/user-input/util/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export function getUserInputQuestions() {
'google-site-kit'
),
description: __(
'Based on your answer, Site Kit will tailor the metrics you see on your dashboard to help you track progress towards your specific goals',
'Based on your answer, Site Kit will suggest the metrics you see on your dashboard to help you track how close you’re getting to your specific goals',
'google-site-kit'
),
},
Expand All @@ -108,17 +108,17 @@ export function getUserInputQuestions() {
'google-site-kit'
),
description: __(
'Based on your answer, Site Kit will suggest new features for your dashboard related to content creation',
'Based on your answer, Site Kit will suggest the metrics you see on your dashboard to help you track how close you’re getting to your specific goals',
'google-site-kit'
),
},
{
title: __(
'What are your top goals for this site?',
'What are your top 3 goals for this site?',
'google-site-kit'
),
description: __(
'Based on your answers, Site Kit will tailor the metrics and recommendations you see on your dashboard to help you make progress in these areas',
'Based on your answer, Site Kit will suggest the metrics you see on your dashboard to help you track how close you’re getting to your specific goals',
Copy link
Collaborator

Choose a reason for hiding this comment

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

Are we sure these are all supposed to have the same description? I see it is this way in the design but it's worth double checking to make sure that is correct. If so, we can extract it to a variable that's translated once to make that a bit more explicit as well.

Copy link
Collaborator Author

@zutigrm zutigrm Feb 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks. Sure, will double check with Sigal. So far all the changes in Figma for ACR were intended and considered latest, or source of truth. Will let you know once Sigal gets back to me on this

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Confirmed that it is intentional, moved content to a variable

'google-site-kit'
),
},
Expand All @@ -142,14 +142,11 @@ export function getUserInputAnswers() {
),
sell_products: __( 'Sell products', 'google-site-kit' ),
provide_services: __( 'Provide services', 'google-site-kit' ),
monetize_content: __(
'Monetize content (with ads or affiliate links)',
'google-site-kit'
),
monetize_content: __( 'Monetize content', 'google-site-kit' ),
publish_blog: __( 'Publish a blog', 'google-site-kit' ),
publish_news: __( 'Publish news content', 'google-site-kit' ),
share_portfolio: __(
'Share a business card or portfolio to represent me or my company online',
'Portfolio or business card',
'google-site-kit'
),
other: __( 'Other', 'google-site-kit' ),
Expand Down Expand Up @@ -183,6 +180,7 @@ export function getUserInputAnswers() {
'Generate more revenue',
'google-site-kit'
),
generating_leads: __( 'Generate leads', 'google-site-kit' ),
help_better_rank: __(
'Help my content rank in a better position in Google search results',
'google-site-kit'
Expand All @@ -192,7 +190,7 @@ export function getUserInputAnswers() {
'google-site-kit'
),
encourage_to_post: __(
'Tips for generating and posting engaging content updates',
'Encouragement to post more frequently',
'google-site-kit'
),
other: __( 'Other', 'google-site-kit' ),
Expand Down
7 changes: 7 additions & 0 deletions assets/sass/components/settings/_googlesitekit-settings-user-input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@
overflow: hidden;
padding: 0;
}

.googlesitekit-user-input__select-options-wrapper {

@media (min-width: $bp-wpdb3) {
padding-left: unset;
}
}
}

.googlesitekit-user-input__notification-text-loading {
Expand Down
4 changes: 0 additions & 4 deletions assets/sass/components/user-input/googlesitekit-user-input-controls.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@
font-size: $fs-body-md;
letter-spacing: $ls-s;
line-height: $lh-body-md;

@media (min-width: $bp-tablet) {
padding: 10px 0;
}
}
}

Expand Down
9 changes: 8 additions & 1 deletion assets/sass/components/user-input/googlesitekit-user-input-module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,17 @@

.googlesitekit-user-input__select-options-wrapper {
grid-row: span 2;

@media (min-width: $bp-desktop) {
grid-column-start: 9;
}
@media (min-width: $bp-wpdb3) {
grid-column-start: 7;
padding-left: 60px;
}
}

p.googlesitekit-user-input__select-instruction {
border-bottom: 1px solid $c-mercury;
color: $c-surfaces-on-surface;
font-size: $fs-body-sm;
line-height: $lh-body-sm;
Expand Down
4 changes: 4 additions & 0 deletions assets/sass/components/user-input/googlesitekit-user-input-questions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
display: flex;
flex-direction: column;

@media (min-width: $bp-wpdb3) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

This variable is for a breakpoint which is defined as specific to the WP dashboard, so we shouldn't be using it on other screens.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Please update all remaining instances in this PR.

padding-right: 60px;
}

h1 {
color: $c-surfaces-on-surface;
font-size: $fs-title-sm;
Expand Down
Loading