AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix-non-csd-menu-corners-gtk4' into 'master'

Browse Source 
Adwaita: Don't round the non-csd menu corners (GTK4)

See merge request GNOME/gtk!835
This commit is contained in:
Timm Bäder 2019-05-17 13:46:06 +00:00
commit 7cec5323d1
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2064,9 +2064,11 @@ menu,
padding: 4px 0px; padding: 4px 0px;
background-color: $menu_color; background-color: $menu_color;
border: 1px solid $borders_color; // adds borders in a non composited env border: 1px solid $borders_color; // adds borders in a non composited env
border-radius: $menu_radius;
.csd & { border: none; } // axes borders in a composited env .csd & {
border: none; // axes borders in a composited env
border-radius: $menu_radius;
}
&:backdrop { background-color: $backdrop_menu_color; } &:backdrop { background-color: $backdrop_menu_color; }

4
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -824,9 +824,9 @@ menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0
.background.popup { background-color: transparent; } .background.popup { background-color: transparent; }
menu, .menu, .context-menu { padding: 4px 0px; background-color: #2f2f2f; border: 1px solid #1b1b1b; border-radius: 5px; } menu, .menu, .context-menu { padding: 4px 0px; background-color: #2f2f2f; border: 1px solid #1b1b1b; }
.csd menu, .csd .menu, .csd .context-menu { border: none; } .csd menu, .csd .menu, .csd .context-menu { border: none; border-radius: 5px; }
menu:backdrop, .menu:backdrop, .context-menu:backdrop { background-color: #313131; } menu:backdrop, .menu:backdrop, .context-menu:backdrop { background-color: #313131; }

4
gtk/theme/Adwaita/gtk-contained.css
View File

@ -832,9 +832,9 @@ menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0
.background.popup { background-color: transparent; } .background.popup { background-color: transparent; }
menu, .menu, .context-menu { padding: 4px 0px; background-color: #ffffff; border: 1px solid #cdc7c2; border-radius: 5px; } menu, .menu, .context-menu { padding: 4px 0px; background-color: #ffffff; border: 1px solid #cdc7c2; }
.csd menu, .csd .menu, .csd .context-menu { border: none; } .csd menu, .csd .menu, .csd .context-menu { border: none; border-radius: 5px; }
menu:backdrop, .menu:backdrop, .context-menu:backdrop { background-color: #fcfcfc; } menu:backdrop, .menu:backdrop, .context-menu:backdrop { background-color: #fcfcfc; }