Skip to content

Commit aaea4cc

Browse files
authored
Ensure __reflex_base CSS is declared first (#5493)
* Ensure __reflex_base CSS is declared first * fixup unit tests
1 parent 9d5d59b commit aaea4cc

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

reflex/.templates/jinja/web/styles/styles.css.jinja2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{%- block imports_styles %}
2+
@layer __reflex_base;
23
{% for sheet_name in stylesheets %}
34
{{- "@import url('" + sheet_name + "'); " }}
45
{% endfor %}

tests/units/compiler/test_compiler.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ def test_compile_stylesheets(tmp_path: Path, mocker: MockerFixture):
158158
/ "styles"
159159
/ (PageNames.STYLESHEET_ROOT + ".css")
160160
),
161+
"@layer __reflex_base;\n"
161162
"@import url('./__reflex_style_reset.css'); \n"
162163
"@import url('@radix-ui/themes/styles.css'); \n"
163164
"@import url('https://fonts.googleapis.com/css?family=Sofia&effect=neon|outline|emboss|shadow-multiple'); \n"
@@ -219,6 +220,7 @@ def test_compile_stylesheets_scss_sass(tmp_path: Path, mocker: MockerFixture):
219220
/ "styles"
220221
/ (PageNames.STYLESHEET_ROOT + ".css")
221222
),
223+
"@layer __reflex_base;\n"
222224
"@import url('./__reflex_style_reset.css'); \n"
223225
"@import url('@radix-ui/themes/styles.css'); \n"
224226
"@import url('./style.css'); \n"
@@ -238,6 +240,7 @@ def test_compile_stylesheets_scss_sass(tmp_path: Path, mocker: MockerFixture):
238240
/ "styles"
239241
/ (PageNames.STYLESHEET_ROOT + ".css")
240242
),
243+
"@layer __reflex_base;\n"
241244
"@import url('./__reflex_style_reset.css'); \n"
242245
"@import url('@radix-ui/themes/styles.css'); \n"
243246
"@import url('./style.css'); \n"
@@ -285,7 +288,7 @@ def test_compile_stylesheets_exclude_tailwind(tmp_path, mocker: MockerFixture):
285288

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

291294

@@ -324,7 +327,7 @@ def test_compile_stylesheets_no_reset(tmp_path: Path, mocker: MockerFixture):
324327
/ "styles"
325328
/ (PageNames.STYLESHEET_ROOT + ".css")
326329
),
327-
"@import url('@radix-ui/themes/styles.css'); \n@import url('./style.css'); \n",
330+
"@layer __reflex_base;\n@import url('@radix-ui/themes/styles.css'); \n@import url('./style.css'); \n",
328331
)
329332

330333

0 commit comments

Comments
 (0)