From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 23 Jan 2020 16:26:52 +0000 (-0500)
Subject: Replace .emoji with emoji for css
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~206
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cbed409f525ff65fa52affd5cb01af2c8344cb67;p=gtk4.git

Replace .emoji with emoji for css
---

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; }