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

refactor: Move ui.Theme.from_brand() Sass code into an .scss file #1792

Merged
merged 11 commits into from
Dec 31, 2024
Merged

refactor: Move ui.Theme.from_brand() Sass code into an .scss file #1792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2e0f444
refactor(brand): Move as much logic as possible into _brand-yml.scss …
gadenbuie Dec 4, 2024
efcb11f
fix: Can't use `null !default` trick for Bootstrap core vars like `$p…
gadenbuie Dec 4, 2024
a32be5f
tests: Test that brand-backed themes compile without error
gadenbuie Dec 4, 2024
39e6390
chore: make format
gadenbuie Dec 4, 2024
4ddf0f5
refactor: Use `add` methods for brand Sass inclusion
gadenbuie Dec 4, 2024
b17d04f
chore: small diff reduction
gadenbuie Dec 4, 2024
01d6e8b
chore: keep `-` in field names in brand Sass vars
gadenbuie Dec 10, 2024
85833f4
chore: add clarifying comment
gadenbuie Dec 10, 2024
7c67f61
fix: Work around bslib's `$default` for BS3-4 compat
gadenbuie Dec 11, 2024
6eaf926
chore: remove unmapped brand sass var check
gadenbuie Dec 31, 2024
24cbfda
fix: remove unused import
gadenbuie Dec 31, 2024
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
5 changes: 1 addition & 4 deletions examples/brand/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import os
from pathlib import Path

import matplotlib.pyplot as plt
Expand All @@ -7,10 +6,8 @@
from shiny import App, render, ui
from shiny.ui._theme_brand import bootstrap_colors

# TODO: Move this into the test that runs this app
os.environ["SHINY_BRAND_YML_RAISE_UNMAPPED"] = "true"
theme = ui.Theme.from_brand(__file__)
# theme = ui.Theme()
# theme = ui.Theme() ## default theme
theme.add_rules((Path(__file__).parent / "_colors.scss").read_text())

app_ui = ui.page_navbar(
Expand Down
Loading
Loading