Skip to content

Site Logo: change enqueued CSS file depending on lang. & setti…#13654

Merged
kraftbj merged 4 commits intomasterfrom
fix/site-logo-css-enqueue
Oct 24, 2019
Merged

Site Logo: change enqueued CSS file depending on lang. & setti…#13654
kraftbj merged 4 commits intomasterfrom
fix/site-logo-css-enqueue

Conversation

@jeherve
Copy link
Copy Markdown
Member

@jeherve jeherve commented Oct 4, 2019

Changes proposed in this Pull Request:

  • When someone uses the SCRIPT_DEBUG constant, or has their site set to a RTL Language, they should get the right stylesheet enqueued.

Testing instructions:

  • Add Site Logo support to your theme:
$args = array(
	'header-text' => array(
		'site-title',
		'site-description',
	),
	'size' => 'medium',
);
add_theme_support( 'site-logo', $args );
  • Go to Appearance Customize, and check what files are enqueued on the page.
  • You should see css/site-logo-control.min.css being enqueued.
  • Go to Settings > General and switch your site language to Hebrew.
  • You should see css/site-logo-control-rtl.min.css being enqueued.
  • Add define( 'SCRIPT_DEBUG', true ); to wp-config.php
  • You should see css/site-logo-control-rtl.css being enqueued.

Proposed changelog entry for your changes:

  • Site Logo: ensure that the right stylesheet is loaded depending on your site's language.

@jeherve jeherve added Bug When a feature is broken and / or not performing as intended [Feature] Theme Tools [Status] Needs Review This PR is ready for review. [Focus] i18n Internationalization / i18n, adaptation to different languages labels Oct 4, 2019
@jeherve jeherve added this to the 7.9 milestone Oct 4, 2019
@jeherve jeherve requested review from a team and creativecoder October 4, 2019 12:51
@jeherve jeherve self-assigned this Oct 4, 2019
@jeherve jeherve mentioned this pull request Oct 4, 2019
Closed
@jetpackbot
Copy link
Copy Markdown
Collaborator

jetpackbot commented Oct 4, 2019 •
edited
Loading

Thank you for the great PR description!

When this PR is ready for review, please apply the [Status] Needs Review label. If you are an a11n, please have someone from your team review the code if possible. The Jetpack team will also review this PR and merge it to be included in the next Jetpack release.

Scheduled Jetpack release: November 5, 2019.
Scheduled code freeze: October 29, 2019

Generated by 🚫 dangerJS against 288254c

kraftbj
kraftbj previously approved these changes Oct 10, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@kraftbj kraftbj left a comment

Choose a reason for hiding this comment

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

Works as advertised. Note for anyone else testing, Jetpack will defer to the core custom logo option. If testing on a theme like Twenty Nineteen, you'd want to delete that section of functions.php OR use another theme that does not support core's custom logo.

@kraftbj kraftbj added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review This PR is ready for review. labels Oct 10, 2019
@creativecoder
Copy link
Copy Markdown
Contributor

creativecoder commented Oct 10, 2019

Given I'm hoping to add this file to Fusion (D33578-code) to keep as much of the site-logo module in sync with wpcom as possible, will these changes work with wpcom?

creativecoder
creativecoder reviewed Oct 10, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@creativecoder creativecoder left a comment

Choose a reason for hiding this comment

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

Noting that there's something not quite right with the rtl styles here (See how "No logo set" is not centered in the rtl version). I think they need to be regenerated because the rtl version is not complete right now.

Screen Shot 2019-10-10 at 17 51 31

Screen Shot 2019-10-10 at 17 51 54

@jeherve
Copy link
Copy Markdown
Member Author

jeherve commented Oct 11, 2019

@creativecoder Good catch indeed! It looks like those had never been updated. I just took care of it in f072285 and f93cd56. This should be ready for a new review.

