From e00030dff279b6d83a60164335e77d0edb6a455e Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 3 Feb 2020 17:34:29 +0100 Subject: [PATCH] css: Remove .primary-toolbar It's not used anywhere anymore. --- demos/gtk-demo/themes.ui | 98 ------------- demos/gtk-demo/theming.ui | 97 ------------ docs/reference/gtk/gtk4-sections.txt | 1 - gtk/gtkstylecontext.h | 9 -- gtk/theme/Adwaita/_common.scss | 2 - gtk/theme/HighContrast/_common.scss | 2 - po-properties/POTFILES.skip | 1 - po/POTFILES.skip | 1 - tests/visuals/primary-toolbar.ui | 211 --------------------------- 9 files changed, 422 deletions(-) delete mode 100644 tests/visuals/primary-toolbar.ui diff --git a/demos/gtk-demo/themes.ui b/demos/gtk-demo/themes.ui index f921205284..7d023658b2 100644 --- a/demos/gtk-demo/themes.ui +++ b/demos/gtk-demo/themes.ui @@ -15,104 +15,6 @@ 10 10 vertical - - - 1 - 0 - - - - 1 - Normal - 1 - 1 - edit-find - - - - - 1 - Active - 1 - 1 - edit-find - 1 - - - - - 1 - 0 - Insensitive - 1 - 1 - edit-find - - - - - 1 - Raised - 1 - 1 - edit-find - - - - - - 1 - Raised Active - 1 - 1 - edit-find - 1 - - - - - - 1 - 0 - Insensitive Active - 1 - edit-find - 1 - 1 - - - - - - - 1 - 10 - • - Search... - edit-find-symbolic - - - - - - - - - 1 - center - Switch it - - - - - - center diff --git a/demos/gtk-demo/theming.ui b/demos/gtk-demo/theming.ui index b5bc13b1a8..431dd2e3cd 100644 --- a/demos/gtk-demo/theming.ui +++ b/demos/gtk-demo/theming.ui @@ -4,103 +4,6 @@ 10 10 vertical - - - 1 - 0 - - - - 1 - Normal - 1 - 1 - edit-find - - - - - 1 - Active - 1 - 1 - edit-find - 1 - - - - - 1 - 0 - Insensitive - 1 - 1 - edit-find - - - - - 1 - Raised - 1 - 1 - edit-find - - - - - - 1 - Raised Active - 1 - 1 - edit-find - 1 - - - - - - 1 - 0 - Insensitive Active - 1 - edit-find - 1 - 1 - - - - - - - 1 - • - Search... - edit-find-symbolic - - - - - - - - - 1 - center - Switch it - - - - - - center diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 5747a62fe8..1b204416a7 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -4764,7 +4764,6 @@ GTK_STYLE_CLASS_PANE_SEPARATOR GTK_STYLE_CLASS_PAPER GTK_STYLE_CLASS_POPUP GTK_STYLE_CLASS_POPOVER -GTK_STYLE_CLASS_PRIMARY_TOOLBAR GTK_STYLE_CLASS_PROGRESSBAR GTK_STYLE_CLASS_PULSE GTK_STYLE_CLASS_QUESTION diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h index 29820d7068..881e110689 100644 --- a/gtk/gtkstylecontext.h +++ b/gtk/gtkstylecontext.h @@ -240,15 +240,6 @@ struct _GtkStyleContextClass */ #define GTK_STYLE_CLASS_TOOLBAR "toolbar" -/** - * GTK_STYLE_CLASS_PRIMARY_TOOLBAR: - * - * A CSS class to match primary toolbars. - * - * Refer to individual widget documentation for used style classes. - */ -#define GTK_STYLE_CLASS_PRIMARY_TOOLBAR "primary-toolbar" - /** * GTK_STYLE_CLASS_STATUSBAR: * diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 57fcaf7eaa..d86b36a0c2 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -825,8 +825,6 @@ button { > box > box > label { font-weight: bold; } } - .primary-toolbar & { -gtk-icon-shadow: none; } // tango icons don't need shadows - .linked:not(.vertical) > & { @extend %linked; } .linked.vertical > & { @extend %linked_vertical; } diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index dbd9d71bd0..9bd5835ba0 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -686,8 +686,6 @@ button { } } - .primary-toolbar & { -gtk-icon-shadow: none; } // tango icons don't need shadows - .linked:not(.vertical) > & { @extend %linked; } .linked.vertical > & { @extend %linked_vertical; } diff --git a/po-properties/POTFILES.skip b/po-properties/POTFILES.skip index 0404292882..cc6bf71df7 100644 --- a/po-properties/POTFILES.skip +++ b/po-properties/POTFILES.skip @@ -355,5 +355,4 @@ testsuite/tools/simplify-data-3to4/stack.ui testsuite/tools/simplify-data/test3.ui tests/visuals/linked-buttons-horizontal.ui tests/visuals/linked-buttons-vertical.ui -tests/visuals/primary-toolbar.ui tests/visuals/suggested-action-buttons.ui diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 6d64001736..2a059363a3 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -315,5 +315,4 @@ testsuite/tools/simplify-data-3to4/stack.ui testsuite/tools/simplify-data/test3.ui tests/visuals/linked-buttons-horizontal.ui tests/visuals/linked-buttons-vertical.ui -tests/visuals/primary-toolbar.ui tests/visuals/suggested-action-buttons.ui diff --git a/tests/visuals/primary-toolbar.ui b/tests/visuals/primary-toolbar.ui deleted file mode 100644 index 31632c363a..0000000000 --- a/tests/visuals/primary-toolbar.ui +++ /dev/null @@ -1,211 +0,0 @@ - - - - - False - 800 - - - 6 - vertical - - - True - False - True - - - - False - True - False - False - Normal - True - True - edit-find - - - False - True - - - - - False - True - False - False - Active - True - True - edit-find - True - - - False - True - - - - - False - True - False - False - Insensitive - True - True - edit-find - - - False - True - - - - - False - True - False - False - Insensitive Active - True - edit-find - True - True - - - False - True - - - - - False - True - False - - - True - True - • - Search... - edit-find-symbolic - - - - - False - - - - - False - True - False - - - True - True - - - - - False - - - - - - - True - False - True - - - - False - True - False - Normal - True - True - edit-find-symbolic - - - - False - True - - - - - False - True - False - Active - True - True - edit-find-symbolic - True - - - - False - True - - - - - False - True - False - False - Insensitive - True - True - edit-find-symbolic - - - - False - True - - - - - False - True - False - False - Insensitive Active - True - edit-find-symbolic - True - True - - - - False - True - - - - - - - -