From 6aa1361a5da058b43bb8605ce844130ff17ce2dc Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Fri, 17 Dec 2021 12:55:12 -0800
Subject: [PATCH 1/4] cc-window.ui: Remove .view from sidebar

Sidebars should be the same color as window content
now.
---
 shell/cc-window.ui | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/shell/cc-window.ui b/shell/cc-window.ui
index 70fbcb00e..f4bf89f7e 100644
--- a/shell/cc-window.ui
+++ b/shell/cc-window.ui
@@ -84,9 +84,6 @@
                 <property name="vexpand">True</property>
                 <property name="width-request">200</property>
                 <property name="hscrollbar_policy">never</property>
-                <style>
-                  <class name="view"/>
-                </style>
                 <child>
                   <object class="CcPanelList" id="panel_list">
                     <property name="search-mode" bind-source="search_bar" bind-property="search-mode-enabled" bind-flags="bidirectional" />
-- 
GitLab


From d72d23a1cd3ff4580f75876572fb982bc76902d2 Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Fri, 17 Dec 2021 13:09:20 -0800
Subject: [PATCH 2/4] cc-panel-list: Remove use of `sidebar-icon` style

Generally sidebar icons aren't dimmed anymore.
---
 shell/cc-panel-list.c  | 2 --
 shell/cc-panel-list.ui | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c
index 579b3561f..7417f0c81 100644
--- a/shell/cc-panel-list.c
+++ b/shell/cc-panel-list.c
@@ -293,7 +293,6 @@ row_data_new (CcPanelCategory     category,
 
   /* Icon */
   image = gtk_image_new_from_icon_name (icon);
-  gtk_style_context_add_class (gtk_widget_get_style_context (image), "sidebar-icon");
 
   gtk_grid_attach (GTK_GRID (grid), image, 0, 0, 1, 1);
 
@@ -314,7 +313,6 @@ row_data_new (CcPanelCategory     category,
   if (has_sidebar)
     {
       image = gtk_image_new_from_icon_name ("go-next-symbolic");
-      gtk_style_context_add_class (gtk_widget_get_style_context (image), "sidebar-icon");
       gtk_grid_attach (GTK_GRID (grid), image, 2, 0, 1, 1);
     }
 
diff --git a/shell/cc-panel-list.ui b/shell/cc-panel-list.ui
index a4d7594cb..896592a67 100644
--- a/shell/cc-panel-list.ui
+++ b/shell/cc-panel-list.ui
@@ -31,9 +31,6 @@
                         <child>
                           <object class="GtkImage">
                             <property name="icon_name">preferences-system-privacy-symbolic</property>
-                            <style>
-                              <class name="sidebar-icon" />
-                            </style>
                           </object>
                         </child>
                         <child>
@@ -46,9 +43,6 @@
                         <child>
                           <object class="GtkImage">
                             <property name="icon_name">go-next-symbolic</property>
-                            <style>
-                              <class name="sidebar-icon" />
-                            </style>
                           </object>
                         </child>
                       </object>
-- 
GitLab


From 7f601f4698e7a6436b4901ef8c3b4474bd21a8b9 Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Fri, 17 Dec 2021 13:10:23 -0800
Subject: [PATCH 3/4] applications: Remove use of sidebar-icon style

---
 panels/applications/cc-applications-panel.css | 4 ----
 panels/applications/cc-applications-row.ui    | 2 --
 2 files changed, 6 deletions(-)

diff --git a/panels/applications/cc-applications-panel.css b/panels/applications/cc-applications-panel.css
index 538a9c9f4..c28771d9f 100644
--- a/panels/applications/cc-applications-panel.css
+++ b/panels/applications/cc-applications-panel.css
@@ -5,7 +5,3 @@
 .section-subtitle {
   opacity: 0.55;
 }
-
-.sidebar-icon.fullcolor {
-  opacity: 1;
-}
diff --git a/panels/applications/cc-applications-row.ui b/panels/applications/cc-applications-row.ui
index 5894dd8dd..5bd6e0931 100644
--- a/panels/applications/cc-applications-row.ui
+++ b/panels/applications/cc-applications-row.ui
@@ -12,8 +12,6 @@
           <object class="GtkImage" id="image">
             <property name="pixel-size">32</property>
             <style>
-              <class name="sidebar-icon"/>
-              <class name="fullcolor"/>
               <class name="lowres-icon"/>
             </style>
           </object>
-- 
GitLab


From 58e3d7873a8470afbbc23cee90c044f9d4995fd2 Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Fri, 17 Dec 2021 13:32:03 -0800
Subject: [PATCH 4/4] cc-panel-list: Adjust margins for sidebar rows

This matches the mockups and Patterns.
---
 shell/cc-panel-list.c  | 4 ++--
 shell/cc-panel-list.ui | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c
index 7417f0c81..9ab6b7b80 100644
--- a/shell/cc-panel-list.c
+++ b/shell/cc-panel-list.c
@@ -287,8 +287,8 @@ row_data_new (CcPanelCategory     category,
   gtk_widget_set_hexpand (grid, TRUE);
   gtk_widget_set_margin_top (grid, 12);
   gtk_widget_set_margin_bottom (grid, 12);
-  gtk_widget_set_margin_start (grid, 12);
-  gtk_widget_set_margin_end (grid, 12);
+  gtk_widget_set_margin_start (grid, 6);
+  gtk_widget_set_margin_end (grid, 6);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
 
   /* Icon */
diff --git a/shell/cc-panel-list.ui b/shell/cc-panel-list.ui
index 896592a67..b0c380b4b 100644
--- a/shell/cc-panel-list.ui
+++ b/shell/cc-panel-list.ui
@@ -23,8 +23,8 @@
                     <property name="visible">False</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="margin-start">12</property>
-                        <property name="margin-end">12</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">6</property>
                         <property name="margin-top">12</property>
                         <property name="margin-bottom">12</property>
                         <property name="spacing">12</property>
-- 
GitLab