From 7dbd3da2dd1e3986379cf9a24d96bc1e023f2b01 Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Wed, 20 Jun 2018 20:24:19 +0100 Subject: [PATCH] Adwaita: Don't use a property that GTK+ 3 lacks border-spacing was not backported (yet?). If it won't be, then a suitable replacement is needed. Until then, avoid the runtime error that can result from using a nonexistent property in our theme. https://gitlab.gnome.org/GNOME/gtk/issues/1166 --- gtk/theme/Adwaita/_common.scss | 3 ++- gtk/theme/Adwaita/gtk-contained-dark.css | 2 +- gtk/theme/Adwaita/gtk-contained.css | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index f095083b8f..9a8b87fefa 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -4573,7 +4573,8 @@ popover.emoji-completion arrow { } popover.emoji-completion contents row box { - border-spacing: 10px; + // FIXME: needs redone in a GTK+ 3 compatible way + //border-spacing: 10px; padding: 2px 10px; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 858a957006..67a33a7248 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1936,7 +1936,7 @@ popover.emoji-picker .emoji :hover { background: #215d9c; } popover.emoji-completion arrow { border: none; background: none; } -popover.emoji-completion contents row box { border-spacing: 10px; padding: 2px 10px; } +popover.emoji-completion contents row box { padding: 2px 10px; } popover.emoji-completion .emoji:hover { background: #3f4649; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 123d2d3355..6df556387c 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1956,7 +1956,7 @@ popover.emoji-picker .emoji :hover { background: #4a90d9; } popover.emoji-completion arrow { border: none; background: none; } -popover.emoji-completion contents row box { border-spacing: 10px; padding: 2px 10px; } +popover.emoji-completion contents row box { padding: 2px 10px; } popover.emoji-completion .emoji:hover { background: #f4f4f4; }