[gtk+/wip/dboles/emoji-css: 3/8] Adwaita: Make use of SASS syntax for emoji stuff
- From: Daniel Boles <dboles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/dboles/emoji-css: 3/8] Adwaita: Make use of SASS syntax for emoji stuff
- Date: Sat, 2 Sep 2017 13:50:07 +0000 (UTC)
commit 3c792b4e51762e6a84ae851fe70f8ce10372fead
Author: Daniel Boles <dboles src gnome org>
Date: Sat Sep 2 13:46:23 2017 +0100
Adwaita: Make use of SASS syntax for emoji stuff
This makes the theme easier to maintain.
https://bugzilla.gnome.org/show_bug.cgi?id=786956
gtk/theme/Adwaita/_common.scss | 34 +++++++++++++----------------
gtk/theme/Adwaita/gtk-contained-dark.css | 12 ++++------
gtk/theme/Adwaita/gtk-contained.css | 12 ++++------
3 files changed, 25 insertions(+), 33 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 7a76663..44ed9ce 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4441,32 +4441,28 @@ button.emoji-section {
text-shadow: none;
outline-offset: -5px;
-}
-
-button.emoji-section label { padding: 0; }
-
-button.emoji-section:hover { border-color: $borders_color; }
-
-button.emoji-section:checked { border-color: $selected_bg_color; }
-
-button.emoji-section:backdrop:not(:checked) { border-color: transparent; }
-
-button.emoji-section { color: $borders_color; }
-
-button.emoji-section:hover { color: mix($fg_color, $borders_color, 0.5); }
-button.emoji-section:checked { color: $fg_color; }
+ &:backdrop:not(:checked) { border-color: transparent; }
+ &:hover { border-color: $borders_color; }
+ &:checked { border-color: $selected_bg_color; }
-button.emoji-section:backdrop { color: $backdrop_borders_color; }
+ color: $borders_color;
+ &:hover { color: mix($fg_color, $borders_color, 0.5); }
+ &:checked { color: $fg_color; }
+ &:backdrop { color: $backdrop_borders_color; }
+ &:backdrop:checked { color: $backdrop_fg_color; }
-button.emoji-section:backdrop:checked { color: $backdrop_fg_color; }
+ label {
+ padding: 0;
+ }
+}
.emoji {
font-size: x-large;
padding: 6px;
border-radius: 6px;
-}
-.emoji :hover {
- background: $selected_bg_color;
+ &:hover {
+ background: $selected_bg_color;
+ }
}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 7ad9b23..b4d81d7 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1899,18 +1899,14 @@ 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; }
+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 label { padding: 0; }
+button.emoji-section:backdrop:not(:checked) { border-color: transparent; }
button.emoji-section:hover { border-color: #1b1f20; }
button.emoji-section:checked { border-color: #215d9c; }
-button.emoji-section:backdrop:not(:checked) { border-color: transparent; }
-
-button.emoji-section { color: #1b1f20; }
-
button.emoji-section:hover { color: #1c2021; }
button.emoji-section:checked { color: #eeeeec; }
@@ -1919,9 +1915,11 @@ button.emoji-section:backdrop { color: #202425; }
button.emoji-section:backdrop:checked { color: #919494; }
+button.emoji-section label { padding: 0; }
+
.emoji { font-size: x-large; padding: 6px; border-radius: 6px; }
-.emoji :hover { background: #215d9c; }
+.emoji:hover { background: #215d9c; }
/* GTK NAMED COLORS ---------------- use responsibly! */
/*
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 7367fc2..de3e997 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1919,18 +1919,14 @@ 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; }
+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 label { padding: 0; }
+button.emoji-section:backdrop:not(:checked) { border-color: transparent; }
button.emoji-section:hover { border-color: #b6b6b3; }
button.emoji-section:checked { border-color: #4a90d9; }
-button.emoji-section:backdrop:not(:checked) { border-color: transparent; }
-
-button.emoji-section { color: #b6b6b3; }
-
button.emoji-section:hover { color: #b5b5b2; }
button.emoji-section:checked { color: #2e3436; }
@@ -1939,9 +1935,11 @@ button.emoji-section:backdrop { color: #c0c0bd; }
button.emoji-section:backdrop:checked { color: #8b8e8f; }
+button.emoji-section label { padding: 0; }
+
.emoji { font-size: x-large; padding: 6px; border-radius: 6px; }
-.emoji :hover { background: #4a90d9; }
+.emoji:hover { background: #4a90d9; }
/* GTK NAMED COLORS ---------------- use responsibly! */
/*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]