From fb197aa32ec840aa6ff7f2e7c455489bb001a539 Mon Sep 17 00:00:00 2001 From: Matthias Metelka <62722460+kleinerpirat@users.noreply.github.com> Date: Tue, 16 Aug 2022 14:16:22 +0200 Subject: [PATCH] Remove --medium-border variable --- qt/aqt/browser/sidebar/tree.py | 2 +- qt/aqt/data/web/css/deckbrowser.scss | 2 +- sass/_button-mixins.scss | 2 +- ts/components/ButtonDropdown.svelte | 2 +- ts/components/DropdownMenu.svelte | 2 +- ts/components/StickyContainer.svelte | 2 +- ts/deck-options/TitledContainer.svelte | 2 +- ts/editor/Notification.svelte | 2 +- ts/editor/legacy.scss | 2 +- ts/import-csv/Preview.svelte | 2 +- ts/tag-editor/Tag.svelte | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt/aqt/browser/sidebar/tree.py b/qt/aqt/browser/sidebar/tree.py index d173d65e0..972e1555e 100644 --- a/qt/aqt/browser/sidebar/tree.py +++ b/qt/aqt/browser/sidebar/tree.py @@ -104,7 +104,7 @@ class SidebarTreeView(QTreeView): def _setup_style(self) -> None: # match window background color and tweak style bgcolor = QPalette().window().color().name() - border = theme_manager.color(colors.MEDIUM_BORDER) + border = theme_manager.color(colors.BORDER) styles = [ "padding: 3px", "padding-right: 0px", diff --git a/qt/aqt/data/web/css/deckbrowser.scss b/qt/aqt/data/web/css/deckbrowser.scss index 4e32bcc46..72c94a145 100644 --- a/qt/aqt/data/web/css/deckbrowser.scss +++ b/qt/aqt/data/web/css/deckbrowser.scss @@ -79,7 +79,7 @@ body { } .callout { - background: var(--medium-border); + background: var(--border); padding: 1em; margin: 1em; diff --git a/sass/_button-mixins.scss b/sass/_button-mixins.scss index aa7f74961..cb772eff4 100644 --- a/sass/_button-mixins.scss +++ b/sass/_button-mixins.scss @@ -23,7 +23,7 @@ $btn-base-color-day: white; @mixin btn-day-base { color: var(--text-fg); background-color: $btn-base-color-day; - border-color: var(--medium-border) !important; + border-color: var(--border) !important; } @mixin btn-day( diff --git a/ts/components/ButtonDropdown.svelte b/ts/components/ButtonDropdown.svelte index 0a3ebe0c0..22c77cfc4 100644 --- a/ts/components/ButtonDropdown.svelte +++ b/ts/components/ButtonDropdown.svelte @@ -32,7 +32,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html padding: calc(var(--buttons-size) / 10) 0; background-color: var(--window-bg); - border-color: var(--medium-border); + border-color: var(--border); :global(.btn-group) { position: static; diff --git a/ts/components/DropdownMenu.svelte b/ts/components/DropdownMenu.svelte index 4720a4fe4..559f890a1 100644 --- a/ts/components/DropdownMenu.svelte +++ b/ts/components/DropdownMenu.svelte @@ -33,7 +33,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html .dropdown-menu { border-radius: 5px; background-color: var(--frame-bg); - border-color: var(--medium-border); + border-color: var(--border); min-width: 1rem; } diff --git a/ts/components/StickyContainer.svelte b/ts/components/StickyContainer.svelte index f64507d41..bb4602c35 100644 --- a/ts/components/StickyContainer.svelte +++ b/ts/components/StickyContainer.svelte @@ -31,7 +31,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html background: var(--sticky-bg, var(--window-bg)); border-style: solid; - border-color: var(--sticky-border, var(--medium-border)); + border-color: var(--sticky-border, var(--border)); border-width: var(--sticky-borders, 0); } diff --git a/ts/deck-options/TitledContainer.svelte b/ts/deck-options/TitledContainer.svelte index 7fb1e4ed0..d4e75ee56 100644 --- a/ts/deck-options/TitledContainer.svelte +++ b/ts/deck-options/TitledContainer.svelte @@ -16,6 +16,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/ts/editor/Notification.svelte b/ts/editor/Notification.svelte index 297232856..d92874576 100644 --- a/ts/editor/Notification.svelte +++ b/ts/editor/Notification.svelte @@ -15,7 +15,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html background-color: var(--notification-bg, var(--window-bg)); user-select: none; - border: 1px solid var(--medium-border); + border: 1px solid var(--border); border-radius: 5px; padding: 0.9rem 1.2rem; } diff --git a/ts/editor/legacy.scss b/ts/editor/legacy.scss index 1bf6d591b..f92cb621a 100644 --- a/ts/editor/legacy.scss +++ b/ts/editor/legacy.scss @@ -15,7 +15,7 @@ $padding: 2px; color: var(--text-fg); font-size: calc($size * 0.6); background-color: $btn-base-color-day; - border: 1px solid var(--medium-border); + border: 1px solid var(--border); @include button.btn-border-radius; margin-left: -1px; diff --git a/ts/import-csv/Preview.svelte b/ts/import-csv/Preview.svelte index 5b476dd2d..a70587830 100644 --- a/ts/import-csv/Preview.svelte +++ b/ts/import-csv/Preview.svelte @@ -48,7 +48,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html } th { - background: var(--medium-border); + background: var(--border); text-align: center; } diff --git a/ts/tag-editor/Tag.svelte b/ts/tag-editor/Tag.svelte index acf66d446..2e08fe25a 100644 --- a/ts/tag-editor/Tag.svelte +++ b/ts/tag-editor/Tag.svelte @@ -61,7 +61,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html font-size: var(--base-font-size); padding: 0; - --border-color: var(--medium-border); + --border-color: var(--border); border: 1px solid var(--border-color) !important; border-radius: 5px;