Upgrading to GitLab 12.5.4.

Commit 4fa83d55 authored by Alex Monday's avatar Alex Monday

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
parent 017a4402
...@@ -2127,11 +2127,9 @@ menubar, ...@@ -2127,11 +2127,9 @@ menubar,
// remove padding and rounding from menubar submenus // remove padding and rounding from menubar submenus
menu { menu {
border-radius: 0; .csd &, & {
padding:0;
menu {
border-radius: 0; border-radius: 0;
padding:0; padding: 0;
} }
} }
......
...@@ -811,9 +811,7 @@ menubar:backdrop, .menubar:backdrop { background-color: #353535; } ...@@ -811,9 +811,7 @@ menubar:backdrop, .menubar:backdrop { background-color: #353535; }
menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 4px 8px; } menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 4px 8px; }
menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; } .csd menubar > menuitem menu, menubar > menuitem menu, .csd .menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; }
menubar > menuitem menu menu, .menubar > menuitem menu menu { border-radius: 0; padding: 0; }
menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px #15539e; color: #3584e4; } menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px #15539e; color: #3584e4; }
......
...@@ -819,9 +819,7 @@ menubar:backdrop, .menubar:backdrop { background-color: #f6f5f4; } ...@@ -819,9 +819,7 @@ menubar:backdrop, .menubar:backdrop { background-color: #f6f5f4; }
menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 4px 8px; } menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 4px 8px; }
menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; } .csd menubar > menuitem menu, menubar > menuitem menu, .csd .menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; }
menubar > menuitem menu menu, .menubar > menuitem menu menu { border-radius: 0; padding: 0; }
menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px #3584e4; color: #1b6acb; } menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px #3584e4; color: #1b6acb; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment