AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 06:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip/jimmac/popover-menu-submenus' into 'master'

Browse Source 
Adwaita: fix up submenus again

See merge request GNOME/gtk!2845
This commit is contained in:
Jakub Steiner 2020-11-16 19:50:08 +00:00
commit dff8a9eb46
1 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
gtk/theme/Adwaita/_common.scss
View File

@ -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;
@ -4267,6 +4241,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;
}