From fdff112dcde284908f01be6d9364fec543b88cec Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Sun, 24 Apr 2016 10:44:45 -0400 Subject: [PATCH] fixed hidden menu text --- Paper/gtk-3.18/gtk-dark.css | 23 ++++++++++++++++++----- Paper/gtk-3.18/gtk.css | 23 ++++++++++++++++++----- Paper/gtk-3.18/widgets/_header-bars.scss | 19 ++++++++++++++++++- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/Paper/gtk-3.18/gtk-dark.css b/Paper/gtk-3.18/gtk-dark.css index 9726c63..27683e2 100644 --- a/Paper/gtk-3.18/gtk-dark.css +++ b/Paper/gtk-3.18/gtk-dark.css @@ -2637,6 +2637,11 @@ GraniteWidgetsWelcome { .header-bar .button GtkLabel:backdrop, .header-bar .button GtkImage:backdrop { color: rgba(255, 255, 255, 0.3); } + .titlebar:not(headerbar) .button GtkLabel:insensitive, + .titlebar:not(headerbar) .button GtkImage:insensitive, + .header-bar .button GtkLabel:insensitive, + .header-bar .button GtkImage:insensitive { + -gtk-image-effect: dim; } .titlebar:not(headerbar) .button:focus, .titlebar:not(headerbar) .button:hover, .header-bar .button:focus, .header-bar .button:hover { @@ -2685,12 +2690,8 @@ GraniteWidgetsWelcome { color: rgba(255, 255, 255, 0.3); background-color: transparent; background-image: none; } - .titlebar:not(headerbar) .button:insensitive image, - .titlebar:not(headerbar) .button:insensitive GtkImage, .titlebar:not(headerbar) .button:insensitive:backdrop image, - .titlebar:not(headerbar) .button:insensitive:backdrop GtkImage, - .header-bar .button:insensitive image, + .titlebar:not(headerbar) .button:insensitive GtkImage, .titlebar:not(headerbar) .button:insensitive:backdrop GtkImage, .header-bar .button:insensitive GtkImage, - .header-bar .button:insensitive:backdrop image, .header-bar .button:insensitive:backdrop GtkImage { -gtk-image-effect: dim; } .titlebar:not(headerbar) .button.titlebutton, @@ -2722,6 +2723,18 @@ GraniteWidgetsWelcome { .titlebar:not(headerbar) .button.titlebutton:active GtkImage, .header-bar .button.titlebutton:active GtkImage { color: #3B4245; } + .titlebar:not(headerbar) .button.menu-button .menu .menuitem GtkLabel, + .header-bar .button.menu-button .menu .menuitem GtkLabel { + color: #bcc1c3; } + .titlebar:not(headerbar) .button.menu-button .menu .menuitem GtkLabel:insensitive, + .header-bar .button.menu-button .menu .menuitem GtkLabel:insensitive { + color: #868d90; } + .titlebar:not(headerbar) .button.menu-button .menu .menuitem .separator, + .header-bar .button.menu-button .menu .menuitem .separator { + color: #373e41; } + .titlebar:not(headerbar) .button.menu-button .menu .menuitem:hover GtkLabel, + .header-bar .button.menu-button .menu .menuitem:hover GtkLabel { + color: #ffffff; } .titlebar:not(headerbar) .button.suggested-action, .header-bar .button.suggested-action { font-weight: bold; diff --git a/Paper/gtk-3.18/gtk.css b/Paper/gtk-3.18/gtk.css index 6c34743..501fe13 100644 --- a/Paper/gtk-3.18/gtk.css +++ b/Paper/gtk-3.18/gtk.css @@ -2646,6 +2646,11 @@ GraniteWidgetsWelcome { .header-bar .button GtkLabel:backdrop, .header-bar .button GtkImage:backdrop { color: rgba(255, 255, 255, 0.5); } + .titlebar:not(headerbar) .button GtkLabel:insensitive, + .titlebar:not(headerbar) .button GtkImage:insensitive, + .header-bar .button GtkLabel:insensitive, + .header-bar .button GtkImage:insensitive { + -gtk-image-effect: dim; } .titlebar:not(headerbar) .button:focus, .titlebar:not(headerbar) .button:hover, .header-bar .button:focus, .header-bar .button:hover { @@ -2694,12 +2699,8 @@ GraniteWidgetsWelcome { color: rgba(255, 255, 255, 0.5); background-color: transparent; background-image: none; } - .titlebar:not(headerbar) .button:insensitive image, - .titlebar:not(headerbar) .button:insensitive GtkImage, .titlebar:not(headerbar) .button:insensitive:backdrop image, - .titlebar:not(headerbar) .button:insensitive:backdrop GtkImage, - .header-bar .button:insensitive image, + .titlebar:not(headerbar) .button:insensitive GtkImage, .titlebar:not(headerbar) .button:insensitive:backdrop GtkImage, .header-bar .button:insensitive GtkImage, - .header-bar .button:insensitive:backdrop image, .header-bar .button:insensitive:backdrop GtkImage { -gtk-image-effect: dim; } .titlebar:not(headerbar) .button.titlebutton, @@ -2731,6 +2732,18 @@ GraniteWidgetsWelcome { .titlebar:not(headerbar) .button.titlebutton:active GtkImage, .header-bar .button.titlebutton:active GtkImage { color: #636E73; } + .titlebar:not(headerbar) .button.menu-button .menu .menuitem GtkLabel, + .header-bar .button.menu-button .menu .menuitem GtkLabel { + color: #666666; } + .titlebar:not(headerbar) .button.menu-button .menu .menuitem GtkLabel:insensitive, + .header-bar .button.menu-button .menu .menuitem GtkLabel:insensitive { + color: #afafaf; } + .titlebar:not(headerbar) .button.menu-button .menu .menuitem .separator, + .header-bar .button.menu-button .menu .menuitem .separator { + color: #d1d1d1; } + .titlebar:not(headerbar) .button.menu-button .menu .menuitem:hover GtkLabel, + .header-bar .button.menu-button .menu .menuitem:hover GtkLabel { + color: #ffffff; } .titlebar:not(headerbar) .button.suggested-action, .header-bar .button.suggested-action { font-weight: bold; diff --git a/Paper/gtk-3.18/widgets/_header-bars.scss b/Paper/gtk-3.18/widgets/_header-bars.scss index a42bec9..c9f3156 100644 --- a/Paper/gtk-3.18/widgets/_header-bars.scss +++ b/Paper/gtk-3.18/widgets/_header-bars.scss @@ -222,6 +222,10 @@ &:backdrop { color: $backdrop_headerbar_fg_color; } + + &:insensitive { + -gtk-image-effect: dim; + } } &:focus, @@ -279,7 +283,6 @@ background-color: transparent; background-image: none; - image, GtkImage { -gtk-image-effect: dim; } @@ -320,6 +323,20 @@ } } + // Menu Button + &.menu-button { + .menu { + .menuitem { + GtkLabel { + color: $fg_color; + &:insensitive { color: $insensitive_fg_color; } + } + .separator { color: $borders_color;} + &:hover { GtkLabel {color: $selected_fg_color;}} + } + } + } + // Suggested Button &.suggested-action { font-weight: bold;