Skip to content

Fix theming for control buttons and minimap #2874

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
joeyballentine merged 2 commits into from
May 18, 2024
Merged

Fix theming for control buttons and minimap #2874

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
a9f0f83
Fix theming for control buttons and minimap
joeyballentine May 18, 2024
6e3f8af
make light theme closer to what it was before
joeyballentine May 18, 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
26 changes: 26 additions & 0 deletions src/renderer/colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
$next-shade: map.get($theme, $shade + 100);

--theme-#{$shade}: #{$color};

// Generate 50% alphas
--theme-#{$shade}-a50: #{color.adjust($color, $alpha: -0.5)};
--theme-#{$shade}-a75: #{color.adjust($color, $alpha: -0.25)};

// Generate 25%, 50%, 75% shades
@if $next-shade {
$twenty-five-percent: color.mix($color, $next-shade, 75%);
$fifty-percent: color.mix($color, $next-shade, 50%);
Expand Down Expand Up @@ -70,6 +76,16 @@
--header-bg: var(--bg-800);
--chain-editor-bg: var(--bg-800);
--node-selector-bg: var(--bg-800);

/* minimap */
--minimap-bg: var(--theme-700-a50);
--minimap-node: var(--theme-0-a50);
--minimap-mask-fill: var(--theme-700-a50);
--minimap-mask-stroke: var(--theme-0-a50);

/* controls */
--controls-bg: var(--theme-600-a50);
--controls-bg-hover: var(--theme-600);
}

:root[data-theme='light'] {
Expand Down Expand Up @@ -124,6 +140,16 @@
--header-bg: var(--bg-800);
--chain-editor-bg: var(--bg-800);
--node-selector-bg: var(--bg-800);

/* minimap */
--minimap-bg: var(--theme-300-a75);
--minimap-node: var(--theme-0-a75);
--minimap-mask-fill: var(--theme-300-a75);
--minimap-mask-stroke: var(--theme-0-a75);

/* controls */
--controls-bg: var(--theme-300-a75);
--controls-bg-hover: var(--theme-400);
}

// Default theme (copied from Chakra UI)
Expand Down
56 changes: 28 additions & 28 deletions src/renderer/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,36 +123,36 @@ body {
background: var(--theme-300) !important;
}

.react-flow__controls-button {
border: 0 solid black !important;
background: var(--controls-bg) !important;

&:not(:disabled):hover {
background: var(--controls-bg-hover) !important;
border: 0 solid black !important;
}

&:not(:disabled) > svg {
fill: black;
}
}

.react-flow__minimap {
background-color: rgb(
220 227 234 / 80%
background-color: var(
--minimap-bg
); /* - defines base minimap opacity, everything sits on top of this */
}

.react-flow__minimap-node {
fill: rgb(255 255 255 / 75%);
fill: var(--minimap-node);
stroke: none;
}

.react-flow__minimap-mask {
fill: rgb(220 227 234 / 50%);
stroke: rgb(255 255 255 / 100%);
fill: var(--minimap-mask-fill);
stroke: var(--minimap-mask-stroke);
stroke-width: 15;
}

.react-flow__controls-button {
border: 0 solid rgb(113 128 150 / 66%) !important;
background: rgb(203 213 224 / 66%) !important;

&:not(:disabled):hover {
background: var(--theme-400) !important;
border: 0 solid var(--theme-500) !important;
}

&:disabled > svg {
fill: var(--theme-400);
}
}
}

[data-theme='dark'] {
Expand All @@ -161,12 +161,12 @@ body {
}

.react-flow__controls-button {
border: 0 solid rgb(74 85 104 / 66%) !important;
background: rgb(45 55 72 / 66%) !important;
border: 0 solid white !important;
background: var(--controls-bg) !important;

&:not(:disabled):hover {
background: var(--theme-600) !important;
border: 0 solid var(--theme-600) !important;
background: var(--controls-bg-hover) !important;
border: 0 solid white !important;
}

&:not(:disabled) > svg {
Expand All @@ -175,19 +175,19 @@ body {
}

.react-flow__minimap {
background-color: rgb(
49 58 72 / 80%
background-color: var(
--minimap-bg
); /* - defines base minimap opacity, everything sits on top of this */
}

.react-flow__minimap-node {
fill: rgb(255 255 255 / 50%);
fill: var(--minimap-node);
stroke: none;
}

.react-flow__minimap-mask {
fill: rgb(49 58 72 / 80%);
stroke: rgb(255 255 255 / 50%);
fill: var(--minimap-mask-fill);
stroke: var(--minimap-mask-stroke);
stroke-width: 15;
}
}
Expand Down