From dc144d12662661e61d4d2607af7dbf108ded1fb9 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Mon, 21 Jan 2019 19:34:33 +0100 Subject: [PATCH] Adwaita: do show labels on switches - now that we have I/O and not ON/OFF --- gtk/theme/Adwaita/_common.scss | 3 +-- gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++-- gtk/theme/Adwaita/gtk-contained.css | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index b5190d2bea..7f109357a4 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2727,7 +2727,7 @@ treeview ~ scrollbar.vertical { **********/ switch { font-weight: bold; - font-size: smaller; + font-size: x-small; outline-offset: -4px; // similar to the .scale @@ -2736,7 +2736,6 @@ switch { color: $fg_color; background-color: $dark_fill; text-shadow: 0 1px transparentize(black, 0.9); - font-size: 0; /*FIXME: quick workaround for the labels*/ &:checked { color: $selected_fg_color; diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index e1eab1a000..5cd34c9907 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -505,7 +505,7 @@ spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.1); spinbutton:not(.vertical) button:backdrop { color: #8c8c8c; background-color: transparent; border-color: rgba(42, 42, 43, 0.3); transition: 200ms ease-out; } -spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(101, 100, 102, 0.3); background-color: transparent; border-style: none none none solid; } +spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(101, 100, 102, 0.3); background-color: transparent; background-image: none; border-style: none none none solid; } spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } @@ -1077,7 +1077,7 @@ scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-start-sym treeview ~ scrollbar.vertical { border-top: 1px solid #252526; margin-top: -1px; } /********** Switch * */ -switch { font-weight: bold; font-size: smaller; outline-offset: -4px; border: 1px solid #252526; border-radius: 14px; color: #eeeeec; background-color: #323233; text-shadow: 0 1px rgba(0, 0, 0, 0.1); font-size: 0; /*FIXME: quick workaround for the labels*/ } +switch { font-weight: bold; font-size: x-small; outline-offset: -4px; border: 1px solid #252526; border-radius: 14px; color: #eeeeec; background-color: #323233; text-shadow: 0 1px rgba(0, 0, 0, 0.1); } switch:checked { color: #ffffff; border-color: #030c17; background-color: #15539e; text-shadow: 0 1px rgba(3, 12, 23, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 02ae206a86..5e24cbacfa 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -513,7 +513,7 @@ spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.1); spinbutton:not(.vertical) button:backdrop { color: #9d9f9f; background-color: transparent; border-color: rgba(213, 208, 204, 0.3); transition: 200ms ease-out; } -spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(212, 207, 202, 0.3); background-color: transparent; border-style: none none none solid; } +spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(212, 207, 202, 0.3); background-color: transparent; background-image: none; border-style: none none none solid; } spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } @@ -1085,7 +1085,7 @@ scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-start-sym treeview ~ scrollbar.vertical { border-top: 1px solid #cdc7c2; margin-top: -1px; } /********** Switch * */ -switch { font-weight: bold; font-size: smaller; outline-offset: -4px; border: 1px solid #cdc7c2; border-radius: 14px; color: #2e3436; background-color: #e1dedb; text-shadow: 0 1px rgba(0, 0, 0, 0.1); font-size: 0; /*FIXME: quick workaround for the labels*/ } +switch { font-weight: bold; font-size: x-small; outline-offset: -4px; border: 1px solid #cdc7c2; border-radius: 14px; color: #2e3436; background-color: #e1dedb; text-shadow: 0 1px rgba(0, 0, 0, 0.1); } switch:checked { color: #ffffff; border-color: #185fb4; background-color: #3584e4; text-shadow: 0 1px rgba(24, 95, 180, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }