diff options
author | Lapo Calamandrei <calamandrei@gmail.com> | 2015-12-09 18:56:38 +0100 |
---|---|---|
committer | Lapo Calamandrei <calamandrei@gmail.com> | 2015-12-09 18:56:38 +0100 |
commit | 191b9d84faa4b716eccf39077a0327a765343b6c (patch) | |
tree | 7b50c6ba40b4940b3cdd60d4fc5d2b2f3a2ec419 | |
parent | d266151feead40a7d8f8bb163024404c030f6d79 (diff) | |
download | gtk+-191b9d84faa4b716eccf39077a0327a765343b6c.tar.gz |
Adwaita: make menu bg color the same as popovers
fixes https://bugzilla.gnome.org/show_bug.cgi?id=759260
-rw-r--r-- | gtk/theme/Adwaita/_colors.scss | 3 | ||||
-rw-r--r-- | gtk/theme/Adwaita/_common.scss | 6 | ||||
-rw-r--r-- | gtk/theme/Adwaita/gtk-contained-dark.css | 8 | ||||
-rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 8 |
4 files changed, 16 insertions, 9 deletions
diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss index 5fbf1ac720..478e728da2 100644 --- a/gtk/theme/Adwaita/_colors.scss +++ b/gtk/theme/Adwaita/_colors.scss @@ -17,6 +17,7 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), lig $top_hilight: $borders_edge; $dark_fill: mix($borders_color, $bg_color, 35%); $headerbar_color: if($variant == 'light', lighten($bg_color, 5%), darken($bg_color, 3%)); +$menu_color: mix($bg_color, $base_color, 50%); $scrollbar_bg_color: darken($bg_color, 7%); @@ -53,3 +54,5 @@ $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%); $backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, 50%); $backdrop_scrollbar_bg_color: darken($backdrop_bg_color, 3%); + +$backdrop_menu_color: mix($backdrop_bg_color, $backdrop_base_color, 50%); diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 56692355c2..59c452d3ed 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1489,9 +1489,10 @@ menu, .menu { margin: 4px; padding: 0px; - background-color: $base_color; + background-color: $menu_color; border: 1px solid $borders_color; // adds borders in a non composited env .csd & { border: none; } // axes borders in a composited env + &:backdrop { background-color: $backdrop_menu_color; } & menuitem { text-shadow: none; padding: 4px; @@ -1505,7 +1506,7 @@ menu, } &:backdrop, &:backdrop:hover { color: $backdrop_fg_color; - background-color: $backdrop_base_color; + background-color: transparent; } //submenu indicators & arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); } @@ -1537,7 +1538,6 @@ popover.background { padding: 2px; border-radius: 5px; .csd &, & { border: 1px solid $borders_color; } - background-color: mix($bg_color, $base_color, 50%); box-shadow: 0 1px 2px transparentize(black, 0.7); &:backdrop { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 6c551daece..d91a647d1d 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2085,11 +2085,14 @@ menu, .menu { margin: 4px; padding: 0px; - background-color: #292929; + background-color: #313434; border: 1px solid #1c1f1f; } .csd menu, .csd .menu { border: none; } + menu:backdrop, + .menu:backdrop { + background-color: #333636; } menu menuitem, .menu menuitem { text-shadow: none; @@ -2108,7 +2111,7 @@ menu, .menu menuitem:backdrop, .menu menuitem:backdrop:hover { color: #949796; - background-color: #2c2c2c; } + background-color: transparent; } menu menuitem arrow, .menu menuitem arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } @@ -2143,7 +2146,6 @@ menuitem accelerator { popover.background { padding: 2px; border-radius: 5px; - background-color: #313434; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); } .csd popover.background, popover.background { border: 1px solid #1c1f1f; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 60211f551e..aacb0e59b4 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -2091,11 +2091,14 @@ menu, .menu { margin: 4px; padding: 0px; - background-color: #ffffff; + background-color: #f4f4f3; border: 1px solid #9d9d99; } .csd menu, .csd .menu { border: none; } + menu:backdrop, + .menu:backdrop { + background-color: #f4f4f3; } menu menuitem, .menu menuitem { text-shadow: none; @@ -2114,7 +2117,7 @@ menu, .menu menuitem:backdrop, .menu menuitem:backdrop:hover { color: #8b8e8f; - background-color: white; } + background-color: transparent; } menu menuitem arrow, .menu menuitem arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } @@ -2149,7 +2152,6 @@ menuitem accelerator { popover.background { padding: 2px; border-radius: 5px; - background-color: #f4f4f3; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); } .csd popover.background, popover.background { border: 1px solid #9d9d99; } |