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.

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

Try: Fix admin-theme colors in the canvas. #24408

Merged
merged 1 commit into from
Aug 28, 2020
Merged

Conversation

jasmussen
Copy link
Contributor

The globally set CSS variables for the WP-admin color scheme were overridden, just inside the editing canvas.

Before:

Screenshot 2020-08-06 at 13 55 51

After:

Screenshot 2020-08-06 at 13 53 46

This is a draft PR because based on the code comment, it looks like the rule removed was necessary. I'd appreciate advice on where to move it.

@jasmussen jasmussen added the [Type] Bug An existing feature does not function as intended label Aug 6, 2020
@jasmussen jasmussen requested a review from youknowriad August 6, 2020 11:57
@jasmussen jasmussen self-assigned this Aug 6, 2020
@github-actions
Copy link

github-actions bot commented Aug 6, 2020

Size Change: -991 B (0%)

Total Size: 1.16 MB

Filename Size Change
build/block-directory/style-rtl.css 907 B -46 B (5%)
build/block-directory/style.css 908 B -44 B (4%)
build/block-editor/style-rtl.css 10.7 kB -35 B (0%)
build/block-editor/style.css 10.7 kB -35 B (0%)
build/block-library/editor-rtl.css 8.49 kB -35 B (0%)
build/block-library/editor.css 8.48 kB -35 B (0%)
build/block-library/style-rtl.css 7.41 kB -44 B (0%)
build/block-library/style.css 7.41 kB -46 B (0%)
build/block-library/theme-rtl.css 684 B -45 B (6%)
build/block-library/theme.css 685 B -45 B (6%)
build/components/style-rtl.css 15.7 kB -24 B (0%)
build/components/style.css 15.7 kB -25 B (0%)
build/edit-navigation/style-rtl.css 1.12 kB -44 B (3%)
build/edit-navigation/style.css 1.12 kB -45 B (4%)
build/edit-post/style-rtl.css 5.6 kB -16 B (0%)
build/edit-post/style.css 5.59 kB -14 B (0%)
build/edit-site/style-rtl.css 3.04 kB -17 B (0%)
build/edit-site/style.css 3.04 kB -18 B (0%)
build/edit-widgets/style-rtl.css 2.44 kB -15 B (0%)
build/edit-widgets/style.css 2.43 kB -15 B (0%)
build/editor/editor-styles-rtl.css 492 B -45 B (9%)
build/editor/editor-styles.css 493 B -46 B (9%)
build/editor/style-rtl.css 3.77 kB -29 B (0%)
build/editor/style.css 3.77 kB -29 B (0%)
build/format-library/style-rtl.css 508 B -39 B (7%)
build/format-library/style.css 509 B -39 B (7%)
build/list-reusable-blocks/style-rtl.css 460 B -16 B (3%)
build/list-reusable-blocks/style.css 460 B -16 B (3%)
build/nux/style-rtl.css 627 B -44 B (7%)
build/nux/style.css 623 B -45 B (7%)
ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.14 kB 0 B
build/annotations/index.js 3.67 kB 0 B
build/api-fetch/index.js 3.44 kB 0 B
build/autop/index.js 2.82 kB 0 B
build/blob/index.js 620 B 0 B
build/block-directory/index.js 7.99 kB 0 B
build/block-editor/index.js 126 kB 0 B
build/block-library/index.js 136 kB 0 B
build/block-serialization-default-parser/index.js 1.88 kB 0 B
build/block-serialization-spec-parser/index.js 3.1 kB 0 B
build/blocks/index.js 47.7 kB 0 B
build/components/index.js 200 kB 0 B
build/compose/index.js 9.67 kB 0 B
build/core-data/index.js 12.3 kB 0 B
build/data-controls/index.js 1.29 kB 0 B
build/data/index.js 8.55 kB 0 B
build/date/index.js 5.38 kB 0 B
build/deprecated/index.js 772 B 0 B
build/dom-ready/index.js 568 B 0 B
build/dom/index.js 4.48 kB 0 B
build/edit-navigation/index.js 11.7 kB 0 B
build/edit-post/index.js 304 kB 0 B
build/edit-site/index.js 17 kB 0 B
build/edit-widgets/index.js 11.9 kB 0 B
build/editor/index.js 45.3 kB 0 B
build/element/index.js 4.65 kB 0 B
build/escape-html/index.js 733 B 0 B
build/format-library/index.js 7.71 kB 0 B
build/hooks/index.js 2.13 kB 0 B
build/html-entities/index.js 621 B 0 B
build/i18n/index.js 3.57 kB 0 B
build/is-shallow-equal/index.js 710 B 0 B
build/keyboard-shortcuts/index.js 2.52 kB 0 B
build/keycodes/index.js 1.94 kB 0 B
build/list-reusable-blocks/index.js 3.12 kB 0 B
build/media-utils/index.js 5.32 kB 0 B
build/notices/index.js 1.79 kB 0 B
build/nux/index.js 3.4 kB 0 B
build/plugins/index.js 2.56 kB 0 B
build/primitives/index.js 1.41 kB 0 B
build/priority-queue/index.js 789 B 0 B
build/redux-routine/index.js 2.85 kB 0 B
build/rich-text/index.js 13.9 kB 0 B
build/server-side-render/index.js 2.77 kB 0 B
build/shortcode/index.js 1.7 kB 0 B
build/token-list/index.js 1.27 kB 0 B
build/url/index.js 4.06 kB 0 B
build/viewport/index.js 1.85 kB 0 B
build/warning/index.js 1.14 kB 0 B
build/wordcount/index.js 1.17 kB 0 B

