From 8bd2043a40e1be15ad31a23a1b9ab0e4ef925667 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 4 May 2020 10:50:34 -0400
Subject: [PATCH 1/2] widget-factory: Add .toolbar

We dropped GtkToobar, but we still want to present
something that looks the part here, so add a style
class.
---
 demos/widget-factory/widget-factory.ui | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index a1edb04db9..d9b2a20c4f 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1916,6 +1916,9 @@ microphone-sensitivity-medium-symbolic</property>
                                     </child>
                                     <child>
                                       <object class="GtkBox" id="toolbar">
+                                        <style>
+                                          <class name="toolbar"/>
+                                        </style>
                                         <child>
                                           <object class="GtkButton">
                                             <property name="label" translatable="yes">New</property>

From 53d86d411a255dc04f64442f44ee9fc62a95dabd Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 4 May 2020 10:51:11 -0400
Subject: [PATCH 2/2] Adwaita: Style .toolbar

We don't have GtkToolbar anymore, so we are more likely
to meet a .toolbar style class, than a toolbar element.
---
 gtk/theme/Adwaita/_common.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index ba1e6738dd..fdb9fe31c7 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1291,6 +1291,7 @@ combobox {
   background-color: $bg_color;
 }
 
+.toolbar,
 toolbar {
   @extend %toolbar;