Skip to content

Use CSS custom properties for Treescope's color palette #74

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
Auxeno wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use CSS custom properties for Treescope's color palette #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions treescope/_internal/arrayviz_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def html_setup() -> (
}
.arrayviz_container .info {
font-family: monospace;
color: #aaaaaa;
color: var(--treescope-info-color);
margin-bottom: 0.25em;
white-space: pre;
}
Expand All @@ -88,17 +88,18 @@ def html_setup() -> (
border-radius: 3px;
}
.arrayviz_container .info input[type="number"]:not(:focus):not(:hover) {
color: #777777;
border: 1px solid #777777;
color: var(--treescope-input-color);
border: 1px solid var(--treescope-input-color);
}
.arrayviz_container .info.sliders {
white-space: pre;
}
.arrayviz_container .hovertip {
display: none;
position: absolute;
background-color: white;
border: 1px solid black;
background-color: var(--treescope-tooltip-bg);
color: var(--treescope-tooltip-fg);
border: 1px solid var(--treescope-tooltip-border-color);
padding: 0.25ch;
pointer-events: none;
width: fit-content;
Expand All @@ -117,7 +118,7 @@ def html_setup() -> (
white-space: pre;
}
.arrayviz_container .loading_message {
color: #aaaaaa;
color: var(--treescope-info-color);
}
""")),
part_interface.JavaScriptDefn(
Expand Down
6 changes: 3 additions & 3 deletions treescope/_internal/handlers/basic_types_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def _span_css_rule(self, context: HtmlContextForSetup) -> CSSStyleRule:
return CSSStyleRule(html_escaping.without_repeated_whitespace("""
.color_keyword
{
color: #0000ff;
color: var(--treescope-keyword-color);
}
"""))

Expand All @@ -60,7 +60,7 @@ def _span_css_rule(self, context: HtmlContextForSetup) -> CSSStyleRule:
return CSSStyleRule(html_escaping.without_repeated_whitespace("""
.color_number
{
color: #098156;
color: var(--treescope-number-color);
}
"""))

Expand All @@ -75,7 +75,7 @@ def _span_css_rule(self, context: HtmlContextForSetup) -> CSSStyleRule:
return CSSStyleRule(html_escaping.without_repeated_whitespace("""
.color_string
{
color: #a31515;
color: var(--treescope-string-color);
}
"""))

Expand Down
4 changes: 3 additions & 1 deletion treescope/_internal/js/arrayviz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,9 @@ const arrayviz = (() => {
const yLabelParts = [];
const setCommonLabelStyles = (label) => {
label.style.whiteSpace = 'pre';
label.style.borderBottom = '0.1em solid black';
label.style.color = 'var(--treescope-axis-label-color)';
label.style.borderBottom =
'0.1em solid var(--treescope-axis-label-color)';
label.style.fontSize =
'calc(min(1, max(0.6, var(--arrayviz-zoom))) * var(--base-font-size))';
};
Expand Down
4 changes: 2 additions & 2 deletions treescope/_internal/parts/basic_parts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ def html_setup_parts(
.stacked_children:not({context.collapsed_selector} *)
{{
display: block;
border-left: dotted 1px #e0e0e0;
border-left: dotted 1px var(--treescope-faint-color);
}}
""")
return functools.reduce(
Expand Down Expand Up @@ -1392,7 +1392,7 @@ def render_to_text(

def in_outlined_box(
child: part_interface.RenderableTreePart,
css_style: str = "outline: 1px dashed #aaaaaa;",
css_style: str = "outline: 1px dashed var(--treescope-outline-color);",
) -> RenderableTreePart:
"""Wraps a child into an outlined box.

Expand Down
12 changes: 6 additions & 6 deletions treescope/_internal/parts/common_styles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def _span_css_rule(self, context: HtmlContextForSetup) -> CSSStyleRule:
return CSSStyleRule(html_escaping.without_repeated_whitespace("""
.color_abbrev
{
color: #682a00;
color: var(--treescope-abbreviation-color);
}
"""))

Expand All @@ -66,10 +66,10 @@ def _span_css_class(self) -> str:
def _span_css_rule(self, context: HtmlContextForSetup) -> CSSStyleRule:
return CSSStyleRule(html_escaping.without_repeated_whitespace("""
.color_comment {
color: #aaaaaa;
color: var(--treescope-comment-color);
}
.color_comment a:not(:hover){
color: #aaaaaa;
color: var(--treescope-comment-color);
}
"""))

Expand All @@ -94,7 +94,7 @@ def _span_css_class(self) -> str:
def _span_css_rule(self, context: HtmlContextForSetup) -> CSSStyleRule:
return CSSStyleRule(html_escaping.without_repeated_whitespace("""
.color_error {
color: red;
color: var(--treescope-error-color);
}
"""))

Expand All @@ -119,7 +119,7 @@ def _span_css_class(self) -> str:
def _span_css_rule(self, context: HtmlContextForSetup) -> CSSStyleRule:
return CSSStyleRule(html_escaping.without_repeated_whitespace("""
.deferred_placeholder {
color: #a7a7a7;
color: var(--treescope-deferred-color);
font-style: italic;
}
"""))
Expand Down Expand Up @@ -151,7 +151,7 @@ def _span_css_class(self) -> str:
def _span_css_rule(self, context: HtmlContextForSetup) -> CSSStyleRule:
return CSSStyleRule(html_escaping.without_repeated_whitespace(f"""
.color_comment_when_expanded:not({context.collapsed_selector} *) {{
color: #aaaaaa;
color: var(--treescope-comment-color);
}}
"""))

Expand Down
8 changes: 4 additions & 4 deletions treescope/_internal/parts/foldable_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def html_setup_parts(

.foldable_node > label::before
{{
color: #cccccc;
color: var(--treescope-marker-color);
position: relative;
left: -1ch;
width: 0;
Expand Down Expand Up @@ -336,15 +336,15 @@ def html_setup_parts(
content: "\\e14d";
font-family: 'Material Symbols Outlined Content Copy';
-webkit-font-smoothing: antialiased;
color: #e0e0e0;
color: var(--treescope-copy-button-color);
cursor: pointer;
font-size: 0.9em;
}}
.copybutton:hover > span::before {{
color: darkseagreen;
}}
.copybutton.was_clicked > span::after {{
color: #cccccc;
color: var(--treescope-marker-color);
}}
.copybutton:hover > span::after {{
color: darkseagreen;
Expand All @@ -358,7 +358,7 @@ def html_setup_parts(
color: darkseagreen;
}}
.copybutton.broken_copy {{
color: #e0e0e0;
color: var(--treescope-copy-button-color);
}}
""")),
}
Expand Down
23 changes: 21 additions & 2 deletions treescope/lowering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,31 @@ def _render_one(
stream.write("<style>")
stream.write(html_escaping.without_repeated_whitespace("""
.treescope_root {
--treescope-bg: white;
--treescope-fg: black;
--treescope-keyword-color: #0000ff;
--treescope-number-color: #098156;
--treescope-string-color: #a31515;
--treescope-comment-color: #aaaaaa;
--treescope-abbreviation-color: #682a00;
--treescope-error-color: red;
--treescope-deferred-color: #a7a7a7;
--treescope-marker-color: #cccccc;
--treescope-faint-color: #e0e0e0;
--treescope-copy-button-color: #e0e0e0;
--treescope-outline-color: #aaaaaa;
--treescope-axis-label-color: black;
--treescope-info-color: #aaaaaa;
--treescope-tooltip-bg: white;
--treescope-tooltip-fg: black;
--treescope-tooltip-border-color: black;
--treescope-input-color: #777777;
position: relative;
font-family: monospace;
white-space: pre;
list-style-type: none;
background-color: white;
color: black;
background-color: var(--treescope-bg);
color: var(--treescope-fg);
width: fit-content;
min-width: 100%;
box-sizing: border-box;
Expand Down