diff --git a/funnel/assets/sass/mui/_custom.scss b/funnel/assets/sass/mui/_custom.scss index 781d0873b..25576a2a3 100644 --- a/funnel/assets/sass/mui/_custom.scss +++ b/funnel/assets/sass/mui/_custom.scss @@ -36,9 +36,10 @@ $mui-body-bg-color: $mui-bg-color-accent !default; $mui-btn-danger-bg-color: $mui-text-danger; $mui-base-font-color: $mui-text-dark !default; -$mui-base-font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, - Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Noto Sans Math', - 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; +$mui-base-font-family: + -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, + 'Helvetica Neue', Arial, sans-serif, 'Noto Sans Math', 'Apple Color Emoji', + 'Segoe UI Emoji', 'Segoe UI Symbol'; $mui-base-font-size: 14px !default; $mui-base-font-size-desktop: 16px !default; $mui-base-font-weight: 400 !default; diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css index 1bf8afbd2..8b8b076c7 100644 --- a/funnel/static/css/app.css +++ b/funnel/static/css/app.css @@ -1690,9 +1690,10 @@ html { } body { - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, - Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Noto Sans Math', - 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; + font-family: + -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, + 'Helvetica Neue', Arial, sans-serif, 'Noto Sans Math', 'Apple Color Emoji', + 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; font-weight: 400; line-height: 1.5; diff --git a/tests/conftest.py b/tests/conftest.py index e073fe6d8..260c515e4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -492,7 +492,7 @@ def backup_and_apply_config( ) -> None: if key in saved_config: pytest.fail(f"Duplicate mock for {app_name}.config[{key!r}]") - if key in app_fixture.config: # noqa: SIM401 + if key in app_fixture.config: saved_config[key] = app_fixture.config[key] else: saved_config[key] = ... # Sentinel value