From 851bb61455f08bd8defdda23251a859a97cc71e7 Mon Sep 17 00:00:00 2001 From: Alex Monday Date: Thu, 27 Jun 2019 12:39:20 +0500 Subject: [PATCH] Adwaita: Fix padding/rounding on submenus - Apply menubar submenu style for .csd submenus; - Remove child subemenu style (looks like it is inherited from a parent). Closes https://gitlab.gnome.org/GNOME/gtk/issues/1976 --- gtk/theme/Adwaita/_common.scss | 6 ++---- gtk/theme/Adwaita/gtk-contained-dark.css | 4 +--- gtk/theme/Adwaita/gtk-contained.css | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 80115f4cdf..a6a78f9fb2 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2019,11 +2019,9 @@ menubar, // remove padding and rounding from menubar submenus menu { - border-radius: 0; - padding:0; - menu { + .csd &, & { border-radius: 0; - padding:0; + padding: 0; } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 5cf5801977..2fd48b6d70 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -814,9 +814,7 @@ menubar:backdrop, .menubar:backdrop { background-color: #353535; } menubar > box > menuitem, .menubar > box > menuitem { min-height: 16px; padding: 4px 8px; } -menubar > box > menuitem menu, .menubar > box > menuitem menu { border-radius: 0; padding: 0; } - -menubar > box > menuitem menu menu, .menubar > box > menuitem menu menu { border-radius: 0; padding: 0; } +.csd menubar > box > menuitem menu, menubar > box > menuitem menu, .csd .menubar > box > menuitem menu, .menubar > box > menuitem menu { border-radius: 0; padding: 0; } menubar > box > menuitem:hover, .menubar > box > menuitem:hover { box-shadow: inset 0 -3px #15539e; color: #3584e4; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index a1f50f8a36..5e0fc9dee9 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -822,9 +822,7 @@ menubar:backdrop, .menubar:backdrop { background-color: #f6f5f4; } menubar > box > menuitem, .menubar > box > menuitem { min-height: 16px; padding: 4px 8px; } -menubar > box > menuitem menu, .menubar > box > menuitem menu { border-radius: 0; padding: 0; } - -menubar > box > menuitem menu menu, .menubar > box > menuitem menu menu { border-radius: 0; padding: 0; } +.csd menubar > box > menuitem menu, menubar > box > menuitem menu, .csd .menubar > box > menuitem menu, .menubar > box > menuitem menu { border-radius: 0; padding: 0; } menubar > box > menuitem:hover, .menubar > box > menuitem:hover { box-shadow: inset 0 -3px #3584e4; color: #1b6acb; }