From a2de3658b34d99cb9e144602622d236b9739bb64 Mon Sep 17 00:00:00 2001 From: Megax <megax@yeahunter.hu> Date: Sun, 10 Apr 2016 13:37:56 +0200 Subject: [PATCH] * Re-enabled code. --- gtk-3.20/scss/widgets/_menu.scss | 32 +++++++++++++++++------------ gtk-3.20/scss/widgets/_sidebar.scss | 12 +++++------ 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/gtk-3.20/scss/widgets/_menu.scss b/gtk-3.20/scss/widgets/_menu.scss index 47973e1..56b0d59 100755 --- a/gtk-3.20/scss/widgets/_menu.scss +++ b/gtk-3.20/scss/widgets/_menu.scss @@ -53,13 +53,19 @@ &:selected { background-color: $selected_bg_color; } - /*button { + button { &, &:hover, &:active, &:active *:disabled, &:disabled { border-width: 0; background-color: transparent; background-image: none; } - }*/ + } + + separator { + padding: 0; + border-style: none; + background-color: shade($menu_bg_color, ($contrast + .1)); + } menuitem { min-height: 16px; @@ -70,8 +76,6 @@ //background-color: transparent; //background-image: none; - //-GtkMenuItem-arrow-scaling: .5; - &:active, &:hover { border: 0; background-color: $selected_bg_color; @@ -148,9 +152,9 @@ -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } - //&:hover { background-color: mix($fg_color, $base_color, 10%); } + &:hover { background-color: mix($fg_color, $base_color, .1); } - //&:backdrop { background-color: $backdrop_menu_color; } + &:backdrop { background-color: $backdrop_menu_color; } &:disabled { color: transparent; @@ -160,6 +164,8 @@ } } + .context-menu { font: initial; } + menuitem { accelerator { color: alpha($menu_fg_color, .6); @@ -177,12 +183,6 @@ &:dir(rtl) { margin-left: 7px; } } - separator { - padding: 0; - border-style: none; - background-color: shade($menu_bg_color, ($contrast + .1)); - } - window decoration { box-shadow: 0 2px 3px rgba(0,0,0,.2); } @@ -240,9 +240,15 @@ background-color: shade($menu_bg_color, ($contrast + .5)); background-image: none; color: $menu_fg_color; + + &:hover { + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + } } - .list-row, list row { + list row { &, & .button { background-color: transparent; background-image: none; diff --git a/gtk-3.20/scss/widgets/_sidebar.scss b/gtk-3.20/scss/widgets/_sidebar.scss index 61570c7..1f991c8 100755 --- a/gtk-3.20/scss/widgets/_sidebar.scss +++ b/gtk-3.20/scss/widgets/_sidebar.scss @@ -98,7 +98,7 @@ &:selected { background-image: image($selected_bg_color); } // FIXME is this needed? - //&:backdrop { background-image: image($backdrop_borders_color); } + &:backdrop { background-image: image($backdrop_borders_color); } &.wide { min-width: 5px; @@ -107,11 +107,11 @@ background-image: image(border_normal($bg_color)), image(border_normal($bg_color)); background-size: 1px 1px, 1px 1px; - //&:backdrop { - // background-color: $backdrop_bg_color; - // background-image: image($backdrop_borders_color), - // image($backdrop_borders_color); - //} + &:backdrop { + background-color: $backdrop_bg_color; + background-image: image($backdrop_borders_color), + image($backdrop_borders_color); + } } }