@jeherve jeherve added [Status] Needs Review This PR is ready for review. and removed [Status] Ready to Merge Go ahead, you can push that green button! labels Oct 11, 2019
creativecoder
creativecoder reviewed Oct 11, 2019
View reviewed changes
@jeherve jeherve force-pushed the fix/site-logo-css-enqueue branch from cb683c7 to fe48e78 Compare October 11, 2019 16:13
@jeherve
Do not use minified CSS on WordPress.com
288254c 
wpcom does its own concatenation / minification, so we don't need to enqueue a minified file there.
@jeherve jeherve force-pushed the fix/site-logo-css-enqueue branch from fe48e78 to 288254c Compare October 11, 2019 16:16
creativecoder
creativecoder approved these changes Oct 11, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@creativecoder creativecoder left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Now tested and working as expected.

Note that the .min version is loading in my local Jetpack environment, even when the $min suffix is an empty string (because SCRIPT_DEBUG is true). But this is happening with a few other modules too, like widget-conditions, so I don’t think it's related to these changes.

@kraftbj kraftbj changed the title Site Logo: change enqueued CSS file depending on lang. & settings Site Logo: change enqueued CSS file depending on lang. & setti… Oct 24, 2019
@kraftbj kraftbj merged commit 9218c5c into master Oct 24, 2019
@kraftbj kraftbj deleted the fix/site-logo-css-enqueue branch October 24, 2019 21:41
@matticbot matticbot added [Status] Needs Changelog and removed [Status] Needs Review This PR is ready for review. labels Oct 24, 2019
jeherve added a commit that referenced this pull request Oct 28, 2019
@jeherve
Changelog: add #13654
e4f020d
jeherve added a commit that referenced this pull request Oct 29, 2019
@jeherve
7.9: Changelog (#13608)
6cd1621 
* 7.9: Changelog

* Update version number

* Update stable tag and tested up to

* Changelog: add #13530

* changelog: add #13578

* Changelog: add #13598

* Changelog: add entry for numerous block preview changes

* Changelog: add #13599

* changelog: add #13541

* Changelog: add #13542

* Changelog: add #13331

* Changelog: add #13558

* Changelog: add #13409

* Changelog: add #13582

* Changelog: add #13600

* Changelog: add #13601

* Changelog: add #13595

* Changelog: add #12695

* Changelog: add #13009

* Changelog: add #13649

* Changelog: add #13450

* Changelog: add #13507

* Changelog: add #13658

* Changelog: add #13687

* changelog: add #13683

* Changelog: add #9323

* Changelog: add #13681

* Fix typos in readme

* Add link to WordPress Beta Tester plugin

* Changelog: add #13630

* Changelog: add #13695

* Changelog: add #13659

* Changelog: add #13716

* Changelog: add #13664

* Changelog: add #13682

* Changelog: add #13362

* Changelog: add #13563

* Add testing list for #13563

* Changelog: add #13735

* Changelog: add #13752

* Changelog: add #13624

* Changelog: add #13756

* Changelog: add #13745

* Changelog: add #13728

* Changelog: add #13779

* Changelog: add #13699

* Changelog: add #13804

* Changelog: add #13761

* Changelog: add #13637

* Changelog: add #13517

* Changelog: add #13521

* Changelog: add #13729

* Testing list: add testing instructions for #13729

* Changelog: add sync changes

* Changelog: add #13807

* Changelog: add #13654

* Changelog: add #13795

* Changelog: add #13801

* Changelog: add #13818

* Changelog: add #13725

* Changelog: add #13831

* Changelog: add #13516

* Testing list: add Twenty Twenty instructions

* Changelog: add #13799

* Changelog: add #13805

* Changelog: add #13688

* Changelog: add #13830
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kraftbj kraftbj kraftbj approved these changes

+1 more reviewer

@creativecoder creativecoder creativecoder approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jeherve jeherve

Labels

Bug When a feature is broken and / or not performing as intended [Feature] Theme Tools [Focus] i18n Internationalization / i18n, adaptation to different languages

Projects

None yet

Milestone

7.9

Development

Successfully merging this pull request may close these issues.

5 participants

@jeherve @jetpackbot @creativecoder @kraftbj @matticbot