diff options
| author | Timm Bäder <mail@baedert.org> | 2019-05-17 13:45:50 +0000 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2019-05-17 13:45:50 +0000 |
| commit | 1a29a2f03f18c7346111e28e1b7ac277d9eb4cb5 (patch) | |
| tree | e8f6a1edcb92847272899ee1fe081a64ac2ee71c | |
| parent | 9cde2186bfe2c629f80dcfe6042297d38b344a7b (diff) | |
| parent | d942a31750adf90476e956bcb93406b43938971e (diff) | |
| download | gtk+-1a29a2f03f18c7346111e28e1b7ac277d9eb4cb5.tar.gz | |
Merge branch 'fix-non-csd-menu-corners-gtk3' into 'gtk-3-24'
Adwaita: Don't round the non-csd menu corners (GTK3)
See merge request GNOME/gtk!834
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 6 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained-dark.css | 4 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 6dc2bcb7af..828e78c4db 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2166,9 +2166,11 @@ menu, padding: 4px 0px; background-color: $menu_color; 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; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index d1f1a905bb..df6b6ab05c 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -821,9 +821,9 @@ menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0 .background.popup { background-color: transparent; } -menu, .menu, .context-menu { margin: 4px; padding: 4px 0px; background-color: #2f2f2f; border: 1px solid #1b1b1b; border-radius: 5px; } +menu, .menu, .context-menu { margin: 4px; 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; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 29cf20af36..c8dbbb4961 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -829,9 +829,9 @@ menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0 .background.popup { background-color: transparent; } -menu, .menu, .context-menu { margin: 4px; padding: 4px 0px; background-color: #ffffff; border: 1px solid #cdc7c2; border-radius: 5px; } +menu, .menu, .context-menu { margin: 4px; 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; } |