From 940415b2eb5a222193295297953f3581707cb53f Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 10 Oct 2014 13:53:42 +0200 Subject: [PATCH] Adwaita: style menu overflow button See bug https://bugzilla.gnome.org/show_bug.cgi?id=738158 --- gtk/resources/theme/Adwaita/_common.scss | 14 +++++++++++++ .../theme/Adwaita/gtk-contained-dark.css | 20 ++++++++++++++++++- gtk/resources/theme/Adwaita/gtk-contained.css | 20 ++++++++++++++++++- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index b14490cef7..707ab978f6 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -1433,6 +1433,20 @@ column-header.button.dnd { // for treeview-like derive widgets &.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); } &.arrow:dir(rtl) {-gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl'); } } + &.button { // overlow buttons + @extend %undecorated_button; + border-color: mix($fg_color, $base_color, 10%); + border-style: none; + border-radius: 0; + &.top { border-bottom: 1px solid; } + &.bottom { border-top: 1px solid; } + &:hover { background-color: mix($fg_color, $base_color, 10%); } + &:insensitive { + color: transparent; + background-color: transparent; + border-color: transparent ; + } + } } .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 519c9d0a6d..8281fa21b8 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -1214,7 +1214,9 @@ GtkCalendar.header .menuitem.titlebutton.button:backdrop:hover, .button:link, .h .titlebar .button.titlebutton:link, GtkCalendar.header .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited, .titlebar .button.titlebutton:visited, -GtkCalendar.header .button.titlebutton:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, .notebook tab .header-bar .button.titlebutton, .header-bar .notebook tab .button.titlebutton, +GtkCalendar.header .button.titlebutton:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .menu.button, .header-bar .menu.button.titlebutton, +.titlebar .menu.button.titlebutton, +GtkCalendar.header .menu.button.titlebutton, .notebook tab .button, .notebook tab .header-bar .button.titlebutton, .header-bar .notebook tab .button.titlebutton, .notebook tab .titlebar .button.titlebutton, .titlebar .notebook tab .button.titlebutton, .notebook tab GtkCalendar.header .button.titlebutton, @@ -2047,6 +2049,22 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } + .menu.button, .header-bar .menu.button.titlebutton, + .titlebar .menu.button.titlebutton, + GtkCalendar.header .menu.button.titlebutton { + border-color: #3c3c3c; + border-style: none; + border-radius: 0; } + .menu.button.top { + border-bottom: 1px solid; } + .menu.button.bottom { + border-top: 1px solid; } + .menu.button:hover { + background-color: #3c3c3c; } + .menu.button:insensitive { + color: transparent; + background-color: transparent; + border-color: transparent; } .menuitem .accelerator { color: alpha(currentColor,0.55); } diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index b3f9399e69..1339144d80 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -1206,7 +1206,9 @@ GtkCalendar.header .menuitem.titlebutton.button:backdrop:hover, .button:link, .h .titlebar .button.titlebutton:link, GtkCalendar.header .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited, .titlebar .button.titlebutton:visited, -GtkCalendar.header .button.titlebutton:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, .notebook tab .header-bar .button.titlebutton, .header-bar .notebook tab .button.titlebutton, +GtkCalendar.header .button.titlebutton:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .menu.button, .header-bar .menu.button.titlebutton, +.titlebar .menu.button.titlebutton, +GtkCalendar.header .menu.button.titlebutton, .notebook tab .button, .notebook tab .header-bar .button.titlebutton, .header-bar .notebook tab .button.titlebutton, .notebook tab .titlebar .button.titlebutton, .titlebar .notebook tab .button.titlebutton, .notebook tab GtkCalendar.header .button.titlebutton, @@ -2044,6 +2046,22 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } + .menu.button, .header-bar .menu.button.titlebutton, + .titlebar .menu.button.titlebutton, + GtkCalendar.header .menu.button.titlebutton { + border-color: #eaeaea; + border-style: none; + border-radius: 0; } + .menu.button.top { + border-bottom: 1px solid; } + .menu.button.bottom { + border-top: 1px solid; } + .menu.button:hover { + background-color: #eaeaea; } + .menu.button:insensitive { + color: transparent; + background-color: transparent; + border-color: transparent; } .menuitem .accelerator { color: alpha(currentColor,0.55); }