diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss index d693099..0bb775c 100755 --- a/gtk-3.0/scss/_functions.scss +++ b/gtk-3.0/scss/_functions.scss @@ -20,10 +20,6 @@ $modules: () !default; } } -@function mix($color1, $color2, $amount) { - @return unquote("mix(#{$color1},#{$color2},#{$amount})"); -} - @function border_normal($color) { @return shade($color, $contrast); } diff --git a/gtk-3.0/scss/widgets/_button.scss b/gtk-3.0/scss/widgets/_button.scss index 5a86b68..4bb6855 100755 --- a/gtk-3.0/scss/widgets/_button.scss +++ b/gtk-3.0/scss/widgets/_button.scss @@ -79,7 +79,7 @@ @extend %linked_button; box-shadow: inset -1px 0 border_normal(rgba(0, 0, 0, .12 + $border_strength)), - 0 1px 2px -1px fade-out($dark_shadow, .98 + $shadow_strength); + 0 1px 2px -1px fade-out($dark_shadow, .88 + $shadow_strength); &:focus, &:hover { box-shadow: inset -1px 0 border_focus(rgba(0, 0, 0, .12 + $border_strength)), @@ -97,7 +97,7 @@ &:insensitive { box-shadow: inset -1px 0 shade($bg, .8); } - &:last-child, &:only-child { box-shadow: 0 1px 2px -1px fade-out($dark_shadow, .98 + $shadow_strength); } + &:last-child, &:only-child { box-shadow: 0 1px 2px -1px fade-out($dark_shadow, .88 + $shadow_strength); } &:last-child:hover, &:only-child:hover { box-shadow: 0 1px 2px -1px fade-out($dark_shadow, .78 + $shadow_strength); } diff --git a/gtk-3.0/scss/widgets/_choosers.scss b/gtk-3.0/scss/widgets/_choosers.scss index 07f27a2..9344dd3 100644 --- a/gtk-3.0/scss/widgets/_choosers.scss +++ b/gtk-3.0/scss/widgets/_choosers.scss @@ -99,9 +99,9 @@ -GtkWidget-vertical-separator: 0; } - GtkLabel:last-child { color: fade-out(currentColor, .3); } + GtkLabel:last-child { color: currentColor; } - GtkImage:last-child { color: fade-out(currentColor, .3); } + GtkImage:last-child { color: currentColor; } } GtkFileChooser { diff --git a/gtk-3.0/scss/widgets/_menu.scss b/gtk-3.0/scss/widgets/_menu.scss index 79a5d2f..1201361 100755 --- a/gtk-3.0/scss/widgets/_menu.scss +++ b/gtk-3.0/scss/widgets/_menu.scss @@ -238,7 +238,7 @@ GtkModelButton.button { &, &:backdrop { - @include button(transparent, currentColor); + @include button(transparent, $menu_fg_color); &:focus:hover, &:active:hover, &:hover, &:selected { background-image: none; diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss index cdf3ca7..6860bc7 100644 --- a/gtk-3.0/scss/widgets/_misc.scss +++ b/gtk-3.0/scss/widgets/_misc.scss @@ -81,18 +81,12 @@ } .expander { - color: fade-out(currentColor, .3); - border: fade-out(currentColor, .3); + color: currentColor; + opacity: .7; - &:hover { - color: fade-out(currentColor, .2); - border-color: fade-out(currentColor, .2); - } + &:hover { opacity: .8; } - &:active { - color: fade-out(currentColor, .1); - border-color: fade-out(currentColor, .1); - } + &:active { opacity: .7; } } } @@ -103,11 +97,15 @@ @include exports("symbolicimage") { .image { - color: fade-out(currentColor, .5); + color: currentColor; + opacity: .5; - &:hover { color: fade-out(currentColor, .1); } + &:hover { opacity: .9; } - &:selected, &:selected:hover { color: $selected_fg_color; } + &:selected, &:selected:hover { + color: $selected_fg_color; + opacity: 1; + } } } diff --git a/gtk-3.0/scss/widgets/_view.scss b/gtk-3.0/scss/widgets/_view.scss index f873114..0477c1c 100644 --- a/gtk-3.0/scss/widgets/_view.scss +++ b/gtk-3.0/scss/widgets/_view.scss @@ -77,14 +77,14 @@ } .dim-label { - &, &.view { color: fade-out(currentColor, .5); } + &, &.view { opacity: .3; } } .dnd { border: 1px solid $selected_bg_color; } .grip { background-color: transparent; } - .arrow { color: fade-out(currentColor, .3); } + .arrow { opacity: .3; } .rubberband { &, &.view, &.content-view.view {