[gtk/wip/jimmac/popover-menu-submenus] Adwaita: fix up submenus again
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/jimmac/popover-menu-submenus] Adwaita: fix up submenus again
- Date: Mon, 16 Nov 2020 18:50:03 +0000 (UTC)
commit 47e49acc7d43d9b5c9b9e2493a4623a86c892156
Author: Jakub Steiner <jimmac gmail com>
Date: Mon Nov 16 19:48:11 2020 +0100
Adwaita: fix up submenus again
- move menubar section under more generic popover.menu
rather than resort to specificity dir(ltr) hacks
gtk/theme/Adwaita/_common.scss | 65 +++++++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 29 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index b69db89d18..ba5738a822 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4134,35 +4134,9 @@ popover.entry-completion > contents {
padding: 0;
}
-// initial styling for popover menu and bar
-menubar {
- padding: 0px;
- box-shadow: inset 0 -1px transparentize(black, 0.9);
-
- > item {
- min-height: 16px;
- padding: 4px 8px;
-
- &:selected { //Seems like it :hover even with keyboard focus
- box-shadow: inset 0 -3px $selected_bg_color;
- color: $link_color;
- }
-
- &:disabled {
- color: $insensitive_fg_color;
- box-shadow: none;
- }
- }
-
- & > item popover.menu.background > contents {
- padding: 0;
- }
- //nested submenus
- & > item popover.menu.background popover.menu.background > contents {
- margin: 0;
- border-radius: $popover_radius; //including top
- }
-}
+/**********************
+ * Popover Base Menus *
+ **********************/
$_menu-padding: 12px;
@@ -4263,6 +4237,39 @@ popover.menu {
}
}
+// initial styling for popover menu and bar
+menubar {
+ padding: 0px;
+ box-shadow: inset 0 -1px transparentize(black, 0.9);
+
+ > item {
+ min-height: 16px;
+ padding: 4px 8px;
+
+ &:selected { //Seems like it :hover even with keyboard focus
+ box-shadow: inset 0 -3px $selected_bg_color;
+ color: $link_color;
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+ box-shadow: none;
+ }
+ }
+
+ & > item popover.menu.background > contents {
+ padding: 0;
+ }
+ //nested submenus
+ & > item popover.menu popover.menu {
+ padding: 0 0 4px 0;
+ }
+ & > item popover.menu.background popover.menu.background > contents {
+ margin: 0;
+ border-radius: $popover_radius; //including top
+ }
+}
+
statusbar {
padding: 6px 10px 6px 10px;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]