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

add toolbar labels and button borders to theming w/ dark mode edits #4727

Merged
merged 1 commit into from
Oct 15, 2021
Merged

add toolbar labels and button borders to theming w/ dark mode edits #4727

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
12 changes: 10 additions & 2 deletions src/react-components/input/Button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

:local(.basic), :local(.transparent) {
color: theme.$text4-color;
border: 1px solid theme.$basic-border-color;
border: 2px solid theme.$basic-border-color;
background-color: theme.$basic-color;

svg {
Expand Down Expand Up @@ -82,7 +82,8 @@
:local(.accept) {
color: theme.$text5-color;
background-color: theme.$accept-color;

border: 2px solid theme.$accept-border-color;

svg {
*[stroke=\#000] {
stroke: theme.$text5-color;
Expand All @@ -96,6 +97,7 @@
&:hover {
color: theme.$text5-color-hover;
background-color: theme.$accept-color-hover;
border: 2px solid theme.$accept-border-color;
}

&:active {
Expand Down Expand Up @@ -157,6 +159,7 @@
:local(.accent2) {
color: theme.$text5-color;
background-color: theme.$accent2-color;
border: 2px solid theme.$accent2-border-color;

svg {
*[stroke=\#000] {
Expand All @@ -171,6 +174,7 @@
&:hover {
color: theme.$text5-color-hover;
background-color: theme.$accent2-color-hover;
border: 2px solid theme.$accent2-border-color
}

&:active {
Expand Down Expand Up @@ -207,6 +211,7 @@
:local(.accent4) {
color: theme.$text5-color;
background-color: theme.$accent4-color;
border: 2px solid theme.$accent4-border-color;

svg {
*[stroke=\#000] {
Expand All @@ -221,6 +226,7 @@
&:hover {
color: theme.$text5-color-hover;
background-color: theme.$accent4-color-hover;
border: 2px solid theme.$accent4-border-color;
}

&:active {
Expand All @@ -232,6 +238,7 @@
:local(.accent5) {
color: theme.$text5-color;
background-color: theme.$accent5-color;
border: 2px solid theme.$accent5-border-color;

svg {
*[stroke=\#000] {
Expand All @@ -246,6 +253,7 @@
&:hover {
color: theme.$text5-color-hover;
background-color: theme.$accent5-color-hover;
border: 2px solid theme.$accent5-border-color;
}

&:active {
Expand Down
7 changes: 7 additions & 0 deletions src/react-components/input/TextInput.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ $input-height: 40px;
padding: 0 16px;
border-width: 0;
min-height: auto;
border: none;

&:hover {
border:none;
}


:global(.keyboard-user) &:focus {
border-width: 0;
Expand All @@ -52,6 +58,7 @@ $input-height: 40px;
border-bottom-right-radius: theme.$border-radius-regular;
}
}

}

:local(.icon-button), & > svg {
Expand Down
24 changes: 17 additions & 7 deletions src/react-components/input/ToolbarButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,15 @@
border-color: transparent;
background-color: theme.$toolbar-icon-selected-bg;
}
svg {
*[stroke=\#000] {
stroke: theme.$toolbar-basic-selected-icon-color;
}

*[fill=\#000] {
fill: theme.$toolbar-basic-selected-icon-color;
}
}

label {
color: theme.$text4-color;
Expand Down Expand Up @@ -120,11 +129,11 @@

svg {
*[stroke=\#000] {
stroke: theme.$primary-color;
stroke: theme.$toolbar-basic-icon-color;
}

*[fill=\#000] {
fill: theme.$primary-color;
fill: theme.$toolbar-basic-icon-color;
}
}
}
Expand All @@ -136,6 +145,7 @@
&:hover {
:local(.icon-container) {
border-color: theme.$primary-color-hover;
background-color: theme.$toolbar-basic-color-hover;

svg {
*[stroke=\#000] {
Expand Down Expand Up @@ -333,7 +343,7 @@
}

label {
color: theme.$accent1-color;
color: theme.$toolbar-label-accent1;
}

&:hover {
Expand Down Expand Up @@ -401,7 +411,7 @@
}

label {
color: theme.$accent2-color;
color: theme.$toolbar-label-accent2;
}

&:hover {
Expand Down Expand Up @@ -469,7 +479,7 @@
}

label {
color: theme.$accent3-color;
color: theme.$toolbar-label-accent3;
}

&:hover {
Expand Down Expand Up @@ -537,7 +547,7 @@
}

label {
color: theme.$accent4-color;
color: theme.$toolbar-label-accent4;
}

&:hover {
Expand Down Expand Up @@ -605,7 +615,7 @@
}

label {
color: theme.$accent5-color;
color: theme.$toolbar-label-accent5;
}

&:hover {
Expand Down
6 changes: 6 additions & 0 deletions src/react-components/styles/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,16 @@
--toolbar-icon-color: var(--text5-color);
--toolbar-icon-selected-bg: var(--transparent);
--toolbar-basic-icon-color: var(--text1-color);
--toolbar-basic-selected-icon-color: var(--text1-color);
--toolbar-basic-color: var(--secondary-color);
--toolbar-basic-color-hover: var(--secondary-color-hover);
--toolbar-basic-color-pressed: var(--secondary-color-pressed);
--toolbar-basic-border-color: var(--basic-border-color);
--toolbar-label-accent1: var(--accent1-color);
--toolbar-label-accent2: var(--accent2-color);
--toolbar-label-accent3: var(--accent3-color);
--toolbar-label-accent4: var(--accent4-color);
--toolbar-label-accent5: var(--accent5-color);

--tile-text-color: var(--text4-color);
--tile-bg-color: var(--secondary-color);
Expand Down
7 changes: 6 additions & 1 deletion src/react-components/styles/theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,11 +249,16 @@ $overlay-outline-color: var(--overlay-outline-color);
$toolbar-icon-color: var(--toolbar-icon-color);
$toolbar-icon-selected-bg: var(--toolbar-icon-selected-bg);
$toolbar-basic-icon-color: var(--toolbar-basic-icon-color);
$toolbar-basic-selected-icon-color: var(--toolbar-basic-selected-icon-color);
$toolbar-basic-color: var(--toolbar-basic-color);
$toolbar-basic-color-hover: var(--toolbar-basic-color-hover);
$toolbar-basic-color-pressed: var(--toolbar-basic-color-pressed);
$toolbar-basic-border-color: var(--toolbar-basic-border-color);

$toolbar-label-accent1: var(--toolbar-label-accent1);
$toolbar-label-accent2: var(--toolbar-label-accent2);
$toolbar-label-accent3: var(--toolbar-label-accent3);
$toolbar-label-accent4: var(--toolbar-label-accent4);
$toolbar-label-accent5: var(--toolbar-label-accent5);

$tile-text-color: var(--tile-text-color);
$tile-bg-color: var(--tile-bg-color);
Expand Down
10 changes: 9 additions & 1 deletion themes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,15 @@
"action-color-highlight": "#149ce2",
"action-label-color": "#5634ff",
"notice-background-color": "#000000",
"toolbar-icon-selected-bg": "#ffffff"
"toolbar-icon-selected-bg": "#ffffff",
"toolbar-basic-icon-color": "#ffffff",
"toolbar-basic-selected-icon-color": "#2B313B",
"toolbar-basic-color-hover": "#ffffff",
"toolbar-label-accent1": "#ffffff",
"toolbar-label-accent2": "#ffffff",
"toolbar-label-accent3": "#ffffff",
"toolbar-label-accent4": "#ffffff",
"toolbar-label-accent5": "#ffffff"
}
}
]