Skip to content

Commit

Permalink
Fix dark theme bugs
Browse files Browse the repository at this point in the history
Updates #5433.
Updates #5439.
Updates #5441.
Updates #5442.

Squashed commit of the following:

commit 8a25010
Merge: a336858 3a0b27e
Author: Arseny Lisin <a.lisin@adguard.com>
Date:   Wed Feb 22 13:04:58 2023 +0200

    Merge branch 'master' into 5433-dark-theme-bugs

commit a336858
Author: Arseny Lisin <a.lisin@adguard.com>
Date:   Wed Feb 22 11:08:29 2023 +0200

    Review fix

commit 4260601
Author: Arseny Lisin <a.lisin@adguard.com>
Date:   Tue Feb 21 15:47:41 2023 +0200

    Fix checkbox, dots bg color in dark mode

commit ea5602f
Author: Arseny Lisin <a.lisin@adguard.com>
Date:   Tue Feb 21 13:59:12 2023 +0200

    Fix dark theme bugs
  • Loading branch information
Arseny Lisin committed Feb 22, 2023
1 parent 3a0b27e commit 304f2ba
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 8 deletions.
10 changes: 10 additions & 0 deletions client/src/components/App/index.css
Expand Up @@ -30,6 +30,11 @@
--loading-bg: rgba(255, 255, 255, 0.48);
--font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace;
--font-size-disable-autozoom: 1rem;
--alert-message-color: #24426c;
--alert-message-border: #cbdbf2;
--alert-message-bg: #dae5f5;
--checkbox-bg: #e2e2e2;
--radio-bg: #ffffff;
}

[data-theme="dark"] {
Expand Down Expand Up @@ -59,6 +64,11 @@
--detailed-info-color: #fff;
--gray300: #f3f3f3;
--loading-bg: #131313;
--alert-message-color: #e6e6e6;
--alert-message-border: #363648;
--alert-message-bg: #363648;
--checkbox-bg: #a4a4a4;
--radio-bg: #a4a4a4;
}

body {
Expand Down
8 changes: 8 additions & 0 deletions client/src/components/Logs/Logs.css
Expand Up @@ -130,6 +130,10 @@
background-color: transparent !important;
}

[data-theme="dark"] .form-control--transparent option {
background-color: var(--card-bgcolor);
}

.input-group-search {
background-color: transparent;
position: relative;
Expand Down Expand Up @@ -400,6 +404,10 @@
background-color: var(--logs__row--blue-bgcolor);
}

[data-theme="dark"] .logs__row--blue .logs__text--link {
color: var(--white);
}

.logs__row--green {
background-color: var(--green-pale);
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/ui/Checkbox.css
Expand Up @@ -48,7 +48,7 @@
height: 20px;
min-width: 20px;
margin-right: 10px;
background-color: #e2e2e2;
background-color: var(--checkbox-bg);
background-repeat: no-repeat;
background-position: center center;
background-size: 12px 10px;
Expand Down
14 changes: 7 additions & 7 deletions client/src/components/ui/Tabler.css
Expand Up @@ -5047,9 +5047,9 @@ tbody.collapse.show {
}

.alert-primary {
color: #24426c;
background-color: #dae5f5;
border-color: #cbdbf2;
color: var(--alert-message-color);
background-color: var(--alert-message-bg);
border-color: var(--alert-message-border);
}

.alert-primary hr {
Expand Down Expand Up @@ -5089,9 +5089,9 @@ tbody.collapse.show {
}

.alert-info {
color: #24587e;
background-color: #daeefc;
border-color: #cbe7fb;
color: var(--alert-message-color);
background-color: var(--alert-message-bg);
border-color: var(--alert-message-border);
}

.alert-info hr {
Expand Down Expand Up @@ -14317,7 +14317,7 @@ textarea[cols] {

.custom-control-label:before {
border: 1px solid rgba(0, 40, 100, 0.12);
background-color: #fff;
background-color: var(--radio-bg);
background-size: 0.5rem;
}

Expand Down

0 comments on commit 304f2ba

Please sign in to comment.