diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 1c18383..a75d2af 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -1278,8 +1278,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #383C45; } + column-header .button:active:hover { + color: #D3DAE3; } column-header .button:insensitive { border-color: #444852; background-image: none; } diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index 247754f..8a59577 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -1279,8 +1279,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index 040d568..faacd77 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -1278,8 +1278,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #383C45; } + column-header .button:active:hover { + color: #D3DAE3; } column-header .button:insensitive { border-color: #444852; background-image: none; } diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 7d6698f..a97ce32 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -1279,8 +1279,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 68ac9ac..fcdf640 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -1278,8 +1278,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index bf2a7b8..ea30eb8 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -1278,8 +1278,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index adafd37..90351b7 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -1438,7 +1438,8 @@ column-header.button.dnd { // for treeview-like derive widgets transparentize(if($variant == 'light', black, white), 0.89) 80%, transparentize(if($variant == 'light', black, white), 1) 80%) 0 1 0 0 / 0 1px 0 0 stretch; - &:active { background-color: $base_color; } + &:active, &:hover { background-color: $base_color; } + &:active:hover { color: $fg_color; } &:insensitive { border-color: $bg_color; background-image: none; diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 3100d55..b334350 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -1294,8 +1294,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #383C45; } + column-header .button:active:hover { + color: #D3DAE3; } column-header .button:insensitive { border-color: #444852; background-image: none; } diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 217bcb0..f11ab3f 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -1295,8 +1295,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index e6332f3..82c14ca 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -1294,8 +1294,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #383C45; } + column-header .button:active:hover { + color: #D3DAE3; } column-header .button:insensitive { border-color: #444852; background-image: none; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index c9b7d50..9d20a36 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -1295,8 +1295,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index 5dbad57..f78fa60 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -1294,8 +1294,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 517cb3a..a5021a3 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -1294,8 +1294,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index ccbf3c2..27a9cbc 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -1460,7 +1460,8 @@ column-header.button.dnd { // for treeview-like derive widgets transparentize(if($variant == 'light', black, white), 0.89) 80%, transparentize(if($variant == 'light', black, white), 1) 80%) 0 1 0 0 / 0 1px 0 0 stretch; - &:active { background-color: $base_color; } + &:active, &:hover { background-color: $base_color; } + &:active:hover { color: $fg_color; } &:insensitive { border-color: $bg_color; background-image: none;