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

Jump to bottom

print minified css for global styles #24924

Merged
merged 9 commits into from
Sep 8, 2020
Merged

print minified css for global styles #24924

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d8e0c96
print minified css for global styles
aristath Aug 31, 2020
a834e93
remove additional space character
aristath Aug 31, 2020
05cdb47
simplify return
aristath Aug 31, 2020
c26a36a
Merge branch 'master' into aristath/try/minify-global-styles
aristath Sep 3, 2020
3926fc9
This can be simplified
aristath Sep 3, 2020
d624221
additional tweak
aristath Sep 3, 2020
7902a9d
Merge branch 'master' into aristath/try/minify-global-styles
aristath Sep 7, 2020
fc1d668
Add SCRIPT_DEBUG checks for whitespace stripping.
aristath Sep 7, 2020
d3a9b3a
Fix incomplete inline comment
aristath Sep 7, 2020
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
21 changes: 16 additions & 5 deletions lib/global-styles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ function gutenberg_experimental_global_styles_resolver( $tree ) {
// so that existing link colors themes used didn't break.
// We add this here to make it work for themes that opt-in to theme.json
// In the future, we may do this differently.
$stylesheet .= 'a { color: var(--wp--style--color--link, #00e); }';
$stylesheet .= 'a{color:var(--wp--style--color--link, #00e);}';
}

return $stylesheet;
Expand All @@ -479,13 +479,24 @@ function gutenberg_experimental_global_styles_resolver_styles( $block_selector,
// 1) The style attributes the block has declared support for.
// 2) Any CSS custom property attached to the node.
if ( in_array( $property, $block_supports, true ) || strstr( $property, '--' ) ) {
$css_declarations .= "\t" . $property . ': ' . $value . ";\n";

// Add whitespace if SCRIPT_DEBUG is defined and set to true.
$css_declarations .= ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
? "\t" . $property . ': ' . $value . ";\n"
: $property . ':' . $value . ';';
}
}

if ( '' !== $css_declarations ) {
$css_rule .= $block_selector . " {\n";
$css_rule .= $css_declarations;
$css_rule .= "}\n";

// Add whitespace if SCRIPT_DEBUG is defined and set to true.
if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
$css_rule .= $block_selector . " {\n";
$css_rule .= $css_declarations;
$css_rule .= "}\n";
} else {
$css_rule .= $block_selector . '{' . $css_declarations . '}';
}
}

return $css_rule;
Expand Down