[gtk/matthiasc/for-master] Replace .emoji with emoji for css
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/for-master] Replace .emoji with emoji for css
- Date: Thu, 23 Jan 2020 18:30:56 +0000 (UTC)
commit ec4d5dc09371e7ac1f0e7bd8a1373422ec7c0224
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jan 23 11:26:52 2020 -0500
Replace .emoji with emoji for css
gtk/gtkemojichooser.c | 3 +--
gtk/theme/Adwaita/_common.scss | 4 ++--
gtk/theme/Adwaita/gtk-contained-dark.css | 6 +++---
gtk/theme/Adwaita/gtk-contained.css | 6 +++---
4 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c
index ab52915b84..9865ce8aeb 100644
--- a/gtk/gtkemojichooser.c
+++ b/gtk/gtkemojichooser.c
@@ -387,8 +387,7 @@ add_emoji (GtkWidget *box,
return;
}
- child = gtk_flow_box_child_new ();
- gtk_style_context_add_class (gtk_widget_get_style_context (child), "emoji");
+ child = g_object_new (GTK_TYPE_FLOW_BOX_CHILD, "css-name", "emoji", NULL);
g_object_set_data_full (G_OBJECT (child), "emoji-data",
g_variant_ref (item),
(GDestroyNotify)g_variant_unref);
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 9c830a10e2..0a39c17a65 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4785,7 +4785,7 @@ button.emoji-section {
&:checked label { opacity: 1; }
}
-popover.emoji-picker .emoji {
+popover.emoji-picker emoji {
font-size: x-large;
padding: 6px;
border-radius: 6px;
@@ -4800,7 +4800,7 @@ popover.emoji-completion contents row box {
padding: 2px 10px;
}
-popover.emoji-completion .emoji:hover {
+popover.emoji-completion emoji:hover {
background-color: $popover_hover_color;
}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index c690797663..4ecfc059fa 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1978,13 +1978,13 @@ button.emoji-section:hover label { opacity: 0.775; }
button.emoji-section:checked label { opacity: 1; }
-popover.emoji-picker .emoji { font-size: x-large; padding: 6px; border-radius: 6px; }
+popover.emoji-picker emoji { font-size: x-large; padding: 6px; border-radius: 6px; }
-popover.emoji-picker .emoji:hover { background: #15539e; }
+popover.emoji-picker emoji:hover { background: #15539e; }
popover.emoji-completion contents row box { border-spacing: 10px; padding: 2px 10px; }
-popover.emoji-completion .emoji:hover { background-color: #424242; }
+popover.emoji-completion emoji:hover { background-color: #424242; }
popover.entry-completion contents { padding: 0; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index e84ba10a32..b36db4db3d 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1994,13 +1994,13 @@ button.emoji-section:hover label { opacity: 0.775; }
button.emoji-section:checked label { opacity: 1; }
-popover.emoji-picker .emoji { font-size: x-large; padding: 6px; border-radius: 6px; }
+popover.emoji-picker emoji { font-size: x-large; padding: 6px; border-radius: 6px; }
-popover.emoji-picker .emoji:hover { background: #3584e4; }
+popover.emoji-picker emoji:hover { background: #3584e4; }
popover.emoji-completion contents row box { border-spacing: 10px; padding: 2px 10px; }
-popover.emoji-completion .emoji:hover { background-color: white; }
+popover.emoji-completion emoji:hover { background-color: white; }
popover.entry-completion contents { padding: 0; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]