From 8eab10dabf201d15448f82093f3d339c6b374d6d Mon Sep 17 00:00:00 2001
From: Jakub Steiner <jimmac@gmail.com>
Date: Mon, 14 Sep 2020 11:58:13 +0200
Subject: [PATCH] Adwaita: whitespace for the grid

- separate labels
- 12px margins around cells

Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/3164
---
 gtk/theme/Adwaita/_common.scss | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index c0f291478e..789eef45b5 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -137,6 +137,11 @@ gridview {
 
       @extend %selected_items;
     }
+
+    box { //cells
+      border-spacing: 8px; //label separation
+      margin: 12px;
+    }
   }
 }
 
@@ -146,16 +151,6 @@ coverflow cover {
   border: 1px solid black;
 }
 
-.content-view .tile {
-  margin: 2px;
-  background-color: if($variant=='light', transparent, black);
-  border-radius: 0;
-  padding: 0;
-
-  &:active, &:selected { background-color: if($variant=='light', transparent, $selected_bg_color); }
-  &:disabled { background-color: if($variant=='light', transparent, $insensitive_bg_color); }
-}
-
 label {
   @include focus-ring();
 
@@ -3799,6 +3794,16 @@ colorchooser .popover.osd { border-radius: 5px; }
 
   &:hover { -gtk-icon-filter: brightness(1.2); }
 
+  .tile {
+    margin: 2px;
+    background-color: if($variant=='light', transparent, black);
+    border-radius: 0;
+    padding: 0;
+
+    &:active, &:selected { background-color: if($variant=='light', transparent, $selected_bg_color); }
+    &:disabled { background-color: if($variant=='light', transparent, $insensitive_bg_color); }
+}
+
   > rubberband { @extend rubberband; }
 
 }