[gtk+/wip/dboles/emoji-css: 5/8] Adwaita: proper colours for inactive emoji buttons
- From: Daniel Boles <dboles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/dboles/emoji-css: 5/8] Adwaita: proper colours for inactive emoji buttons
- Date: Sat, 2 Sep 2017 13:50:17 +0000 (UTC)
commit 9706861145072aaf3132cdd45d6de38d1f805a5f
Author: Daniel Boles <dboles src gnome org>
Date: Sat Sep 2 14:13:45 2017 +0100
Adwaita: proper colours for inactive emoji buttons
Use opacity to differentiate unselected/hovered/selected buttons. It had
assumed bg < border < fg colours, which may be false, as in Adwaita:dark
This also means we do not need to special-case for the backdrop state.
https://bugzilla.gnome.org/show_bug.cgi?id=786956
gtk/theme/Adwaita/_common.scss | 8 +++-----
gtk/theme/Adwaita/gtk-contained-dark.css | 10 +++-------
gtk/theme/Adwaita/gtk-contained.css | 10 +++-------
3 files changed, 9 insertions(+), 19 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 80acc75..6f315ab 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4446,11 +4446,9 @@ button.emoji-section {
&:hover { border-color: $borders_color; }
&:checked { border-color: $selected_bg_color; }
- color: $borders_color;
- &:hover { color: mix($fg_color, $borders_color, 50%); }
- &:checked { color: $fg_color; }
- &:backdrop { color: $backdrop_borders_color; }
- &:backdrop:checked { color: $backdrop_fg_color; }
+ opacity: 0.55;
+ &:hover { opacity: 0.775; }
+ &:checked { opacity: 1; }
label {
padding: 0;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index cbf1211..fc4f574 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1899,7 +1899,7 @@ stackswitcher button.circular, stackswitcher button.text-button.circular { min-w
popover.emoji-picker { padding-left: 0; padding-right: 0; }
-button.emoji-section { border-color: transparent; border-width: 3px; border-style: none none solid;
border-radius: 0; margin: 2px 4px 2px 4px; padding: 3px 0 0; min-width: 32px; min-height: 28px; /* reset
props inherited from the button style */ background: none; box-shadow: none; text-shadow: none;
outline-offset: -5px; color: #1b1f20; }
+button.emoji-section { border-color: transparent; border-width: 3px; border-style: none none solid;
border-radius: 0; margin: 2px 4px 2px 4px; padding: 3px 0 0; min-width: 32px; min-height: 28px; /* reset
props inherited from the button style */ background: none; box-shadow: none; text-shadow: none;
outline-offset: -5px; opacity: 0.55; }
button.emoji-section:backdrop:not(:checked) { border-color: transparent; }
@@ -1907,13 +1907,9 @@ button.emoji-section:hover { border-color: #1b1f20; }
button.emoji-section:checked { border-color: #215d9c; }
-button.emoji-section:hover { color: #858686; }
+button.emoji-section:hover { opacity: 0.775; }
-button.emoji-section:checked { color: #eeeeec; }
-
-button.emoji-section:backdrop { color: #202425; }
-
-button.emoji-section:backdrop:checked { color: #919494; }
+button.emoji-section:checked { opacity: 1; }
button.emoji-section label { padding: 0; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index bb8d817..029769a 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1919,7 +1919,7 @@ stackswitcher button.circular, stackswitcher button.text-button.circular { min-w
popover.emoji-picker { padding-left: 0; padding-right: 0; }
-button.emoji-section { border-color: transparent; border-width: 3px; border-style: none none solid;
border-radius: 0; margin: 2px 4px 2px 4px; padding: 3px 0 0; min-width: 32px; min-height: 28px; /* reset
props inherited from the button style */ background: none; box-shadow: none; text-shadow: none;
outline-offset: -5px; color: #b6b6b3; }
+button.emoji-section { border-color: transparent; border-width: 3px; border-style: none none solid;
border-radius: 0; margin: 2px 4px 2px 4px; padding: 3px 0 0; min-width: 32px; min-height: 28px; /* reset
props inherited from the button style */ background: none; box-shadow: none; text-shadow: none;
outline-offset: -5px; opacity: 0.55; }
button.emoji-section:backdrop:not(:checked) { border-color: transparent; }
@@ -1927,13 +1927,9 @@ button.emoji-section:hover { border-color: #b6b6b3; }
button.emoji-section:checked { border-color: #4a90d9; }
-button.emoji-section:hover { color: #727574; }
+button.emoji-section:hover { opacity: 0.775; }
-button.emoji-section:checked { color: #2e3436; }
-
-button.emoji-section:backdrop { color: #c0c0bd; }
-
-button.emoji-section:backdrop:checked { color: #8b8e8f; }
+button.emoji-section:checked { opacity: 1; }
button.emoji-section label { padding: 0; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]