Skip to content

Ensure __reflex_base CSS is declared first #5493

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

Merged
masenf merged 2 commits into from
Jun 25, 2025
Merged

Ensure __reflex_base CSS is declared first #5493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21b7813
Ensure __reflex_base CSS is declared first
masenf Jun 25, 2025
7727f2d
fixup unit tests
masenf Jun 25, 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
1 change: 1 addition & 0 deletions reflex/.templates/jinja/web/styles/styles.css.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{%- block imports_styles %}
@layer __reflex_base;
{% for sheet_name in stylesheets %}
{{- "@import url('" + sheet_name + "'); " }}
{% endfor %}
Expand Down
7 changes: 5 additions & 2 deletions tests/units/compiler/test_compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ def test_compile_stylesheets(tmp_path: Path, mocker: MockerFixture):
/ "styles"
/ (PageNames.STYLESHEET_ROOT + ".css")
),
"@layer __reflex_base;\n"
"@import url('./__reflex_style_reset.css'); \n"
"@import url('@radix-ui/themes/styles.css'); \n"
"@import url('https://fonts.googleapis.com/css?family=Sofia&effect=neon|outline|emboss|shadow-multiple'); \n"
Expand Down Expand Up @@ -219,6 +220,7 @@ def test_compile_stylesheets_scss_sass(tmp_path: Path, mocker: MockerFixture):
/ "styles"
/ (PageNames.STYLESHEET_ROOT + ".css")
),
"@layer __reflex_base;\n"
"@import url('./__reflex_style_reset.css'); \n"
"@import url('@radix-ui/themes/styles.css'); \n"
"@import url('./style.css'); \n"
Expand All @@ -238,6 +240,7 @@ def test_compile_stylesheets_scss_sass(tmp_path: Path, mocker: MockerFixture):
/ "styles"
/ (PageNames.STYLESHEET_ROOT + ".css")
),
"@layer __reflex_base;\n"
"@import url('./__reflex_style_reset.css'); \n"
"@import url('@radix-ui/themes/styles.css'); \n"
"@import url('./style.css'); \n"
Expand Down Expand Up @@ -285,7 +288,7 @@ def test_compile_stylesheets_exclude_tailwind(tmp_path, mocker: MockerFixture):

assert compiler.compile_root_stylesheet(stylesheets) == (
str(Path(".web") / "styles" / (PageNames.STYLESHEET_ROOT + ".css")),
"@import url('./__reflex_style_reset.css'); \n@import url('@radix-ui/themes/styles.css'); \n@import url('./style.css'); \n",
"@layer __reflex_base;\n@import url('./__reflex_style_reset.css'); \n@import url('@radix-ui/themes/styles.css'); \n@import url('./style.css'); \n",
)


Expand Down Expand Up @@ -324,7 +327,7 @@ def test_compile_stylesheets_no_reset(tmp_path: Path, mocker: MockerFixture):
/ "styles"
/ (PageNames.STYLESHEET_ROOT + ".css")
),
"@import url('@radix-ui/themes/styles.css'); \n@import url('./style.css'); \n",
"@layer __reflex_base;\n@import url('@radix-ui/themes/styles.css'); \n@import url('./style.css'); \n",
)


Expand Down
Loading