Skip to content

[V32] Fix @ rules separation in theming controller #297

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

Open
memurats wants to merge 2 commits into
base: stable32
Choose a base branch
from
Open

[V32] Fix @ rules separation in theming controller #297

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a57953
Refactor CSS handling to include imports
memurats Dec 10, 2025
c89b523
Enhance CSS handling in ThemingController
memurats Dec 11, 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
16 changes: 12 additions & 4 deletions apps/theming/lib/Controller/ThemingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,11 +408,19 @@ public function getThemeStylesheet(string $themeId, bool $plain = false, bool $w
// from the rest of the CSS.
$customCssWithoutComments = preg_replace('!/\*.*?\*/!s', '', $customCss);
$customCssWithoutComments = preg_replace('!//.*!', '', $customCssWithoutComments);
preg_match_all('/(@[^{]+{(?:[^{}]*|(?R))*})/', $customCssWithoutComments, $atRules);
$atRulesCss = implode('', $atRules[0]);
$scopedCss = preg_replace('/(@[^{]+{(?:[^{}]*|(?R))*})/', '', $customCssWithoutComments);

$css = "$atRulesCss [data-theme-$themeId] { $variables $scopedCss }";
// Extract @import rules, because they MUST appear at the very top of the final CSS
// If they remain inside the theme scope or behind normal rules, browsers will ignore them
preg_match_all('/(@import[^;]+;)/', $customCssWithoutComments, $imports);
$importsCss = implode('', $imports[0]);
$customCssWithoutImports = preg_replace('/(@import[^;]+;)/', '', $customCssWithoutComments);

// Extract all remaining @-rules (e.g. @media), because they cannot be nested inside the theme scope
preg_match_all('/(@[^{]+{(?:[^{}]*|(?R))*})/', $customCssWithoutImports, $atRules);
$atRulesCss = implode('', $atRules[0]);
$scopedCss = preg_replace('/(@[^{]+{(?:[^{}]*|(?R))*})/', '', $customCssWithoutImports);

$css = "$importsCss $atRulesCss [data-theme-$themeId] { $variables $scopedCss }";
}

try {
Expand Down