Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master See merge request GNOME/gtk!1826
2024-11-15 21:20:09 +00:00 · 2020-05-04 19:02:40 +00:00 · 2020-05-04 19:02:40 +00:00 · 188a61f02d
commit 188a61f02d
parent 2d1b7d128e 53d86d411a
2 changed files with 4 additions and 0 deletions
--- 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>
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@ -1263,6 +1263,7 @@ combobox {
  background-color: $bg_color;
 }

+.toolbar,
 toolbar {
  @extend %toolbar;