compressed-size-action

// It is important to include these styles in all built stylesheets
// This allows to CSS variables post CSS plugin to generate fallbacks.
:root {
@include admin-scheme(#007cba);
Copy link
Contributor

Choose a reason for hiding this comment

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

interesting!

If we remove this from here, we need to move it to all the edit-* stylesheets + list-reusable-blocks.
Alternatively, we can define the fallback variables in the config of the PostCSS CSS variables plugin.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I believe it's already there, through the mixin:

Screenshot 2020-08-06 at 15 14 08

And that mixin is something like

@mixin wordpress-admin-schemes() {
	body.admin-color-light {
		@include admin-scheme(#0085ba);
	}

 	...
}

I'm happy to test the failure condition of removing this if there's an easy way to do it?

Copy link
Contributor

Choose a reason for hiding this comment

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

the fallback can be tested on IE11 or you can just check that anytime the variable is used on the produced CSS, there's always a default value applied.

Thinking again, moving this to edit-* won't solve the issue of fallbacks because the fallback won't be applied to stylesheets like "components"... So the only way is to actually define the fallback in the plugin's config.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How do we best move forward with this one?

@youknowriad youknowriad force-pushed the try/fix-color-inheritance branch from dc4e054 to 6c9969b Compare August 28, 2020 08:51
@youknowriad
Copy link
Contributor

I pushed a fix that takes into account the fallbacks. It should be good to go now.

@jasmussen
Copy link
Contributor Author

You're the best, Riad. Thank you.

@jasmussen jasmussen marked this pull request as ready for review August 28, 2020 09:14
@jasmussen jasmussen merged commit 125fc59 into master Aug 28, 2020
@jasmussen jasmussen deleted the try/fix-color-inheritance branch August 28, 2020 09:31
@github-actions github-actions bot added this to the Gutenberg 8.9 milestone Aug 28, 2020
youknowriad added a commit that referenced this pull request Aug 28, 2020
adrianduffell added a commit to woocommerce/woocommerce-admin that referenced this pull request Oct 23, 2020
The <Button> component styles from @wordpress/components were missing color styles. This is due to a change in @wordpress/base-styles where a different technique for providing the default button colors was implemented in WordPress/gutenberg#24408.

As a temporary measure, this restores the previous code by copying it here directly.
adrianduffell added a commit to woocommerce/woocommerce-admin that referenced this pull request Oct 29, 2020
The <Button> component styles from @wordpress/components were missing color styles. This is due to a change in @wordpress/base-styles where a different technique for providing the default button colors was implemented in WordPress/gutenberg#24408.

As a temporary measure, this restores the previous code by copying it here directly.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Type] Bug An existing feature does not function as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants