From d02ab7ac91de4acc7988c71b71003e4becf8a891 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sat, 28 May 2016 13:58:45 +0200 Subject: [PATCH 01/17] xfwm theme refinements --- common/xfwm4-dark/close-active.xpm | 54 ++++---- common/xfwm4-dark/close-inactive.xpm | 54 ++++---- common/xfwm4-dark/close-prelight.xpm | 54 ++++---- common/xfwm4-dark/close-pressed.xpm | 54 ++++---- common/xfwm4-dark/hide-active.xpm | 54 ++++---- common/xfwm4-dark/hide-inactive.xpm | 54 ++++---- common/xfwm4-dark/hide-prelight.xpm | 54 ++++---- common/xfwm4-dark/hide-pressed.xpm | 101 ++++++++------- common/xfwm4-dark/maximize-active.xpm | 54 ++++---- common/xfwm4-dark/maximize-inactive.xpm | 54 ++++---- common/xfwm4-dark/maximize-prelight.xpm | 54 ++++---- common/xfwm4-dark/maximize-pressed.xpm | 119 +++++++++--------- common/xfwm4-dark/menu-active.xpm | 41 +++--- common/xfwm4-dark/menu-inactive.xpm | 41 +++--- common/xfwm4-dark/menu-pressed.xpm | 41 +++--- common/xfwm4-dark/shade-active.xpm | 58 +++++---- common/xfwm4-dark/shade-inactive.xpm | 58 +++++---- common/xfwm4-dark/shade-pressed.xpm | 58 +++++---- common/xfwm4-dark/stick-active.xpm | 58 +++++---- common/xfwm4-dark/stick-inactive.xpm | 58 +++++---- common/xfwm4-dark/stick-pressed.xpm | 58 +++++---- common/xfwm4-dark/themerc | 26 ++-- common/xfwm4-dark/title-1-active-shaded.xpm | 31 ----- common/xfwm4-dark/title-1-active.xpm | 54 ++++---- common/xfwm4-dark/title-1-inactive.xpm | 54 ++++---- common/xfwm4-dark/title-2-active.xpm | 54 ++++---- common/xfwm4-dark/title-2-inactive.xpm | 54 ++++---- common/xfwm4-dark/title-3-active.xpm | 54 ++++---- common/xfwm4-dark/title-3-inactive.xpm | 54 ++++---- common/xfwm4-dark/title-4-active.xpm | 54 ++++---- common/xfwm4-dark/title-4-inactive.xpm | 54 ++++---- common/xfwm4-dark/title-5-active.xpm | 54 ++++---- common/xfwm4-dark/title-5-inactive.xpm | 54 ++++---- common/xfwm4-dark/top-left-active-shaded.xpm | 31 ----- common/xfwm4-dark/top-left-active.xpm | 54 ++++---- common/xfwm4-dark/top-left-inactive.xpm | 54 ++++---- common/xfwm4-dark/top-right-active-shaded.xpm | 31 ----- common/xfwm4-dark/top-right-active.xpm | 54 ++++---- common/xfwm4-dark/top-right-inactive.xpm | 54 ++++---- common/xfwm4/close-active.xpm | 54 ++++---- common/xfwm4/close-inactive.xpm | 54 ++++---- common/xfwm4/close-prelight.xpm | 54 ++++---- common/xfwm4/close-pressed.xpm | 54 ++++---- common/xfwm4/hide-active.xpm | 54 ++++---- common/xfwm4/hide-inactive.xpm | 54 ++++---- common/xfwm4/hide-prelight.xpm | 54 ++++---- common/xfwm4/hide-pressed.xpm | 54 ++++---- common/xfwm4/maximize-active.xpm | 54 ++++---- common/xfwm4/maximize-inactive.xpm | 54 ++++---- common/xfwm4/maximize-prelight.xpm | 54 ++++---- common/xfwm4/maximize-pressed.xpm | 54 ++++---- common/xfwm4/menu-active.xpm | 41 +++--- common/xfwm4/menu-inactive.xpm | 41 +++--- common/xfwm4/menu-pressed.xpm | 41 +++--- common/xfwm4/shade-active.xpm | 57 +++++---- common/xfwm4/shade-inactive.xpm | 57 +++++---- common/xfwm4/shade-pressed.xpm | 57 +++++---- common/xfwm4/stick-active.xpm | 57 +++++---- common/xfwm4/stick-inactive.xpm | 57 +++++---- common/xfwm4/stick-pressed.xpm | 57 +++++---- common/xfwm4/themerc | 26 ++-- common/xfwm4/title-1-active-shaded.xpm | 30 ----- common/xfwm4/title-1-active.xpm | 54 ++++---- common/xfwm4/title-1-inactive.xpm | 54 ++++---- common/xfwm4/title-2-active.xpm | 54 ++++---- common/xfwm4/title-2-inactive.xpm | 54 ++++---- common/xfwm4/title-3-active.xpm | 54 ++++---- common/xfwm4/title-3-inactive.xpm | 54 ++++---- common/xfwm4/title-4-active.xpm | 54 ++++---- common/xfwm4/title-4-inactive.xpm | 54 ++++---- common/xfwm4/title-5-active.xpm | 54 ++++---- common/xfwm4/title-5-inactive.xpm | 54 ++++---- common/xfwm4/top-left-active-shaded.xpm | 32 ----- common/xfwm4/top-left-active.xpm | 59 ++++----- common/xfwm4/top-left-inactive.xpm | 59 ++++----- common/xfwm4/top-right-active-shaded.xpm | 32 ----- common/xfwm4/top-right-active.xpm | 59 ++++----- common/xfwm4/top-right-inactive.xpm | 59 ++++----- 78 files changed, 2087 insertions(+), 2028 deletions(-) delete mode 100644 common/xfwm4-dark/title-1-active-shaded.xpm delete mode 100644 common/xfwm4-dark/top-left-active-shaded.xpm delete mode 100644 common/xfwm4-dark/top-right-active-shaded.xpm delete mode 100644 common/xfwm4/title-1-active-shaded.xpm delete mode 100644 common/xfwm4/top-left-active-shaded.xpm delete mode 100644 common/xfwm4/top-right-active-shaded.xpm diff --git a/common/xfwm4-dark/close-active.xpm b/common/xfwm4-dark/close-active.xpm index e977ddd..6f38187 100644 --- a/common/xfwm4-dark/close-active.xpm +++ b/common/xfwm4-dark/close-active.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * close_active_xpm[] = { -"24 24 39 1", +"28 28 39 1", " c None", ". c #21252B", "+ c #353B48", @@ -40,27 +40,31 @@ static char * close_active_xpm[] = { "8 c #3B3641", "9 c #613F48", "0 c #C4555B", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&*=#@@@@@@@@", -"@@@@@@@-;>>>>>>;,@@@@@@@", -"@@@@@@-'>>>>>>>>',@@@@@@", -"@@@@@#;>>)>>>>;>>;!@@@@@", -"@@@@@$>>>~{]]^/>>>(@@@@@", -"@@@@@_>>>:@<[@}>>>*@@@@@", -"@@@@@;>>>>|@@1>>>>;@@@@@", -"@@@@@;>>>]2@@34>>>;@@@@@", -"@@@@@%>>>[@55@<>>>*@@@@@", -"@@@@@=>>>#6>>6#>>>7@@@@@", -"@@@@@#;>>>>>>>>>>)8@@@@@", -"@@@@@@,'>>>>>>>>'9@@@@@@", -"@@@@@@@,;>>>>>>)9@@@@@@@", -"@@@@@@@@!(*00*78@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@#$%&&*=#@@@@@@@@@@", +"@@@@@@@@@-;>>>>>>;,@@@@@@@@@", +"@@@@@@@@-'>>>>>>>>',@@@@@@@@", +"@@@@@@@#;>>)>>>>;>>;!@@@@@@@", +"@@@@@@@$>>>~{]]^/>>>(@@@@@@@", +"@@@@@@@_>>>:@<[@}>>>*@@@@@@@", +"@@@@@@@;>>>>|@@1>>>>;@@@@@@@", +"@@@@@@@;>>>]2@@34>>>;@@@@@@@", +"@@@@@@@%>>>[@55@<>>>*@@@@@@@", +"@@@@@@@=>>>#6>>6#>>>7@@@@@@@", +"@@@@@@@#;>>>>>>>>>>)8@@@@@@@", +"@@@@@@@@,'>>>>>>>>'9@@@@@@@@", +"@@@@@@@@@,;>>>>>>)9@@@@@@@@@", +"@@@@@@@@@@!(*00*78@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/close-inactive.xpm b/common/xfwm4-dark/close-inactive.xpm index c4183eb..3ffac44 100644 --- a/common/xfwm4-dark/close-inactive.xpm +++ b/common/xfwm4-dark/close-inactive.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * close_inactive_xpm[] = { -"24 24 34 1", +"28 28 34 1", " c None", ". c #21252B", "+ c #353B48", @@ -35,27 +35,31 @@ static char * close_inactive_xpm[] = { "3 c #40454F", "4 c #5C5F68", "5 c #636871", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&*=#@@@@@@@@", -"@@@@@@@-;>>>>>>;,@@@@@@@", -"@@@@@@->>>>>>>>>>,@@@@@@", -"@@@@@#;>>'>>>>'>>'#@@@@@", -"@@@@@$>>>)!~~{]>>>^@@@@@", -"@@@@@%>>>/@(_@:>>>*@@@@@", -"@@@@@;>>>>/@@<>>>>;@@@@@", -"@@@@@;>>>[(@@-[>>>'@@@@@", -"@@@@@%>>>}@||@_>>>*@@@@@", -"@@@@@=>>>#1>>1#>>>2@@@@@", -"@@@@@#;>>>>>>>>>>'#@@@@@", -"@@@@@@,>>>>>>>>>>3@@@@@@", -"@@@@@@@,'>>>>>>'3@@@@@@@", -"@@@@@@@@#^45542#@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@#$%&&*=#@@@@@@@@@@", +"@@@@@@@@@-;>>>>>>;,@@@@@@@@@", +"@@@@@@@@->>>>>>>>>>,@@@@@@@@", +"@@@@@@@#;>>'>>>>'>>'#@@@@@@@", +"@@@@@@@$>>>)!~~{]>>>^@@@@@@@", +"@@@@@@@%>>>/@(_@:>>>*@@@@@@@", +"@@@@@@@;>>>>/@@<>>>>;@@@@@@@", +"@@@@@@@;>>>[(@@-[>>>'@@@@@@@", +"@@@@@@@%>>>}@||@_>>>*@@@@@@@", +"@@@@@@@=>>>#1>>1#>>>2@@@@@@@", +"@@@@@@@#;>>>>>>>>>>'#@@@@@@@", +"@@@@@@@@,>>>>>>>>>>3@@@@@@@@", +"@@@@@@@@@,'>>>>>>'3@@@@@@@@@", +"@@@@@@@@@@#^45542#@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/close-prelight.xpm b/common/xfwm4-dark/close-prelight.xpm index 6e28729..724d4ce 100644 --- a/common/xfwm4-dark/close-prelight.xpm +++ b/common/xfwm4-dark/close-prelight.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * close_prelight_xpm[] = { -"24 24 40 1", +"28 28 40 1", " c None", ". c #21252B", "+ c #353B48", @@ -41,27 +41,31 @@ static char * close_prelight_xpm[] = { "9 c #654A52", "0 c #B66970", "a c #CF747A", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&*=#@@@@@@@@", -"@@@@@@@-;>>>>>>;,@@@@@@@", -"@@@@@@-'>>>>>>>>',@@@@@@", -"@@@@@#;>>)>>>>)>>)!@@@@@", -"@@@@@$>>>~{]]^/>>>(@@@@@", -"@@@@@_>>>:@<[@}>>>*@@@@@", -"@@@@@;>>>>|@@1>>>>;@@@@@", -"@@@@@;>>>]2@@34>>>)@@@@@", -"@@@@@%>>>5@66@[>>>*@@@@@", -"@@@@@=>>>#7>>7#>>>6@@@@@", -"@@@@@#;>>>>>>>>>>)8@@@@@", -"@@@@@@,'>>>>>>>>'9@@@@@@", -"@@@@@@@,)>>>>>>)9@@@@@@@", -"@@@@@@@@!(0aa068@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@#$%&&*=#@@@@@@@@@@", +"@@@@@@@@@-;>>>>>>;,@@@@@@@@@", +"@@@@@@@@-'>>>>>>>>',@@@@@@@@", +"@@@@@@@#;>>)>>>>)>>)!@@@@@@@", +"@@@@@@@$>>>~{]]^/>>>(@@@@@@@", +"@@@@@@@_>>>:@<[@}>>>*@@@@@@@", +"@@@@@@@;>>>>|@@1>>>>;@@@@@@@", +"@@@@@@@;>>>]2@@34>>>)@@@@@@@", +"@@@@@@@%>>>5@66@[>>>*@@@@@@@", +"@@@@@@@=>>>#7>>7#>>>6@@@@@@@", +"@@@@@@@#;>>>>>>>>>>)8@@@@@@@", +"@@@@@@@@,'>>>>>>>>'9@@@@@@@@", +"@@@@@@@@@,)>>>>>>)9@@@@@@@@@", +"@@@@@@@@@@!(0aa068@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/close-pressed.xpm b/common/xfwm4-dark/close-pressed.xpm index 984b951..60ce46b 100644 --- a/common/xfwm4-dark/close-pressed.xpm +++ b/common/xfwm4-dark/close-pressed.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * close_pressed_xpm[] = { -"24 24 40 1", +"28 28 40 1", " c None", ". c #21252B", "+ c #353B48", @@ -41,27 +41,31 @@ static char * close_pressed_xpm[] = { "9 c #3A333F", "0 c #5C353F", "a c #A13740", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&*=#@@@@@@@@", -"@@@@@@@-;>>>>>>;,@@@@@@@", -"@@@@@@-'>>>>>>>>',@@@@@@", -"@@@@@#;>>)>>>>;>>;!@@@@@", -"@@@@@$>>>~{]]^/>>>(@@@@@", -"@@@@@_>>>:@<[@}>>>*@@@@@", -"@@@@@;>>>>|@@1>>>>;@@@@@", -"@@@@@;>>>]2@@34>>>;@@@@@", -"@@@@@%>>>5@66@<>>>*@@@@@", -"@@@@@=>>>#7>>7#>>>8@@@@@", -"@@@@@#;>>>>>>>>>>)9@@@@@", -"@@@@@@,'>>>>>>>>'0@@@@@@", -"@@@@@@@,;>>>>>>)0@@@@@@@", -"@@@@@@@@!(a&&a89@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@#$%&&*=#@@@@@@@@@@", +"@@@@@@@@@-;>>>>>>;,@@@@@@@@@", +"@@@@@@@@-'>>>>>>>>',@@@@@@@@", +"@@@@@@@#;>>)>>>>;>>;!@@@@@@@", +"@@@@@@@$>>>~{]]^/>>>(@@@@@@@", +"@@@@@@@_>>>:@<[@}>>>*@@@@@@@", +"@@@@@@@;>>>>|@@1>>>>;@@@@@@@", +"@@@@@@@;>>>]2@@34>>>;@@@@@@@", +"@@@@@@@%>>>5@66@<>>>*@@@@@@@", +"@@@@@@@=>>>#7>>7#>>>8@@@@@@@", +"@@@@@@@#;>>>>>>>>>>)9@@@@@@@", +"@@@@@@@@,'>>>>>>>>'0@@@@@@@@", +"@@@@@@@@@,;>>>>>>)0@@@@@@@@@", +"@@@@@@@@@@!(a&&a89@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/hide-active.xpm b/common/xfwm4-dark/hide-active.xpm index 931ff30..333ea1b 100644 --- a/common/xfwm4-dark/hide-active.xpm +++ b/common/xfwm4-dark/hide-active.xpm @@ -1,32 +1,36 @@ /* XPM */ static char * hide_active_xpm[] = { -"24 24 5 1", +"28 28 5 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", "# c #8F939A", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@######@@@@@@@@@", -"@@@@@@@@@######@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@######@@@@@@@@@@@", +"@@@@@@@@@@@######@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/hide-inactive.xpm b/common/xfwm4-dark/hide-inactive.xpm index 94254c2..35f383d 100644 --- a/common/xfwm4-dark/hide-inactive.xpm +++ b/common/xfwm4-dark/hide-inactive.xpm @@ -1,32 +1,36 @@ /* XPM */ static char * hide_inactive_xpm[] = { -"24 24 5 1", +"28 28 5 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", "# c #666A73", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@######@@@@@@@@@", -"@@@@@@@@@######@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@######@@@@@@@@@@@", +"@@@@@@@@@@@######@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/hide-prelight.xpm b/common/xfwm4-dark/hide-prelight.xpm index 16f49a6..a1e465a 100644 --- a/common/xfwm4-dark/hide-prelight.xpm +++ b/common/xfwm4-dark/hide-prelight.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * hide_prelight_xpm[] = { -"24 24 22 1", +"28 28 22 1", " c None", ". c #21252B", "+ c #353B48", @@ -23,27 +23,31 @@ static char * hide_prelight_xpm[] = { "] c #3B4250", "^ c #C4C7CC", "/ c #252933", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&%*#@@@@@@@@", -"@@@@@@@=-;>,,>;-=@@@@@@@", -"@@@@@@=')!!!!!!~'=@@@@@@", -"@@@@@#-)!!!!!!!!~-#@@@@@", -"@@@@@$;!!!!!!!!!!;*@@@@@", -"@@@@@{]!!!!!!!!!!]%@@@@@", -"@@@@@&,!!^^^^^^!!,/@@@@@", -"@@@@@/,!!^^^^^^!!,/@@@@@", -"@@@@@%]!!!!!!!!!!]%@@@@@", -"@@@@@*;!!!!!!!!!!;*@@@@@", -"@@@@@#-~!!!!!!!!~%#@@@@@", -"@@@@@@='~!!!!!!~'=@@@@@@", -"@@@@@@@=-;],,];%=@@@@@@@", -"@@@@@@@@#*%&&%*#@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@#$%&&%*#@@@@@@@@@@", +"@@@@@@@@@=-;>,,>;-=@@@@@@@@@", +"@@@@@@@@=')!!!!!!~'=@@@@@@@@", +"@@@@@@@#-)!!!!!!!!~-#@@@@@@@", +"@@@@@@@$;!!!!!!!!!!;*@@@@@@@", +"@@@@@@@{]!!!!!!!!!!]%@@@@@@@", +"@@@@@@@&,!!^^^^^^!!,/@@@@@@@", +"@@@@@@@/,!!^^^^^^!!,/@@@@@@@", +"@@@@@@@%]!!!!!!!!!!]%@@@@@@@", +"@@@@@@@*;!!!!!!!!!!;*@@@@@@@", +"@@@@@@@#-~!!!!!!!!~%#@@@@@@@", +"@@@@@@@@='~!!!!!!~'=@@@@@@@@", +"@@@@@@@@@=-;],,];%=@@@@@@@@@", +"@@@@@@@@@@#*%&&%*#@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/hide-pressed.xpm b/common/xfwm4-dark/hide-pressed.xpm index 7fab4b3..7d49d4b 100644 --- a/common/xfwm4-dark/hide-pressed.xpm +++ b/common/xfwm4-dark/hide-pressed.xpm @@ -1,51 +1,56 @@ /* XPM */ static char * hide_pressed_xpm[] = { -"24 24 24 1", +"28 28 25 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", -"# c #313C48", -"$ c #406691", -"% c #4C81C1", -"& c #508FDA", -"* c #4B82C2", -"= c #406590", -"- c #3A5372", -"; c #508FD8", -"> c #5294E2", -", c #3A5371", -"' c #5193E1", -") c #4F8ED8", -"! c #323B49", -"~ c #406490", -"{ c #4B82C3", -"] c #FFFFFF", -"^ c #40648E", -"/ c #313B48", -"( c #395371", -"_ c #4B81C1", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&*=#@@@@@@@@", -"@@@@@@@-;>>>>>>;,@@@@@@@", -"@@@@@@-'>>>>>>>>',@@@@@@", -"@@@@@#;>>>>>>>>>>)!@@@@@", -"@@@@@$>>>>>>>>>>>>~@@@@@", -"@@@@@{>>>>>>>>>>>>*@@@@@", -"@@@@@&>>>]]]]]]>>>;@@@@@", -"@@@@@;>>>]]]]]]>>>)@@@@@", -"@@@@@%>>>>>>>>>>>>*@@@@@", -"@@@@@=>>>>>>>>>>>>^@@@@@", -"@@@@@#;>>>>>>>>>>)/@@@@@", -"@@@@@@,'>>>>>>>>'(@@@@@@", -"@@@@@@@,)>>>>>>)(@@@@@@@", -"@@@@@@@@!~_&&_^/@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #2F343B", +"$ c #313C48", +"% c #406691", +"& c #4C81C1", +"* c #508FDA", +"= c #4B82C2", +"- c #406590", +"; c #3A5372", +"> c #508FD8", +", c #5294E2", +"' c #3A5371", +") c #5193E1", +"! c #4F8ED8", +"~ c #323B49", +"{ c #406490", +"] c #4B82C3", +"^ c #FFFFFF", +"/ c #40648E", +"( c #313B48", +"_ c #395371", +": c #4B81C1", +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@########################@@", +"@@########################@@", +"@@########$%&**=-$########@@", +"@@#######;>,,,,,,>'#######@@", +"@@######;),,,,,,,,)'######@@", +"@@#####$>,,,,,,,,,,!~#####@@", +"@@#####%,,,,,,,,,,,,{#####@@", +"@@#####],,,,,,,,,,,,=#####@@", +"@@#####*,,,^^^^^^,,,>#####@@", +"@@#####>,,,^^^^^^,,,!#####@@", +"@@#####&,,,,,,,,,,,,=#####@@", +"@@#####-,,,,,,,,,,,,/#####@@", +"@@#####$>,,,,,,,,,,!(#####@@", +"@@######'),,,,,,,,)_######@@", +"@@#######'!,,,,,,!_#######@@", +"@@########~{:**:/(########@@", +"@@########################@@", +"@@########################@@", +"@@########################@@", +"@@########################@@", +"@@########################@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/maximize-active.xpm b/common/xfwm4-dark/maximize-active.xpm index be458f3..3709088 100644 --- a/common/xfwm4-dark/maximize-active.xpm +++ b/common/xfwm4-dark/maximize-active.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * maximize_active_xpm[] = { -"24 24 12 1", +"28 28 12 1", " c None", ". c #21252B", "+ c #353B48", @@ -13,27 +13,31 @@ static char * maximize_active_xpm[] = { "= c #323641", "- c #6E717B", "; c #7E818A", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@#$%%&@@@@@@@@@", -"@@@@@@@@@#@#$%%@@@@@@@@@", -"@@@@@@@@@*=@@-%@@@@@@@@@", -"@@@@@@@@@%*=@@-@@@@@@@@@", -"@@@@@@@@@%%$#@#@@@@@@@@@", -"@@@@@@@@@;%%$#@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@#$%%&@@@@@@@@@@@", +"@@@@@@@@@@@#@#$%%@@@@@@@@@@@", +"@@@@@@@@@@@*=@@-%@@@@@@@@@@@", +"@@@@@@@@@@@%*=@@-@@@@@@@@@@@", +"@@@@@@@@@@@%%$#@#@@@@@@@@@@@", +"@@@@@@@@@@@;%%$#@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/maximize-inactive.xpm b/common/xfwm4-dark/maximize-inactive.xpm index 579b2ff..86e1cca 100644 --- a/common/xfwm4-dark/maximize-inactive.xpm +++ b/common/xfwm4-dark/maximize-inactive.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * maximize_inactive_xpm[] = { -"24 24 12 1", +"28 28 12 1", " c None", ". c #21252B", "+ c #353B48", @@ -13,27 +13,31 @@ static char * maximize_inactive_xpm[] = { "= c #555A64", "- c #525761", "; c #5B5F69", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@#$%%&@@@@@@@@@", -"@@@@@@@@@#@#$%%@@@@@@@@@", -"@@@@@@@@*=#@@-%@@@@@@@@@", -"@@@@@@@@*%=#@@-@@@@@@@@@", -"@@@@@@@@*%%$#@#@@@@@@@@@", -"@@@@@@@@@;%%$#@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@#$%%&@@@@@@@@@@@", +"@@@@@@@@@@@#@#$%%@@@@@@@@@@@", +"@@@@@@@@@@*=#@@-%@@@@@@@@@@@", +"@@@@@@@@@@*%=#@@-@@@@@@@@@@@", +"@@@@@@@@@@*%%$#@#@@@@@@@@@@@", +"@@@@@@@@@@@;%%$#@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/maximize-prelight.xpm b/common/xfwm4-dark/maximize-prelight.xpm index 840b6c9..24e854e 100644 --- a/common/xfwm4-dark/maximize-prelight.xpm +++ b/common/xfwm4-dark/maximize-prelight.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * maximize_prelight_xpm[] = { -"24 24 31 1", +"28 28 31 1", " c None", ". c #21252B", "+ c #353B48", @@ -32,27 +32,31 @@ static char * maximize_prelight_xpm[] = { "| c #979BA6", "1 c #252933", "2 c #ACAFB7", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&%*#@@@@@@@@", -"@@@@@@@=-;>,,>;-=@@@@@@@", -"@@@@@@=')!!!!!!~'=@@@@@@", -"@@@@@#-)!!!!!!!!~-#@@@@@", -"@@@@@$;!!!{]^^/!!;*@@@@@", -"@@@@@(_!!{!{]^^!!_%@@@@@", -"@@@@@&,!:<[!}|^!!,1@@@@@", -"@@@@@1,!:^<[!}|!!,1@@@@@", -"@@@@@%_!:^^]{!{!!_%@@@@@", -"@@@@@*;!!2^^]{!!!;*@@@@@", -"@@@@@#-~!!!!!!!!~%#@@@@@", -"@@@@@@='~!!!!!!~'=@@@@@@", -"@@@@@@@=-;_,,_;%=@@@@@@@", -"@@@@@@@@#*%&&%*#@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@#$%&&%*#@@@@@@@@@@", +"@@@@@@@@@=-;>,,>;-=@@@@@@@@@", +"@@@@@@@@=')!!!!!!~'=@@@@@@@@", +"@@@@@@@#-)!!!!!!!!~-#@@@@@@@", +"@@@@@@@$;!!!{]^^/!!;*@@@@@@@", +"@@@@@@@(_!!{!{]^^!!_%@@@@@@@", +"@@@@@@@&,!:<[!}|^!!,1@@@@@@@", +"@@@@@@@1,!:^<[!}|!!,1@@@@@@@", +"@@@@@@@%_!:^^]{!{!!_%@@@@@@@", +"@@@@@@@*;!!2^^]{!!!;*@@@@@@@", +"@@@@@@@#-~!!!!!!!!~%#@@@@@@@", +"@@@@@@@@='~!!!!!!~'=@@@@@@@@", +"@@@@@@@@@=-;_,,_;%=@@@@@@@@@", +"@@@@@@@@@@#*%&&%*#@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/maximize-pressed.xpm b/common/xfwm4-dark/maximize-pressed.xpm index c0b4f88..a56f886 100644 --- a/common/xfwm4-dark/maximize-pressed.xpm +++ b/common/xfwm4-dark/maximize-pressed.xpm @@ -1,60 +1,65 @@ /* XPM */ static char * maximize_pressed_xpm[] = { -"24 24 33 1", +"28 28 34 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", -"# c #313C48", -"$ c #406691", -"% c #4C81C1", -"& c #508FDA", -"* c #4B82C2", -"= c #406590", -"- c #3A5372", -"; c #508FD8", -"> c #5294E2", -", c #3A5371", -"' c #5193E1", -") c #4F8ED8", -"! c #323B49", -"~ c #5596E3", -"{ c #C7DDF6", -"] c #FFFFFF", -"^ c #DDEAF9", -"/ c #406490", -"( c #4B82C3", -"_ c #5395E2", -": c #CCE0F6", -"< c #5797E3", -"[ c #5495E2", -"} c #C3DAF5", -"| c #DFEBFA", -"1 c #40648E", -"2 c #313B48", -"3 c #395371", -"4 c #4B81C1", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&*=#@@@@@@@@", -"@@@@@@@-;>>>>>>;,@@@@@@@", -"@@@@@@-'>>>>>>>>',@@@@@@", -"@@@@@#;>>>>>>>>>>)!@@@@@", -"@@@@@$>>>>~{]]^>>>/@@@@@", -"@@@@@(>>>~>~{]]>>>*@@@@@", -"@@@@@&>>_:<>[}]>>>;@@@@@", -"@@@@@;>>_]:<>[}>>>)@@@@@", -"@@@@@%>>_]]{~>~>>>*@@@@@", -"@@@@@=>>>|]]{~>>>>1@@@@@", -"@@@@@#;>>>>>>>>>>)2@@@@@", -"@@@@@@,'>>>>>>>>'3@@@@@@", -"@@@@@@@,)>>>>>>)3@@@@@@@", -"@@@@@@@@!/4&&412@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #2F343B", +"$ c #313C48", +"% c #406691", +"& c #4C81C1", +"* c #508FDA", +"= c #4B82C2", +"- c #406590", +"; c #3A5372", +"> c #508FD8", +", c #5294E2", +"' c #3A5371", +") c #5193E1", +"! c #4F8ED8", +"~ c #323B49", +"{ c #5596E3", +"] c #C7DDF6", +"^ c #FFFFFF", +"/ c #DDEAF9", +"( c #406490", +"_ c #4B82C3", +": c #5395E2", +"< c #CCE0F6", +"[ c #5797E3", +"} c #5495E2", +"| c #C3DAF5", +"1 c #DFEBFA", +"2 c #40648E", +"3 c #313B48", +"4 c #395371", +"5 c #4B81C1", +"............................", +"++++++++++++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@###@@@@@@@@", +"@@@@@@@@##################@@", +"@@########################@@", +"@@########$%&**=-$########@@", +"@@#######;>,,,,,,>'#######@@", +"@@######;),,,,,,,,)'######@@", +"@@#####$>,,,,,,,,,,!~#####@@", +"@@#####%,,,,{]^^/,,,(#####@@", +"@@#####_,,,{,{]^^,,,=#####@@", +"@@#####*,,:<[,}|^,,,>#####@@", +"@@#####>,,:^<[,}|,,,!#####@@", +"@@#####&,,:^^]{,{,,,=#####@@", +"@@#####-,,,1^^]{,,,,2#####@@", +"@@#####$>,,,,,,,,,,!3#####@@", +"@@######'),,,,,,,,)4######@@", +"@@#######'!,,,,,,!4#######@@", +"@@########~(5**523########@@", +"@@########################@@", +"@@########################@@", +"@@########################@@", +"@@########################@@", +"@@########################@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/menu-active.xpm b/common/xfwm4-dark/menu-active.xpm index 47d7968..b674ebf 100644 --- a/common/xfwm4-dark/menu-active.xpm +++ b/common/xfwm4-dark/menu-active.xpm @@ -1,28 +1,21 @@ /* XPM */ static char * menu_active_xpm[] = { -"16 22 3 1", +"26 16 2 1", " c None", ". c #2F343F", -"+ c #A4AAB7", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"....+......+....", -"....++....++....", -".....++..++.....", -"......++++......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +".........................."}; diff --git a/common/xfwm4-dark/menu-inactive.xpm b/common/xfwm4-dark/menu-inactive.xpm index 3a4e8bf..c52707e 100644 --- a/common/xfwm4-dark/menu-inactive.xpm +++ b/common/xfwm4-dark/menu-inactive.xpm @@ -1,28 +1,21 @@ /* XPM */ static char * menu_inactive_xpm[] = { -"16 22 3 1", +"26 16 2 1", " c None", ". c #2F343F", -"+ c #797D87", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"....+......+....", -"....++....++....", -".....++..++.....", -"......++++......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +".........................."}; diff --git a/common/xfwm4-dark/menu-pressed.xpm b/common/xfwm4-dark/menu-pressed.xpm index 2a297fb..c386e12 100644 --- a/common/xfwm4-dark/menu-pressed.xpm +++ b/common/xfwm4-dark/menu-pressed.xpm @@ -1,28 +1,21 @@ /* XPM */ static char * menu_pressed_xpm[] = { -"16 22 3 1", +"26 16 2 1", " c None", ". c #2F343F", -"+ c #5294E2", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"....+......+....", -"....++....++....", -".....++..++.....", -"......++++......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +".........................."}; diff --git a/common/xfwm4-dark/shade-active.xpm b/common/xfwm4-dark/shade-active.xpm index 35243b3..3c0e555 100644 --- a/common/xfwm4-dark/shade-active.xpm +++ b/common/xfwm4-dark/shade-active.xpm @@ -1,28 +1,36 @@ /* XPM */ static char * shade_active_xpm[] = { -"16 22 3 1", +"18 28 5 1", " c None", -". c #2F343F", -"+ c #A4AAB7", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -"......++++......", -".....++++++.....", -"....++++++++....", -"................", -"....++++++++....", -"....++++++++....", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #A4AAB7", +"..................", +"++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@####@@@@@@@", +"@@@@@@######@@@@@@", +"@@@@@########@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@########@@@@@", +"@@@@@########@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/shade-inactive.xpm b/common/xfwm4-dark/shade-inactive.xpm index 3e099fd..a4e3e8f 100644 --- a/common/xfwm4-dark/shade-inactive.xpm +++ b/common/xfwm4-dark/shade-inactive.xpm @@ -1,28 +1,36 @@ /* XPM */ static char * shade_inactive_xpm[] = { -"16 22 3 1", +"18 28 5 1", " c None", -". c #2F343F", -"+ c #797D87", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -"......++++......", -".....++++++.....", -"....++++++++....", -"................", -"....++++++++....", -"....++++++++....", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #797D87", +"..................", +"++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@####@@@@@@@", +"@@@@@@######@@@@@@", +"@@@@@########@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@########@@@@@", +"@@@@@########@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/shade-pressed.xpm b/common/xfwm4-dark/shade-pressed.xpm index 56d8e49..052d1f2 100644 --- a/common/xfwm4-dark/shade-pressed.xpm +++ b/common/xfwm4-dark/shade-pressed.xpm @@ -1,28 +1,36 @@ /* XPM */ static char * shade_pressed_xpm[] = { -"16 22 3 1", +"18 28 5 1", " c None", -". c #2F343F", -"+ c #5294E2", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -"......++++......", -".....++++++.....", -"....++++++++....", -"................", -"....++++++++....", -"....++++++++....", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #5294E2", +"..................", +"++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@####@@@@@@@", +"@@@@@@######@@@@@@", +"@@@@@########@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@########@@@@@", +"@@@@@########@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/stick-active.xpm b/common/xfwm4-dark/stick-active.xpm index cdea9f2..ea8377a 100644 --- a/common/xfwm4-dark/stick-active.xpm +++ b/common/xfwm4-dark/stick-active.xpm @@ -1,28 +1,36 @@ /* XPM */ static char * stick_active_xpm[] = { -"16 22 3 1", +"18 28 5 1", " c None", -". c #2F343F", -"+ c #A4AAB7", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -".......++.......", -".......++.......", -"....++++++++....", -"....++++++++....", -".......++.......", -".......++.......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #A4AAB7", +"..................", +"++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@########@@@@@", +"@@@@@########@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/stick-inactive.xpm b/common/xfwm4-dark/stick-inactive.xpm index 57fcc10..ae75f07 100644 --- a/common/xfwm4-dark/stick-inactive.xpm +++ b/common/xfwm4-dark/stick-inactive.xpm @@ -1,28 +1,36 @@ /* XPM */ static char * stick_inactive_xpm[] = { -"16 22 3 1", +"18 28 5 1", " c None", -". c #2F343F", -"+ c #797D87", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -".......++.......", -".......++.......", -"....++++++++....", -"....++++++++....", -".......++.......", -".......++.......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #797D87", +"..................", +"++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@########@@@@@", +"@@@@@########@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/stick-pressed.xpm b/common/xfwm4-dark/stick-pressed.xpm index c83dc82..f6b98ad 100644 --- a/common/xfwm4-dark/stick-pressed.xpm +++ b/common/xfwm4-dark/stick-pressed.xpm @@ -1,28 +1,36 @@ /* XPM */ static char * stick_pressed_xpm[] = { -"16 22 3 1", +"18 28 5 1", " c None", -". c #2F343F", -"+ c #5294E2", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -".......++.......", -".......++.......", -"....++++++++....", -"....++++++++....", -".......++.......", -".......++.......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #5294E2", +"..................", +"++++++++++++++++++", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@########@@@@@", +"@@@@@########@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@##@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/themerc b/common/xfwm4-dark/themerc index b848210..f7fd498 100644 --- a/common/xfwm4-dark/themerc +++ b/common/xfwm4-dark/themerc @@ -1,27 +1,23 @@ -button_offset=7 +button_offset=2 button_spacing=4 -full_width_title=true -title_horizontal_offset=0 -title_vertical_offset_active=1 -title_vertical_offset_inactive=1 -#title_shadow_active=true -title_shadow_inactive=true -#button_layout=O|HMC +show_app_icon=true + +full_width_title=true + +title_shadow_active=false +title_shadow_inactive=false + +title_horizontal_offset=3 active_text_color=#afb8c5 active_text_shadow_color=#2f343b + inactive_text_color=#808791 inactive_text_shadow_color=#2f343b -#placement_ratio=20 shadow_delta_height=2 shadow_delta_width=0 shadow_delta_x=0 shadow_delta_y=-5 -shadow_opacity=50 - -title_shadow_active=false - -show_frame_shadow=true -show_popup_shadow=true +shadow_opacity=40 diff --git a/common/xfwm4-dark/title-1-active-shaded.xpm b/common/xfwm4-dark/title-1-active-shaded.xpm deleted file mode 100644 index 4285a1f..0000000 --- a/common/xfwm4-dark/title-1-active-shaded.xpm +++ /dev/null @@ -1,31 +0,0 @@ -/* XPM */ -static char * title_1_active_shaded_xpm[] = { -"24 24 4 1", -" c None", -". c #21252B", -"+ c #353B48", -"@ c #2F343F", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/common/xfwm4-dark/title-1-active.xpm b/common/xfwm4-dark/title-1-active.xpm index 22da8da..3d17763 100644 --- a/common/xfwm4-dark/title-1-active.xpm +++ b/common/xfwm4-dark/title-1-active.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * title_1_active_xpm[] = { -"24 24 4 1", +"5 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +".....", +"+++++", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/common/xfwm4-dark/title-1-inactive.xpm b/common/xfwm4-dark/title-1-inactive.xpm index 8e30fbf..cbf087f 100644 --- a/common/xfwm4-dark/title-1-inactive.xpm +++ b/common/xfwm4-dark/title-1-inactive.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * title_1_inactive_xpm[] = { -"24 24 4 1", +"5 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +".....", +"+++++", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/common/xfwm4-dark/title-2-active.xpm b/common/xfwm4-dark/title-2-active.xpm index 11878e7..da14686 100644 --- a/common/xfwm4-dark/title-2-active.xpm +++ b/common/xfwm4-dark/title-2-active.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * title_2_active_xpm[] = { -"24 24 4 1", +"5 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +".....", +"+++++", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/common/xfwm4-dark/title-2-inactive.xpm b/common/xfwm4-dark/title-2-inactive.xpm index 1d7694a..db943cc 100644 --- a/common/xfwm4-dark/title-2-inactive.xpm +++ b/common/xfwm4-dark/title-2-inactive.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * title_2_inactive_xpm[] = { -"24 24 4 1", +"5 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +".....", +"+++++", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/common/xfwm4-dark/title-3-active.xpm b/common/xfwm4-dark/title-3-active.xpm index ce86c3b..d2dc86e 100644 --- a/common/xfwm4-dark/title-3-active.xpm +++ b/common/xfwm4-dark/title-3-active.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * title_3_active_xpm[] = { -"24 24 4 1", +"5 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +".....", +"+++++", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/common/xfwm4-dark/title-3-inactive.xpm b/common/xfwm4-dark/title-3-inactive.xpm index 0bb562c..e082de7 100644 --- a/common/xfwm4-dark/title-3-inactive.xpm +++ b/common/xfwm4-dark/title-3-inactive.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * title_3_inactive_xpm[] = { -"24 24 4 1", +"5 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +".....", +"+++++", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/common/xfwm4-dark/title-4-active.xpm b/common/xfwm4-dark/title-4-active.xpm index bc56ba8..92c4b4c 100644 --- a/common/xfwm4-dark/title-4-active.xpm +++ b/common/xfwm4-dark/title-4-active.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * title_4_active_xpm[] = { -"24 24 4 1", +"5 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +".....", +"+++++", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/common/xfwm4-dark/title-4-inactive.xpm b/common/xfwm4-dark/title-4-inactive.xpm index 499d6f3..8957742 100644 --- a/common/xfwm4-dark/title-4-inactive.xpm +++ b/common/xfwm4-dark/title-4-inactive.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * title_4_inactive_xpm[] = { -"24 24 4 1", +"5 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +".....", +"+++++", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/common/xfwm4-dark/title-5-active.xpm b/common/xfwm4-dark/title-5-active.xpm index 210d06c..761c6fe 100644 --- a/common/xfwm4-dark/title-5-active.xpm +++ b/common/xfwm4-dark/title-5-active.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * title_5_active_xpm[] = { -"24 24 4 1", +"5 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +".....", +"+++++", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/common/xfwm4-dark/title-5-inactive.xpm b/common/xfwm4-dark/title-5-inactive.xpm index ec89d56..0376f5a 100644 --- a/common/xfwm4-dark/title-5-inactive.xpm +++ b/common/xfwm4-dark/title-5-inactive.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * title_5_inactive_xpm[] = { -"24 24 4 1", +"5 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -"........................", -"++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@"}; +".....", +"+++++", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/common/xfwm4-dark/top-left-active-shaded.xpm b/common/xfwm4-dark/top-left-active-shaded.xpm deleted file mode 100644 index 2208363..0000000 --- a/common/xfwm4-dark/top-left-active-shaded.xpm +++ /dev/null @@ -1,31 +0,0 @@ -/* XPM */ -static char * top_left_active_shaded_xpm[] = { -"5 24 4 1", -" c None", -". c #21252B", -"+ c #353B48", -"@ c #2F343F", -" ....", -".++++", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@"}; diff --git a/common/xfwm4-dark/top-left-active.xpm b/common/xfwm4-dark/top-left-active.xpm index 3fd1897..fbf26b3 100644 --- a/common/xfwm4-dark/top-left-active.xpm +++ b/common/xfwm4-dark/top-left-active.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * top_left_active_xpm[] = { -"5 24 4 1", +"2 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -" ....", -".++++", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@"}; +" .", +".+", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@"}; diff --git a/common/xfwm4-dark/top-left-inactive.xpm b/common/xfwm4-dark/top-left-inactive.xpm index 78f4191..06f4012 100644 --- a/common/xfwm4-dark/top-left-inactive.xpm +++ b/common/xfwm4-dark/top-left-inactive.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * top_left_inactive_xpm[] = { -"5 24 4 1", +"2 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -" ....", -".++++", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@", -".@@@@"}; +" .", +".+", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@", +".@"}; diff --git a/common/xfwm4-dark/top-right-active-shaded.xpm b/common/xfwm4-dark/top-right-active-shaded.xpm deleted file mode 100644 index 23b0b0a..0000000 --- a/common/xfwm4-dark/top-right-active-shaded.xpm +++ /dev/null @@ -1,31 +0,0 @@ -/* XPM */ -static char * top_right_active_shaded_xpm[] = { -"5 24 4 1", -" c None", -". c #21252B", -"+ c #353B48", -"@ c #2F343F", -".... ", -"++++.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@."}; diff --git a/common/xfwm4-dark/top-right-active.xpm b/common/xfwm4-dark/top-right-active.xpm index 0339c30..cae6bab 100644 --- a/common/xfwm4-dark/top-right-active.xpm +++ b/common/xfwm4-dark/top-right-active.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * top_right_active_xpm[] = { -"5 24 4 1", +"2 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -".... ", -"++++.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@."}; +". ", +"+.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@."}; diff --git a/common/xfwm4-dark/top-right-inactive.xpm b/common/xfwm4-dark/top-right-inactive.xpm index abeee0f..08ac0ed 100644 --- a/common/xfwm4-dark/top-right-inactive.xpm +++ b/common/xfwm4-dark/top-right-inactive.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * top_right_inactive_xpm[] = { -"5 24 4 1", +"2 28 4 1", " c None", ". c #21252B", "+ c #353B48", "@ c #2F343F", -".... ", -"++++.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@.", -"@@@@."}; +". ", +"+.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@.", +"@."}; diff --git a/common/xfwm4/close-active.xpm b/common/xfwm4/close-active.xpm index dd3161c..1cd1433 100644 --- a/common/xfwm4/close-active.xpm +++ b/common/xfwm4/close-active.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * close_active_xpm[] = { -"24 24 39 1", +"28 28 39 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", @@ -40,27 +40,31 @@ static char * close_active_xpm[] = { "8 c #E7DDE0", "9 c #EABCC0", "0 c #F4656D", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++@#$%%&*@++++++++", -"+++++++=-;;;;;;->+++++++", -"++++++=,;;;;;;;;,>++++++", -"+++++@-;;';;;;);;!~+++++", -"+++++#;;;{]^^/{;;;(+++++", -"+++++$;;;_:<<:[;;;&+++++", -"+++++-;;;;}::|;;;;-+++++", -"+++++-;;;^<::12;;;!+++++", -"+++++$;;;]:33:<;;;&+++++", -"+++++*;;;45;;54;;;6+++++", -"+++++@-;;;;;;;;;;78+++++", -"++++++>,;;;;;;;;,9++++++", -"+++++++>!;;;;;;79+++++++", -"++++++++~(&00&68++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++@#$%%&*@++++++++++", +"+++++++++=-;;;;;;->+++++++++", +"++++++++=,;;;;;;;;,>++++++++", +"+++++++@-;;';;;;);;!~+++++++", +"+++++++#;;;{]^^/{;;;(+++++++", +"+++++++$;;;_:<<:[;;;&+++++++", +"+++++++-;;;;}::|;;;;-+++++++", +"+++++++-;;;^<::12;;;!+++++++", +"+++++++$;;;]:33:<;;;&+++++++", +"+++++++*;;;45;;54;;;6+++++++", +"+++++++@-;;;;;;;;;;78+++++++", +"++++++++>,;;;;;;;;,9++++++++", +"+++++++++>!;;;;;;79+++++++++", +"++++++++++~(&00&68++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/close-inactive.xpm b/common/xfwm4/close-inactive.xpm index 706c3ca..cc0e828 100644 --- a/common/xfwm4/close-inactive.xpm +++ b/common/xfwm4/close-inactive.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * close_inactive_xpm[] = { -"24 24 34 1", +"28 28 34 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", @@ -35,27 +35,31 @@ static char * close_inactive_xpm[] = { "3 c #D7D8DC", "4 c #BFC2C9", "5 c #B7BBC1", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++@#$%%$&@++++++++", -"+++++++*=------=*+++++++", -"++++++*;--------;*++++++", -"+++++@=-->----,--')+++++", -"+++++#---.!~~!.---&+++++", -"+++++{---].^^./---$+++++", -"+++++=----(.._----=+++++", -"+++++=---~^..:<---'+++++", -"+++++$---[.}}.^---$+++++", -"+++++&---|}--}|---1+++++", -"+++++@=----------2)+++++", -"++++++*;--------;3++++++", -"+++++++*'------23+++++++", -"++++++++)&45541)++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++@#$%%$&@++++++++++", +"+++++++++*=------=*+++++++++", +"++++++++*;--------;*++++++++", +"+++++++@=-->----,--')+++++++", +"+++++++#---.!~~!.---&+++++++", +"+++++++{---].^^./---$+++++++", +"+++++++=----(.._----=+++++++", +"+++++++=---~^..:<---'+++++++", +"+++++++$---[.}}.^---$+++++++", +"+++++++&---|}--}|---1+++++++", +"+++++++@=----------2)+++++++", +"++++++++*;--------;3++++++++", +"+++++++++*'------23+++++++++", +"++++++++++)&45541)++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/close-prelight.xpm b/common/xfwm4/close-prelight.xpm index da9b649..5df51a8 100644 --- a/common/xfwm4/close-prelight.xpm +++ b/common/xfwm4/close-prelight.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * close_prelight_xpm[] = { -"24 24 43 1", +"28 28 43 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", @@ -44,27 +44,31 @@ static char * close_prelight_xpm[] = { "b c #E7DFE3", "c c #EBC6CA", "d c #F39499", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++@#$%%$&@++++++++", -"+++++++*=------=;+++++++", -"++++++*>-------->;++++++", -"+++++@=--,----'--)!+++++", -"+++++#---~{]]^~---&+++++", -"+++++/---(_:<_[---$+++++", -"+++++=----}__|----=+++++", -"+++++=---12__34---)+++++", -"+++++$---5_66_7---$+++++", -"+++++&---89--98---0+++++", -"+++++@=----------ab+++++", -"++++++;>-------->c++++++", -"+++++++;)------ac+++++++", -"++++++++!&d%%d0b++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++@#$%%$&@++++++++++", +"+++++++++*=------=;+++++++++", +"++++++++*>-------->;++++++++", +"+++++++@=--,----'--)!+++++++", +"+++++++#---~{]]^~---&+++++++", +"+++++++/---(_:<_[---$+++++++", +"+++++++=----}__|----=+++++++", +"+++++++=---12__34---)+++++++", +"+++++++$---5_66_7---$+++++++", +"+++++++&---89--98---0+++++++", +"+++++++@=----------ab+++++++", +"++++++++;>-------->c++++++++", +"+++++++++;)------ac+++++++++", +"++++++++++!&d%%d0b++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/close-pressed.xpm b/common/xfwm4/close-pressed.xpm index 5675773..8ee775c 100644 --- a/common/xfwm4/close-pressed.xpm +++ b/common/xfwm4/close-pressed.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * close_pressed_xpm[] = { -"24 24 46 1", +"28 28 46 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", @@ -47,27 +47,31 @@ static char * close_pressed_xpm[] = { "e c #E7D9DC", "f c #E9ACB1", "g c #EF545B", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++@#$%%&*@++++++++", -"+++++++=-;;;;;;->+++++++", -"++++++=,;;;;;;;;,>++++++", -"+++++@-;;';;;;);;!~+++++", -"+++++#;;;{]^^/(;;;_+++++", -"+++++:;;;<[}|[1;;;&+++++", -"+++++2;;;;3[[4;;;;-+++++", -"+++++-;;;^5[[67;;;!+++++", -"+++++$;;;8[99[0;;;&+++++", -"+++++*;;;ab;;ba;;;c+++++", -"+++++@-;;;;;;;;;;de+++++", -"++++++>,;;;;;;;;,f++++++", -"+++++++>!;;;;;;df+++++++", -"++++++++~_g22gce++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++@#$%%&*@++++++++++", +"+++++++++=-;;;;;;->+++++++++", +"++++++++=,;;;;;;;;,>++++++++", +"+++++++@-;;';;;;);;!~+++++++", +"+++++++#;;;{]^^/(;;;_+++++++", +"+++++++:;;;<[}|[1;;;&+++++++", +"+++++++2;;;;3[[4;;;;-+++++++", +"+++++++-;;;^5[[67;;;!+++++++", +"+++++++$;;;8[99[0;;;&+++++++", +"+++++++*;;;ab;;ba;;;c+++++++", +"+++++++@-;;;;;;;;;;de+++++++", +"++++++++>,;;;;;;;;,f++++++++", +"+++++++++>!;;;;;;df+++++++++", +"++++++++++~_g22gce++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/hide-active.xpm b/common/xfwm4/hide-active.xpm index 5907b58..0f163b1 100644 --- a/common/xfwm4/hide-active.xpm +++ b/common/xfwm4/hide-active.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * hide_active_xpm[] = { -"24 24 4 1", +"28 28 4 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", "@ c #90949E", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"+++++++++@@@@@@+++++++++", -"+++++++++@@@@@@+++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"+++++++++++@@@@@@+++++++++++", +"+++++++++++@@@@@@+++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/hide-inactive.xpm b/common/xfwm4/hide-inactive.xpm index 5c146d2..9d86a14 100644 --- a/common/xfwm4/hide-inactive.xpm +++ b/common/xfwm4/hide-inactive.xpm @@ -1,31 +1,35 @@ /* XPM */ static char * hide_inactive_xpm[] = { -"24 24 4 1", +"28 28 4 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", "@ c #B5B8C0", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"+++++++++@@@@@@+++++++++", -"+++++++++@@@@@@+++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"+++++++++++@@@@@@+++++++++++", +"+++++++++++@@@@@@+++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/hide-prelight.xpm b/common/xfwm4/hide-prelight.xpm index 215a039..01232b0 100644 --- a/common/xfwm4/hide-prelight.xpm +++ b/common/xfwm4/hide-prelight.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * hide_prelight_xpm[] = { -"24 24 23 1", +"28 28 23 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", @@ -24,27 +24,31 @@ static char * hide_prelight_xpm[] = { "^ c #D1D4DA", "/ c #E0E1E5", "( c #F3F3F6", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++@#$%%$#@++++++++", -"+++++++&*=-;;->*&+++++++", -"++++++&,'))))))',&++++++", -"+++++@*'))))))))'*@+++++", -"+++++#=))))))))))>!+++++", -"+++++$-))))))))))-$+++++", -"+++++%~)){{{{{{))~%+++++", -"+++++%~)){{{{{{))]^+++++", -"+++++$-))))))))))-$+++++", -"+++++#>))))))))))>!+++++", -"+++++@*'))))))))'*@+++++", -"++++++&,'))))))',/++++++", -"+++++++&*>-~~(>*/+++++++", -"++++++++@!$%%$!@++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++@#$%%$#@++++++++++", +"+++++++++&*=-;;->*&+++++++++", +"++++++++&,'))))))',&++++++++", +"+++++++@*'))))))))'*@+++++++", +"+++++++#=))))))))))>!+++++++", +"+++++++$-))))))))))-$+++++++", +"+++++++%~)){{{{{{))~%+++++++", +"+++++++%~)){{{{{{))]^+++++++", +"+++++++$-))))))))))-$+++++++", +"+++++++#>))))))))))>!+++++++", +"+++++++@*'))))))))'*@+++++++", +"++++++++&,'))))))',/++++++++", +"+++++++++&*>-~~(>*/+++++++++", +"++++++++++@!$%%$!@++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/hide-pressed.xpm b/common/xfwm4/hide-pressed.xpm index 1394e04..f2fff0b 100644 --- a/common/xfwm4/hide-pressed.xpm +++ b/common/xfwm4/hide-pressed.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * hide_pressed_xpm[] = { -"24 24 24 1", +"28 28 24 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", @@ -25,27 +25,31 @@ static char * hide_pressed_xpm[] = { "/ c #DAE1EA", "( c #B6CDE8", "_ c #6FA4E3", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++@#$%%&*@++++++++", -"+++++++=-;;;;;;->+++++++", -"++++++=;;;;;;;;;;>++++++", -"+++++@-;;;;;;;;;;,'+++++", -"+++++#;;;;;;;;;;;;)+++++", -"+++++!;;;;;;;;;;;;&+++++", -"+++++~;;;{{{{{{;;;-+++++", -"+++++-;;;{{{{{{;;;,+++++", -"+++++$;;;;;;;;;;;;&+++++", -"+++++*;;;;;;;;;;;;]+++++", -"+++++@-;;;;;;;;;;^/+++++", -"++++++>;;;;;;;;;;(++++++", -"+++++++>,;;;;;;^(+++++++", -"++++++++')_~~_]/++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++@#$%%&*@++++++++++", +"+++++++++=-;;;;;;->+++++++++", +"++++++++=;;;;;;;;;;>++++++++", +"+++++++@-;;;;;;;;;;,'+++++++", +"+++++++#;;;;;;;;;;;;)+++++++", +"+++++++!;;;;;;;;;;;;&+++++++", +"+++++++~;;;{{{{{{;;;-+++++++", +"+++++++-;;;{{{{{{;;;,+++++++", +"+++++++$;;;;;;;;;;;;&+++++++", +"+++++++*;;;;;;;;;;;;]+++++++", +"+++++++@-;;;;;;;;;;^/+++++++", +"++++++++>;;;;;;;;;;(++++++++", +"+++++++++>,;;;;;;^(+++++++++", +"++++++++++')_~~_]/++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/maximize-active.xpm b/common/xfwm4/maximize-active.xpm index 8f978fc..e67208c 100644 --- a/common/xfwm4/maximize-active.xpm +++ b/common/xfwm4/maximize-active.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * maximize_active_xpm[] = { -"24 24 13 1", +"28 28 13 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", @@ -14,27 +14,31 @@ static char * maximize_active_xpm[] = { "- c #E6E7EB", "; c #ADB0B8", "> c #A0A4AB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++@#$$%+++++++++", -"+++++++++@+@#$$+++++++++", -"++++++++&*=+-;$+++++++++", -"++++++++&$*=+-;+++++++++", -"++++++++&$$#@+@+++++++++", -"+++++++++>$$#@++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++@#$$%+++++++++++", +"+++++++++++@+@#$$+++++++++++", +"++++++++++&*=+-;$+++++++++++", +"++++++++++&$*=+-;+++++++++++", +"++++++++++&$$#@+@+++++++++++", +"+++++++++++>$$#@++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/maximize-inactive.xpm b/common/xfwm4/maximize-inactive.xpm index b067a66..d90d5cd 100644 --- a/common/xfwm4/maximize-inactive.xpm +++ b/common/xfwm4/maximize-inactive.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * maximize_inactive_xpm[] = { -"24 24 12 1", +"28 28 12 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", @@ -13,27 +13,31 @@ static char * maximize_inactive_xpm[] = { "= c #E6E7EB", "- c #C6C8CE", "; c #BEC1C7", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++@#$$%+++++++++", -"+++++++++@+@#$$+++++++++", -"++++++++@&*+=-$+++++++++", -"++++++++@$&*+=-+++++++++", -"++++++++@$$#@+@+++++++++", -"+++++++++;$$#@++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++@#$$%+++++++++++", +"+++++++++++@+@#$$+++++++++++", +"++++++++++@&*+=-$+++++++++++", +"++++++++++@$&*+=-+++++++++++", +"++++++++++@$$#@+@+++++++++++", +"+++++++++++;$$#@++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/maximize-prelight.xpm b/common/xfwm4/maximize-prelight.xpm index 0b69086..06852e8 100644 --- a/common/xfwm4/maximize-prelight.xpm +++ b/common/xfwm4/maximize-prelight.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * maximize_prelight_xpm[] = { -"24 24 31 1", +"28 28 31 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", @@ -32,27 +32,31 @@ static char * maximize_prelight_xpm[] = { "| c #92969F", "1 c #E0E1E5", "2 c #F3F3F6", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++@#$%%$#@++++++++", -"+++++++&*=-;;->*&+++++++", -"++++++&,'))))))',&++++++", -"+++++@*'))))))))'*@+++++", -"+++++#=)))!~{{]))>^+++++", -"+++++$-))!)!~{{))-$+++++", -"+++++%/)(_:)<[{))/%+++++", -"+++++%/)({_:)<[))!}+++++", -"+++++$-)({{~!)!))-$+++++", -"+++++#>))|{{~!)))>^+++++", -"+++++@*'))))))))'*@+++++", -"++++++&,'))))))',1++++++", -"+++++++&*>-//2>*1+++++++", -"++++++++@^$%%$^@++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++@#$%%$#@++++++++++", +"+++++++++&*=-;;->*&+++++++++", +"++++++++&,'))))))',&++++++++", +"+++++++@*'))))))))'*@+++++++", +"+++++++#=)))!~{{]))>^+++++++", +"+++++++$-))!)!~{{))-$+++++++", +"+++++++%/)(_:)<[{))/%+++++++", +"+++++++%/)({_:)<[))!}+++++++", +"+++++++$-)({{~!)!))-$+++++++", +"+++++++#>))|{{~!)))>^+++++++", +"+++++++@*'))))))))'*@+++++++", +"++++++++&,'))))))',1++++++++", +"+++++++++&*>-//2>*1+++++++++", +"++++++++++@^$%%$^@++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/maximize-pressed.xpm b/common/xfwm4/maximize-pressed.xpm index 3ca7bc3..05818bf 100644 --- a/common/xfwm4/maximize-pressed.xpm +++ b/common/xfwm4/maximize-pressed.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * maximize_pressed_xpm[] = { -"24 24 33 1", +"28 28 33 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", @@ -34,27 +34,31 @@ static char * maximize_pressed_xpm[] = { "2 c #DAE1EA", "3 c #B6CDE8", "4 c #6FA4E3", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++@#$%%&*@++++++++", -"+++++++=-;;;;;;->+++++++", -"++++++=;;;;;;;;;;>++++++", -"+++++@-;;;;;;;;;;,'+++++", -"+++++#;;;;)!~~{;;;]+++++", -"+++++^;;;);)!~~;;;&+++++", -"+++++/;;(_:;<[~;;;-+++++", -"+++++-;;(~_:;<[;;;,+++++", -"+++++$;;(~~!););;;&+++++", -"+++++*;;;}~~!);;;;|+++++", -"+++++@-;;;;;;;;;;12+++++", -"++++++>;;;;;;;;;;3++++++", -"+++++++>,;;;;;;13+++++++", -"++++++++']4//4|2++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +"............................", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++@#$%%&*@++++++++++", +"+++++++++=-;;;;;;->+++++++++", +"++++++++=;;;;;;;;;;>++++++++", +"+++++++@-;;;;;;;;;;,'+++++++", +"+++++++#;;;;)!~~{;;;]+++++++", +"+++++++^;;;);)!~~;;;&+++++++", +"+++++++/;;(_:;<[~;;;-+++++++", +"+++++++-;;(~_:;<[;;;,+++++++", +"+++++++$;;(~~!););;;&+++++++", +"+++++++*;;;}~~!);;;;|+++++++", +"+++++++@-;;;;;;;;;;12+++++++", +"++++++++>;;;;;;;;;;3++++++++", +"+++++++++>,;;;;;;13+++++++++", +"++++++++++']4//4|2++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++"}; diff --git a/common/xfwm4/menu-active.xpm b/common/xfwm4/menu-active.xpm index c661f83..a60213d 100644 --- a/common/xfwm4/menu-active.xpm +++ b/common/xfwm4/menu-active.xpm @@ -1,28 +1,21 @@ /* XPM */ static char * menu_active_xpm[] = { -"16 22 3 1", +"26 16 2 1", " c None", ". c #E7E8EB", -"+ c #A4AAB7", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"....+......+....", -"....++....++....", -".....++..++.....", -"......++++......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +".........................."}; diff --git a/common/xfwm4/menu-inactive.xpm b/common/xfwm4/menu-inactive.xpm index 33b2f66..2263f26 100644 --- a/common/xfwm4/menu-inactive.xpm +++ b/common/xfwm4/menu-inactive.xpm @@ -1,28 +1,21 @@ /* XPM */ static char * menu_inactive_xpm[] = { -"16 22 3 1", +"26 16 2 1", " c None", ". c #E7E8EB", -"+ c #B9BFCE", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"....+......+....", -"....++....++....", -".....++..++.....", -"......++++......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +".........................."}; diff --git a/common/xfwm4/menu-pressed.xpm b/common/xfwm4/menu-pressed.xpm index e11490a..c2fae9e 100644 --- a/common/xfwm4/menu-pressed.xpm +++ b/common/xfwm4/menu-pressed.xpm @@ -1,28 +1,21 @@ /* XPM */ static char * menu_pressed_xpm[] = { -"16 22 3 1", +"26 16 2 1", " c None", ". c #E7E8EB", -"+ c #5294E2", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"....+......+....", -"....++....++....", -".....++..++.....", -"......++++......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +"..........................", +".........................."}; diff --git a/common/xfwm4/shade-active.xpm b/common/xfwm4/shade-active.xpm index a51b9be..eac4841 100644 --- a/common/xfwm4/shade-active.xpm +++ b/common/xfwm4/shade-active.xpm @@ -1,28 +1,35 @@ /* XPM */ static char * shade_active_xpm[] = { -"16 22 3 1", +"18 28 4 1", " c None", -". c #E7E8EB", -"+ c #A4AAB7", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -"......++++......", -".....++++++.....", -"....++++++++....", -"................", -"....++++++++....", -"....++++++++....", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #EEEFF1", +"+ c #E7E8EB", +"@ c #A4AAB7", +"..................", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++@@++++++++", +"+++++++@@@@+++++++", +"++++++@@@@@@++++++", +"+++++@@@@@@@@+++++", +"++++++++++++++++++", +"+++++@@@@@@@@+++++", +"+++++@@@@@@@@+++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++"}; diff --git a/common/xfwm4/shade-inactive.xpm b/common/xfwm4/shade-inactive.xpm index 307351d..0ea245d 100644 --- a/common/xfwm4/shade-inactive.xpm +++ b/common/xfwm4/shade-inactive.xpm @@ -1,28 +1,35 @@ /* XPM */ static char * shade_inactive_xpm[] = { -"16 22 3 1", +"18 28 4 1", " c None", -". c #E7E8EB", -"+ c #B9BFCE", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -"......++++......", -".....++++++.....", -"....++++++++....", -"................", -"....++++++++....", -"....++++++++....", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #EEEFF1", +"+ c #E7E8EB", +"@ c #B9BFCE", +"..................", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++@@++++++++", +"+++++++@@@@+++++++", +"++++++@@@@@@++++++", +"+++++@@@@@@@@+++++", +"++++++++++++++++++", +"+++++@@@@@@@@+++++", +"+++++@@@@@@@@+++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++"}; diff --git a/common/xfwm4/shade-pressed.xpm b/common/xfwm4/shade-pressed.xpm index ca53b7b..5b7b166 100644 --- a/common/xfwm4/shade-pressed.xpm +++ b/common/xfwm4/shade-pressed.xpm @@ -1,28 +1,35 @@ /* XPM */ static char * shade_pressed_xpm[] = { -"16 22 3 1", +"18 28 4 1", " c None", -". c #E7E8EB", -"+ c #5294E2", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -"......++++......", -".....++++++.....", -"....++++++++....", -"................", -"....++++++++....", -"....++++++++....", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #EEEFF1", +"+ c #E7E8EB", +"@ c #5294E2", +"..................", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++@@++++++++", +"+++++++@@@@+++++++", +"++++++@@@@@@++++++", +"+++++@@@@@@@@+++++", +"++++++++++++++++++", +"+++++@@@@@@@@+++++", +"+++++@@@@@@@@+++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++"}; diff --git a/common/xfwm4/stick-active.xpm b/common/xfwm4/stick-active.xpm index 01a1f90..5e434e4 100644 --- a/common/xfwm4/stick-active.xpm +++ b/common/xfwm4/stick-active.xpm @@ -1,28 +1,35 @@ /* XPM */ static char * stick_active_xpm[] = { -"16 22 3 1", +"18 28 4 1", " c None", -". c #E7E8EB", -"+ c #A4AAB7", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -".......++.......", -".......++.......", -"....++++++++....", -"....++++++++....", -".......++.......", -".......++.......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #EEEFF1", +"+ c #E7E8EB", +"@ c #A4AAB7", +"..................", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"+++++@@@@@@@@+++++", +"+++++@@@@@@@@+++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++"}; diff --git a/common/xfwm4/stick-inactive.xpm b/common/xfwm4/stick-inactive.xpm index 19bca20..8adae7b 100644 --- a/common/xfwm4/stick-inactive.xpm +++ b/common/xfwm4/stick-inactive.xpm @@ -1,28 +1,35 @@ /* XPM */ static char * stick_inactive_xpm[] = { -"16 22 3 1", +"18 28 4 1", " c None", -". c #E7E8EB", -"+ c #B9BFCE", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -".......++.......", -".......++.......", -"....++++++++....", -"....++++++++....", -".......++.......", -".......++.......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #EEEFF1", +"+ c #E7E8EB", +"@ c #B9BFCE", +"..................", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"+++++@@@@@@@@+++++", +"+++++@@@@@@@@+++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++"}; diff --git a/common/xfwm4/stick-pressed.xpm b/common/xfwm4/stick-pressed.xpm index 3a3a2a9..b13b23a 100644 --- a/common/xfwm4/stick-pressed.xpm +++ b/common/xfwm4/stick-pressed.xpm @@ -1,28 +1,35 @@ /* XPM */ static char * stick_pressed_xpm[] = { -"16 22 3 1", +"18 28 4 1", " c None", -". c #E7E8EB", -"+ c #5294E2", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -".......++.......", -".......++.......", -".......++.......", -"....++++++++....", -"....++++++++....", -".......++.......", -".......++.......", -".......++.......", -"................", -"................", -"................", -"................", -"................", -"................", -"................"}; +". c #EEEFF1", +"+ c #E7E8EB", +"@ c #5294E2", +"..................", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"+++++@@@@@@@@+++++", +"+++++@@@@@@@@+++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"++++++++@@++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++", +"++++++++++++++++++"}; diff --git a/common/xfwm4/themerc b/common/xfwm4/themerc index 486b1d6..e584d43 100644 --- a/common/xfwm4/themerc +++ b/common/xfwm4/themerc @@ -1,27 +1,23 @@ -button_offset=7 +button_offset=2 button_spacing=4 -full_width_title=true -title_horizontal_offset=0 -title_vertical_offset_active=1 -title_vertical_offset_inactive=1 -#title_shadow_active=true -title_shadow_inactive=true -#button_layout=O|HMC +show_app_icon=true + +full_width_title=true + +title_shadow_active=false +title_shadow_inactive=false + +title_horizontal_offset=3 active_text_color=#70788d active_text_shadow_color=#e7e8eb + inactive_text_color=#979dac inactive_text_shadow_color=#e7e8eb -#placement_ratio=20 shadow_delta_height=2 shadow_delta_width=0 shadow_delta_x=0 shadow_delta_y=-5 -shadow_opacity=50 - -title_shadow_active=false - -show_frame_shadow=true -show_popup_shadow=true +shadow_opacity=40 diff --git a/common/xfwm4/title-1-active-shaded.xpm b/common/xfwm4/title-1-active-shaded.xpm deleted file mode 100644 index 662295d..0000000 --- a/common/xfwm4/title-1-active-shaded.xpm +++ /dev/null @@ -1,30 +0,0 @@ -/* XPM */ -static char * title_1_active_shaded_xpm[] = { -"24 24 3 1", -" c None", -". c #EEEFF1", -"+ c #E7E8EB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; diff --git a/common/xfwm4/title-1-active.xpm b/common/xfwm4/title-1-active.xpm index e1507a7..3cd1343 100644 --- a/common/xfwm4/title-1-active.xpm +++ b/common/xfwm4/title-1-active.xpm @@ -1,30 +1,34 @@ /* XPM */ static char * title_1_active_xpm[] = { -"24 24 3 1", +"5 28 3 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +".....", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++"}; diff --git a/common/xfwm4/title-1-inactive.xpm b/common/xfwm4/title-1-inactive.xpm index 1e4f127..c80d54e 100644 --- a/common/xfwm4/title-1-inactive.xpm +++ b/common/xfwm4/title-1-inactive.xpm @@ -1,30 +1,34 @@ /* XPM */ static char * title_1_inactive_xpm[] = { -"24 24 3 1", +"5 28 3 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +".....", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++"}; diff --git a/common/xfwm4/title-2-active.xpm b/common/xfwm4/title-2-active.xpm index c4e271a..c95ef97 100644 --- a/common/xfwm4/title-2-active.xpm +++ b/common/xfwm4/title-2-active.xpm @@ -1,30 +1,34 @@ /* XPM */ static char * title_2_active_xpm[] = { -"24 24 3 1", +"5 28 3 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +".....", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++"}; diff --git a/common/xfwm4/title-2-inactive.xpm b/common/xfwm4/title-2-inactive.xpm index 1394d42..e3c714b 100644 --- a/common/xfwm4/title-2-inactive.xpm +++ b/common/xfwm4/title-2-inactive.xpm @@ -1,30 +1,34 @@ /* XPM */ static char * title_2_inactive_xpm[] = { -"24 24 3 1", +"5 28 3 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +".....", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++"}; diff --git a/common/xfwm4/title-3-active.xpm b/common/xfwm4/title-3-active.xpm index c8c27ab..56a283f 100644 --- a/common/xfwm4/title-3-active.xpm +++ b/common/xfwm4/title-3-active.xpm @@ -1,30 +1,34 @@ /* XPM */ static char * title_3_active_xpm[] = { -"24 24 3 1", +"5 28 3 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +".....", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++"}; diff --git a/common/xfwm4/title-3-inactive.xpm b/common/xfwm4/title-3-inactive.xpm index 756e8f2..027b4b1 100644 --- a/common/xfwm4/title-3-inactive.xpm +++ b/common/xfwm4/title-3-inactive.xpm @@ -1,30 +1,34 @@ /* XPM */ static char * title_3_inactive_xpm[] = { -"24 24 3 1", +"5 28 3 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +".....", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++"}; diff --git a/common/xfwm4/title-4-active.xpm b/common/xfwm4/title-4-active.xpm index 00b532b..b01ba4f 100644 --- a/common/xfwm4/title-4-active.xpm +++ b/common/xfwm4/title-4-active.xpm @@ -1,30 +1,34 @@ /* XPM */ static char * title_4_active_xpm[] = { -"24 24 3 1", +"5 28 3 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +".....", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++"}; diff --git a/common/xfwm4/title-4-inactive.xpm b/common/xfwm4/title-4-inactive.xpm index f085d68..1415bd2 100644 --- a/common/xfwm4/title-4-inactive.xpm +++ b/common/xfwm4/title-4-inactive.xpm @@ -1,30 +1,34 @@ /* XPM */ static char * title_4_inactive_xpm[] = { -"24 24 3 1", +"5 28 3 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +".....", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++"}; diff --git a/common/xfwm4/title-5-active.xpm b/common/xfwm4/title-5-active.xpm index f387f3f..1ca25d2 100644 --- a/common/xfwm4/title-5-active.xpm +++ b/common/xfwm4/title-5-active.xpm @@ -1,30 +1,34 @@ /* XPM */ static char * title_5_active_xpm[] = { -"24 24 3 1", +"5 28 3 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +".....", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++"}; diff --git a/common/xfwm4/title-5-inactive.xpm b/common/xfwm4/title-5-inactive.xpm index 3f63110..925bbb0 100644 --- a/common/xfwm4/title-5-inactive.xpm +++ b/common/xfwm4/title-5-inactive.xpm @@ -1,30 +1,34 @@ /* XPM */ static char * title_5_inactive_xpm[] = { -"24 24 3 1", +"5 28 3 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"........................", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++"}; +".....", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++", +"+++++"}; diff --git a/common/xfwm4/top-left-active-shaded.xpm b/common/xfwm4/top-left-active-shaded.xpm deleted file mode 100644 index 47dc7df..0000000 --- a/common/xfwm4/top-left-active-shaded.xpm +++ /dev/null @@ -1,32 +0,0 @@ -/* XPM */ -static char * top_left_active_shaded_xpm[] = { -"5 24 5 1", -" c None", -". c #ECEDF0", -"+ c #EEEFF1", -"@ c #E8E9EB", -"# c #E7E8EB", -" .+++", -".@###", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####"}; diff --git a/common/xfwm4/top-left-active.xpm b/common/xfwm4/top-left-active.xpm index 423a3bf..97217ee 100644 --- a/common/xfwm4/top-left-active.xpm +++ b/common/xfwm4/top-left-active.xpm @@ -1,32 +1,35 @@ /* XPM */ static char * top_left_active_xpm[] = { -"5 24 5 1", +"2 28 4 1", " c None", ". c #ECEDF0", -"+ c #EEEFF1", -"@ c #E8E9EB", -"# c #E7E8EB", -" .+++", -".@###", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####"}; +"+ c #E8E9EB", +"@ c #E7E8EB", +" .", +".+", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@"}; diff --git a/common/xfwm4/top-left-inactive.xpm b/common/xfwm4/top-left-inactive.xpm index 9c4f88e..6071c0b 100644 --- a/common/xfwm4/top-left-inactive.xpm +++ b/common/xfwm4/top-left-inactive.xpm @@ -1,32 +1,35 @@ /* XPM */ static char * top_left_inactive_xpm[] = { -"5 24 5 1", +"2 28 4 1", " c None", ". c #ECEDF0", -"+ c #EEEFF1", -"@ c #E8E9EB", -"# c #E7E8EB", -" .+++", -".@###", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####", -"#####"}; +"+ c #E8E9EB", +"@ c #E7E8EB", +" .", +".+", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@"}; diff --git a/common/xfwm4/top-right-active-shaded.xpm b/common/xfwm4/top-right-active-shaded.xpm deleted file mode 100644 index 4920284..0000000 --- a/common/xfwm4/top-right-active-shaded.xpm +++ /dev/null @@ -1,32 +0,0 @@ -/* XPM */ -static char * top_right_active_shaded_xpm[] = { -"5 24 5 1", -" c None", -". c #EEEFF1", -"+ c #ECEDF0", -"@ c #E7E8EB", -"# c #E8E9EB", -"...+ ", -"@@@#+", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@"}; diff --git a/common/xfwm4/top-right-active.xpm b/common/xfwm4/top-right-active.xpm index 3c9a583..57ad16b 100644 --- a/common/xfwm4/top-right-active.xpm +++ b/common/xfwm4/top-right-active.xpm @@ -1,32 +1,35 @@ /* XPM */ static char * top_right_active_xpm[] = { -"5 24 5 1", +"2 28 4 1", " c None", -". c #EEEFF1", -"+ c #ECEDF0", +". c #ECEDF0", +"+ c #E8E9EB", "@ c #E7E8EB", -"# c #E8E9EB", -"...+ ", -"@@@#+", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@"}; +". ", +"+.", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@"}; diff --git a/common/xfwm4/top-right-inactive.xpm b/common/xfwm4/top-right-inactive.xpm index 35285a5..f32a699 100644 --- a/common/xfwm4/top-right-inactive.xpm +++ b/common/xfwm4/top-right-inactive.xpm @@ -1,32 +1,35 @@ /* XPM */ static char * top_right_inactive_xpm[] = { -"5 24 5 1", +"2 28 4 1", " c None", -". c #EEEFF1", -"+ c #ECEDF0", +". c #ECEDF0", +"+ c #E8E9EB", "@ c #E7E8EB", -"# c #E8E9EB", -"...+ ", -"@@@#+", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@", -"@@@@@"}; +". ", +"+.", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@", +"@@"}; From da9ce16f2c0d9f12fcae70120ce43f14514b866f Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sat, 28 May 2016 18:16:14 +0200 Subject: [PATCH 02/17] gedit: fix subpixel-rendering in open-document-selector-treeview (fix #549) --- common/gtk-3.0/3.16/gtk-dark.css | 2 +- common/gtk-3.0/3.16/gtk-darker.css | 2 +- common/gtk-3.0/3.16/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.16/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.16/gtk-solid.css | 2 +- common/gtk-3.0/3.16/gtk.css | 2 +- common/gtk-3.0/3.16/sass/_applications.scss | 2 +- common/gtk-3.0/3.18/gtk-dark.css | 2 +- common/gtk-3.0/3.18/gtk-darker.css | 2 +- common/gtk-3.0/3.18/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.18/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.18/gtk-solid.css | 2 +- common/gtk-3.0/3.18/gtk.css | 2 +- common/gtk-3.0/3.18/sass/_applications.scss | 2 +- common/gtk-3.0/3.20/gtk-dark.css | 2 +- common/gtk-3.0/3.20/gtk-darker.css | 2 +- common/gtk-3.0/3.20/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.20/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.20/gtk-solid.css | 2 +- common/gtk-3.0/3.20/gtk.css | 2 +- common/gtk-3.0/3.20/sass/_applications.scss | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index cb8e163..a5df689 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -2652,7 +2652,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { padding: 3px 6px 3px 6px; border-color: #404552; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #4a4f5c; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index 1267c82..013c690 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -2655,7 +2655,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index d15ccad..dacc9f4 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -2652,7 +2652,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { padding: 3px 6px 3px 6px; border-color: #404552; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #4a4f5c; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index a949c92..1fee18d 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -2655,7 +2655,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index ba72279..fc504fd 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -2655,7 +2655,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index 98e7e82..894fa9e 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -2655,7 +2655,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss index bfcee21..3268f75 100644 --- a/common/gtk-3.0/3.16/sass/_applications.scss +++ b/common/gtk-3.0/3.16/sass/_applications.scss @@ -191,7 +191,7 @@ NemoWindow { border-color: $base_color; // disable borders, making them transparent doesn't work for some reason &:prelight { - background-color: transparentize(black, 0.95); + background-color: mix($fg_color, $base_color, 7%); &:selected { color: $selected_fg_color; diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 8f5f85d..58aa032 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -2782,7 +2782,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . padding: 3px 6px 3px 6px; border-color: #404552; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #4a4f5c; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 93ef024..83af4df 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -2785,7 +2785,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index 84e87d7..a4e9282 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -2782,7 +2782,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . padding: 3px 6px 3px 6px; border-color: #404552; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #4a4f5c; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index 81b8e0e..9c4cc5e 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -2785,7 +2785,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index bf933ca..e375835 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -2789,7 +2789,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index 6b5d571..67cc6f8 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -2789,7 +2789,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:prelight { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:prelight:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss index 63e1186..2a02203 100644 --- a/common/gtk-3.0/3.18/sass/_applications.scss +++ b/common/gtk-3.0/3.18/sass/_applications.scss @@ -210,7 +210,7 @@ NemoWindow { border-color: $base_color; // disable borders, making them transparent doesn't work for some reason &:prelight { - background-color: transparentize(black, 0.95); + background-color: mix($fg_color, $base_color, 7%); &:selected { color: $selected_fg_color; diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 034c752..317cc5a 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -3221,7 +3221,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can padding: 3px 6px 3px 6px; border-color: #404552; } .open-document-selector-treeview.view:hover, iconview.open-document-selector-treeview:hover { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #4a4f5c; } .open-document-selector-treeview.view:hover:selected, iconview.open-document-selector-treeview:hover:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 6cf6f13..042ea6c 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -3219,7 +3219,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:hover, iconview.open-document-selector-treeview:hover { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:hover:selected, iconview.open-document-selector-treeview:hover:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 5fc855f..3819b84 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -3221,7 +3221,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can padding: 3px 6px 3px 6px; border-color: #404552; } .open-document-selector-treeview.view:hover, iconview.open-document-selector-treeview:hover { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #4a4f5c; } .open-document-selector-treeview.view:hover:selected, iconview.open-document-selector-treeview:hover:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index f515b6a..a00cb02 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -3219,7 +3219,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:hover, iconview.open-document-selector-treeview:hover { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:hover:selected, iconview.open-document-selector-treeview:hover:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 87ce4d3..38c08cd 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -3223,7 +3223,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:hover, iconview.open-document-selector-treeview:hover { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:hover:selected, iconview.open-document-selector-treeview:hover:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index f20d7d6..7d600a3 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -3223,7 +3223,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can padding: 3px 6px 3px 6px; border-color: #ffffff; } .open-document-selector-treeview.view:hover, iconview.open-document-selector-treeview:hover { - background-color: rgba(0, 0, 0, 0.05); } + background-color: #f4f4f5; } .open-document-selector-treeview.view:hover:selected, iconview.open-document-selector-treeview:hover:selected { color: #ffffff; background-color: #5294E2; } diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss index 5a6cb9d..ef65794 100644 --- a/common/gtk-3.0/3.20/sass/_applications.scss +++ b/common/gtk-3.0/3.20/sass/_applications.scss @@ -160,7 +160,7 @@ $disk_space_free: darken($bg_color, 3%); border-color: $base_color; // disable borders, making them transparent doesn't work for some reason &:hover { - background-color: transparentize(black, 0.95); + background-color: mix($fg_color, $base_color, 7%); &:selected { color: $selected_fg_color; From 5fd6b58a42e9b80ffa6fdecb260db9198ddc324b Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sat, 28 May 2016 19:08:51 +0200 Subject: [PATCH 03/17] remove textview border --- common/gtk-3.0/3.20/gtk-dark.css | 16 +-------------- common/gtk-3.0/3.20/gtk-darker.css | 16 +-------------- common/gtk-3.0/3.20/gtk-solid-dark.css | 16 +-------------- common/gtk-3.0/3.20/gtk-solid-darker.css | 16 +-------------- common/gtk-3.0/3.20/gtk-solid.css | 16 +-------------- common/gtk-3.0/3.20/gtk.css | 16 +-------------- common/gtk-3.0/3.20/sass/_common.scss | 26 +----------------------- 7 files changed, 7 insertions(+), 115 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 317cc5a..ed69d43 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -55,21 +55,7 @@ textview text { border-radius: 2px; } textview border { - background-color: #3c414e; - background-image: image(rgba(0, 0, 0, 0.2)); - background-repeat: no-repeat; } - textview border.bottom { - background-size: 100% 1px; - background-position: top; } - textview border.top { - background-size: 100% 1px; - background-position: bottom; } - textview border.left { - background-size: 1px 100%; - background-position: right; } - textview border.right { - background-size: 1px 100%; - background-position: left; } + background-color: #3c414e; } rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, .rubberband { diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 042ea6c..08ce9e4 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -55,21 +55,7 @@ textview text { border-radius: 2px; } textview border { - background-color: #fafbfb; - background-image: image(rgba(0, 0, 0, 0.2)); - background-repeat: no-repeat; } - textview border.bottom { - background-size: 100% 1px; - background-position: top; } - textview border.top { - background-size: 100% 1px; - background-position: bottom; } - textview border.left { - background-size: 1px 100%; - background-position: right; } - textview border.right { - background-size: 1px 100%; - background-position: left; } + background-color: #fafbfb; } rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, .rubberband { diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 3819b84..06c5095 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -55,21 +55,7 @@ textview text { border-radius: 2px; } textview border { - background-color: #3c414e; - background-image: image(rgba(0, 0, 0, 0.2)); - background-repeat: no-repeat; } - textview border.bottom { - background-size: 100% 1px; - background-position: top; } - textview border.top { - background-size: 100% 1px; - background-position: bottom; } - textview border.left { - background-size: 1px 100%; - background-position: right; } - textview border.right { - background-size: 1px 100%; - background-position: left; } + background-color: #3c414e; } rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, .rubberband { diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index a00cb02..047d790 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -55,21 +55,7 @@ textview text { border-radius: 2px; } textview border { - background-color: #fafbfb; - background-image: image(rgba(0, 0, 0, 0.2)); - background-repeat: no-repeat; } - textview border.bottom { - background-size: 100% 1px; - background-position: top; } - textview border.top { - background-size: 100% 1px; - background-position: bottom; } - textview border.left { - background-size: 1px 100%; - background-position: right; } - textview border.right { - background-size: 1px 100%; - background-position: left; } + background-color: #fafbfb; } rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, .rubberband { diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 38c08cd..14f42ee 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -55,21 +55,7 @@ textview text { border-radius: 2px; } textview border { - background-color: #fafbfb; - background-image: image(rgba(0, 0, 0, 0.2)); - background-repeat: no-repeat; } - textview border.bottom { - background-size: 100% 1px; - background-position: top; } - textview border.top { - background-size: 100% 1px; - background-position: bottom; } - textview border.left { - background-size: 1px 100%; - background-position: right; } - textview border.right { - background-size: 1px 100%; - background-position: left; } + background-color: #fafbfb; } rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, .rubberband { diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 7d600a3..a163e1c 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -55,21 +55,7 @@ textview text { border-radius: 2px; } textview border { - background-color: #fafbfb; - background-image: image(rgba(0, 0, 0, 0.2)); - background-repeat: no-repeat; } - textview border.bottom { - background-size: 100% 1px; - background-position: top; } - textview border.top { - background-size: 100% 1px; - background-position: bottom; } - textview border.left { - background-size: 1px 100%; - background-position: right; } - textview border.right { - background-size: 1px 100%; - background-position: left; } + background-color: #fafbfb; } rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, .rubberband { diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 8cf477d..279c598 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -87,31 +87,7 @@ textview { } } -textview border { - background-color: mix($bg_color, $base_color, 50%); - background-image: image(transparentize(black, 0.8)); // HACK: the border node just draws background so, - background-repeat: no-repeat; // using a background-image to draw the border - - &.bottom { - background-size: 100% 1px; - background-position: top; - } - - &.top { - background-size: 100% 1px; - background-position: bottom; - } - - &.left { - background-size: 1px 100%; - background-position: right; - } - - &.right { - background-size: 1px 100%; - background-position: left; - } -} +textview border { background-color: mix($bg_color, $base_color, 50%); } iconview { @extend .view; } From 753130a3ba5386d485d519b4a93aea4d184c4850 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 29 May 2016 19:14:44 +0200 Subject: [PATCH 04/17] tweak unity panel background color --- common/gtk-3.0/3.14/gtk-dark.css | 2 +- common/gtk-3.0/3.14/gtk-darker.css | 2 +- common/gtk-3.0/3.14/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.14/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.14/gtk-solid.css | 2 +- common/gtk-3.0/3.14/gtk.css | 2 +- common/gtk-3.0/3.14/sass/_unity.scss | 2 +- common/gtk-3.0/3.16/gtk-dark.css | 2 +- common/gtk-3.0/3.16/gtk-darker.css | 2 +- common/gtk-3.0/3.16/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.16/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.16/gtk-solid.css | 2 +- common/gtk-3.0/3.16/gtk.css | 2 +- common/gtk-3.0/3.16/sass/_unity.scss | 2 +- common/gtk-3.0/3.18/gtk-dark.css | 2 +- common/gtk-3.0/3.18/gtk-darker.css | 2 +- common/gtk-3.0/3.18/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.18/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.18/gtk-solid.css | 2 +- common/gtk-3.0/3.18/gtk.css | 2 +- common/gtk-3.0/3.18/sass/_unity.scss | 2 +- common/gtk-3.0/3.20/gtk-dark.css | 2 +- common/gtk-3.0/3.20/gtk-darker.css | 2 +- common/gtk-3.0/3.20/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.20/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.20/gtk-solid.css | 2 +- common/gtk-3.0/3.20/gtk.css | 2 +- common/gtk-3.0/3.20/sass/_unity.scss | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index 3b8ae54..b2a429f 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -3236,7 +3236,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index 9e161d9..25337f3 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -3239,7 +3239,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index 5687164..f6f7b26 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -3236,7 +3236,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index c4aac5b..a40da22 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -3239,7 +3239,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index a9d8b45..70956a9 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -3239,7 +3239,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index 0f13a15..5bf75ca 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -3239,7 +3239,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.14/sass/_unity.scss b/common/gtk-3.0/3.14/sass/_unity.scss index e04ee41..aaedf92 100644 --- a/common/gtk-3.0/3.14/sass/_unity.scss +++ b/common/gtk-3.0/3.14/sass/_unity.scss @@ -43,7 +43,7 @@ UnityDecoration { // Panel Style UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, opacify($panel_bg, 1)); + background-image: linear-gradient(to bottom, #2f343f); color: lighten($panel_fg, 20%); box-shadow: none; diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index a5df689..a023c99 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -3113,7 +3113,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index 013c690..a2974e3 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -3116,7 +3116,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index dacc9f4..b5d6997 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -3113,7 +3113,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index 1fee18d..623c69f 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -3116,7 +3116,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index fc504fd..dfc1d5b 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -3116,7 +3116,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index 894fa9e..e77c406 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -3116,7 +3116,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.16/sass/_unity.scss b/common/gtk-3.0/3.16/sass/_unity.scss index e04ee41..aaedf92 100644 --- a/common/gtk-3.0/3.16/sass/_unity.scss +++ b/common/gtk-3.0/3.16/sass/_unity.scss @@ -43,7 +43,7 @@ UnityDecoration { // Panel Style UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, opacify($panel_bg, 1)); + background-image: linear-gradient(to bottom, #2f343f); color: lighten($panel_fg, 20%); box-shadow: none; diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 58aa032..af71ab4 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -3265,7 +3265,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 83af4df..110f5b9 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -3268,7 +3268,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index a4e9282..a0bb635 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -3265,7 +3265,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index 9c4cc5e..d4e4842 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -3268,7 +3268,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index e375835..2b54de1 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -3272,7 +3272,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index 67cc6f8..c02bb15 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -3272,7 +3272,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.18/sass/_unity.scss b/common/gtk-3.0/3.18/sass/_unity.scss index e04ee41..aaedf92 100644 --- a/common/gtk-3.0/3.18/sass/_unity.scss +++ b/common/gtk-3.0/3.18/sass/_unity.scss @@ -43,7 +43,7 @@ UnityDecoration { // Panel Style UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, opacify($panel_bg, 1)); + background-image: linear-gradient(to bottom, #2f343f); color: lighten($panel_fg, 20%); box-shadow: none; diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index ed69d43..771475d 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -3577,7 +3577,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 08ce9e4..7ccb467 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -3575,7 +3575,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 06c5095..cbe313e 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -3577,7 +3577,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 047d790..02dc153 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -3575,7 +3575,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 14f42ee..949a367 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -3579,7 +3579,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index a163e1c..40e3f0b 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -3579,7 +3579,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #2b2e37); + background-image: linear-gradient(to bottom, #2f343f); color: #f6f7f9; box-shadow: none; } UnityPanelWidget:backdrop, diff --git a/common/gtk-3.0/3.20/sass/_unity.scss b/common/gtk-3.0/3.20/sass/_unity.scss index 0fb5d67..87866fc 100644 --- a/common/gtk-3.0/3.20/sass/_unity.scss +++ b/common/gtk-3.0/3.20/sass/_unity.scss @@ -43,7 +43,7 @@ UnityDecoration { // Panel Style UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, opacify($panel_bg, 1)); + background-image: linear-gradient(to bottom, #2f343f); color: lighten($panel_fg, 20%); box-shadow: none; From ca76d0e2e55cb9a6b69a29c19225c22bb50c6f96 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 29 May 2016 19:22:18 +0200 Subject: [PATCH 05/17] use accent color for menu highlight (fix #135) --- common/cinnamon/cinnamon-dark.css | 23 +- common/cinnamon/cinnamon.css | 23 +- .../menu/menu-hover.svg | 25 +- .../switch/switch-off-selected.svg | 201 +++++++++++++ .../switch/switch-on-selected.svg | 220 ++++++++++++++ .../cinnamon/light-assets/menu/menu-hover.svg | 97 ------- common/cinnamon/sass/_common.scss | 20 +- .../common-assets}/menu/menu-hover.svg | 25 +- .../switch/switch-off-selected.svg | 201 +++++++++++++ .../switch/switch-on-selected.svg | 220 ++++++++++++++ common/gnome-shell/3.14/gnome-shell-dark.css | 50 ++-- common/gnome-shell/3.14/gnome-shell.css | 50 ++-- .../3.14/light-assets/menu/menu-hover.svg | 97 ------- common/gnome-shell/3.14/sass/_common.scss | 53 ++-- .../common-assets}/menu/menu-hover.svg | 25 +- .../switch/switch-off-selected.svg | 201 +++++++++++++ .../switch/switch-on-selected.svg | 220 ++++++++++++++ common/gnome-shell/3.16/gnome-shell-dark.css | 20 +- common/gnome-shell/3.16/gnome-shell.css | 20 +- .../3.16/light-assets/menu/menu-hover.svg | 97 ------- common/gnome-shell/3.16/sass/_common.scss | 18 +- .../menu/menu-hover.svg | 25 +- .../switch/switch-off-selected.svg | 201 +++++++++++++ .../switch/switch-on-selected.svg | 220 ++++++++++++++ common/gnome-shell/3.18/gnome-shell-dark.css | 22 +- common/gnome-shell/3.18/gnome-shell.css | 22 +- .../3.18/light-assets/menu/menu-hover.svg | 97 ------- common/gnome-shell/3.18/sass/_common.scss | 22 +- common/gtk-2.0/assets-dark.svg | 266 +++++++++++++++-- .../assets-dark/menu-arrow-prelight.png | Bin 246 -> 186 bytes .../menu-checkbox-checked-selected.png | Bin 0 -> 330 bytes .../menu-checkbox-unchecked-selected.png | Bin 0 -> 227 bytes .../menu-radio-checked-selected.png | Bin 0 -> 359 bytes .../menu-radio-unchecked-selected.png | Bin 0 -> 346 bytes common/gtk-2.0/assets-dark/menuitem.png | Bin 176 -> 156 bytes common/gtk-2.0/assets.svg | 269 ++++++++++++++++-- common/gtk-2.0/assets.txt | 4 + common/gtk-2.0/assets/menu-arrow-prelight.png | Bin 265 -> 186 bytes .../assets/menu-checkbox-checked-selected.png | Bin 0 -> 330 bytes .../menu-checkbox-unchecked-selected.png | Bin 0 -> 227 bytes .../assets/menu-radio-checked-selected.png | Bin 0 -> 359 bytes .../assets/menu-radio-unchecked-selected.png | Bin 0 -> 346 bytes common/gtk-2.0/assets/menuitem.png | Bin 166 -> 156 bytes common/gtk-2.0/main.rc | 39 ++- common/gtk-2.0/panel.rc | 14 +- common/gtk-3.0/3.14/gtk-dark.css | 26 +- common/gtk-3.0/3.14/gtk-darker.css | 26 +- common/gtk-3.0/3.14/gtk-solid-dark.css | 26 +- common/gtk-3.0/3.14/gtk-solid-darker.css | 26 +- common/gtk-3.0/3.14/gtk-solid.css | 26 +- common/gtk-3.0/3.14/gtk.css | 26 +- common/gtk-3.0/3.14/sass/_common.scss | 9 +- common/gtk-3.0/3.16/gtk-dark.css | 26 +- common/gtk-3.0/3.16/gtk-darker.css | 26 +- common/gtk-3.0/3.16/gtk-solid-dark.css | 26 +- common/gtk-3.0/3.16/gtk-solid-darker.css | 26 +- common/gtk-3.0/3.16/gtk-solid.css | 26 +- common/gtk-3.0/3.16/gtk.css | 26 +- common/gtk-3.0/3.16/sass/_common.scss | 9 +- common/gtk-3.0/3.18/gtk-dark.css | 26 +- common/gtk-3.0/3.18/gtk-darker.css | 26 +- common/gtk-3.0/3.18/gtk-solid-dark.css | 26 +- common/gtk-3.0/3.18/gtk-solid-darker.css | 26 +- common/gtk-3.0/3.18/gtk-solid.css | 26 +- common/gtk-3.0/3.18/gtk.css | 26 +- common/gtk-3.0/3.18/sass/_common.scss | 9 +- common/gtk-3.0/3.20/gtk-dark.css | 30 +- common/gtk-3.0/3.20/gtk-darker.css | 30 +- common/gtk-3.0/3.20/gtk-solid-dark.css | 30 +- common/gtk-3.0/3.20/gtk-solid-darker.css | 30 +- common/gtk-3.0/3.20/gtk-solid.css | 30 +- common/gtk-3.0/3.20/gtk.css | 30 +- common/gtk-3.0/3.20/sass/_common.scss | 13 +- 73 files changed, 3023 insertions(+), 772 deletions(-) rename common/cinnamon/{dark-assets => common-assets}/menu/menu-hover.svg (68%) create mode 100644 common/cinnamon/common-assets/switch/switch-off-selected.svg create mode 100644 common/cinnamon/common-assets/switch/switch-on-selected.svg delete mode 100644 common/cinnamon/light-assets/menu/menu-hover.svg rename common/gnome-shell/{3.16/dark-assets => 3.14/common-assets}/menu/menu-hover.svg (68%) create mode 100644 common/gnome-shell/3.14/common-assets/switch/switch-off-selected.svg create mode 100644 common/gnome-shell/3.14/common-assets/switch/switch-on-selected.svg delete mode 100644 common/gnome-shell/3.14/light-assets/menu/menu-hover.svg rename common/gnome-shell/{3.14/dark-assets => 3.16/common-assets}/menu/menu-hover.svg (68%) create mode 100644 common/gnome-shell/3.16/common-assets/switch/switch-off-selected.svg create mode 100644 common/gnome-shell/3.16/common-assets/switch/switch-on-selected.svg delete mode 100644 common/gnome-shell/3.16/light-assets/menu/menu-hover.svg rename common/gnome-shell/3.18/{dark-assets => common-assets}/menu/menu-hover.svg (68%) create mode 100644 common/gnome-shell/3.18/common-assets/switch/switch-off-selected.svg create mode 100644 common/gnome-shell/3.18/common-assets/switch/switch-on-selected.svg delete mode 100644 common/gnome-shell/3.18/light-assets/menu/menu-hover.svg create mode 100644 common/gtk-2.0/assets-dark/menu-checkbox-checked-selected.png create mode 100644 common/gtk-2.0/assets-dark/menu-checkbox-unchecked-selected.png create mode 100644 common/gtk-2.0/assets-dark/menu-radio-checked-selected.png create mode 100644 common/gtk-2.0/assets-dark/menu-radio-unchecked-selected.png create mode 100644 common/gtk-2.0/assets/menu-checkbox-checked-selected.png create mode 100644 common/gtk-2.0/assets/menu-checkbox-unchecked-selected.png create mode 100644 common/gtk-2.0/assets/menu-radio-checked-selected.png create mode 100644 common/gtk-2.0/assets/menu-radio-unchecked-selected.png diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css index c6bb2e3..584ea8b 100644 --- a/common/cinnamon/cinnamon-dark.css +++ b/common/cinnamon/cinnamon-dark.css @@ -171,6 +171,10 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item:active .popup-slider-menu-item, .popup-menu-item:active + .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box CinnamonGenericContainer { spacing: .2em; @@ -221,11 +225,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("dark-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("dark-assets/switch/switch-on.svg"); } + .popup-menu-item:active .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item:active .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .cinnamon-link { color: #a9caf1; @@ -267,9 +274,9 @@ StScrollBar { padding: .4em 1.75em; spacing: 1em; } .popup-menu .popup-menu-item:active { - color: #D3DAE3; + color: #ffffff; background-color: transparent; - border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(211, 218, 227, 0.5); background: none; } @@ -277,6 +284,8 @@ StScrollBar { color: #D3DAE3; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(211, 218, 227, 0.45); } + .popup-menu .popup-menu-item:active .popup-inactive-menu-item { + color: #ffffff; } .popup-menu-icon { icon-size: 16px; } diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css index a54fd32..6aaee78 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -171,6 +171,10 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item:active .popup-slider-menu-item, .popup-menu-item:active + .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box CinnamonGenericContainer { spacing: .2em; @@ -221,11 +225,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("light-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("light-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + .popup-menu-item:active .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item:active .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .cinnamon-link { color: #2679db; @@ -267,9 +274,9 @@ StScrollBar { padding: .4em 1.75em; spacing: 1em; } .popup-menu .popup-menu-item:active { - color: #5c616c; + color: #ffffff; background-color: transparent; - border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(92, 97, 108, 0.5); background: none; } @@ -277,6 +284,8 @@ StScrollBar { color: #5c616c; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(92, 97, 108, 0.55); } + .popup-menu .popup-menu-item:active .popup-inactive-menu-item { + color: #ffffff; } .popup-menu-icon { icon-size: 16px; } diff --git a/common/cinnamon/dark-assets/menu/menu-hover.svg b/common/cinnamon/common-assets/menu/menu-hover.svg similarity index 68% rename from common/cinnamon/dark-assets/menu/menu-hover.svg rename to common/cinnamon/common-assets/menu/menu-hover.svg index a023a8e..6ae13ca 100644 --- a/common/cinnamon/dark-assets/menu/menu-hover.svg +++ b/common/cinnamon/common-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="16.934585" - inkscape:cy="20.910274" + inkscape:cx="16.532799" + inkscape:cy="17.338845" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,29 +69,16 @@ id="layer1" transform="translate(-137,-382.36221)"> + transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)" + id="g6908" + style="fill:#5294e2;fill-opacity:1"> + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> - - diff --git a/common/cinnamon/common-assets/switch/switch-off-selected.svg b/common/cinnamon/common-assets/switch/switch-off-selected.svg new file mode 100644 index 0000000..c85eeee --- /dev/null +++ b/common/cinnamon/common-assets/switch/switch-off-selected.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/common-assets/switch/switch-on-selected.svg b/common/cinnamon/common-assets/switch/switch-on-selected.svg new file mode 100644 index 0000000..7c2572d --- /dev/null +++ b/common/cinnamon/common-assets/switch/switch-on-selected.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/menu/menu-hover.svg b/common/cinnamon/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/common/cinnamon/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index b015078..c1788b0 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -159,6 +159,11 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; + + .popup-menu-item:active & { + -slider-background-color: transparentize(black, 0.8); + -slider-active-background-color: $selected_fg_color; + } } // @@ -224,11 +229,14 @@ StScrollBar { width: 50px; height: 20px; background-size: contain; + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &-us, &-intl { - background-image: url("#{$asset_path}/switch/switch-off.svg"); + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } - &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + .popup-menu-item:active & { + background-image: url("common-assets/switch/switch-off-selected.svg"); + + &:checked { background-image: url("common-assets/switch/switch-on-selected.svg"); } } } @@ -286,9 +294,9 @@ StScrollBar { spacing: 1em; &:active { - color: $fg_color; + color: $selected_fg_color; background-color: transparent; - border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { color: transparentize($fg_color, 0.5); @@ -302,6 +310,8 @@ StScrollBar { &:insensitive { color: $insensitive_fg_color; } } + .popup-menu-item:active .popup-inactive-menu-item { color: $selected_fg_color; } + &-icon { icon-size: 16px; } } diff --git a/common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.14/common-assets/menu/menu-hover.svg similarity index 68% rename from common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg rename to common/gnome-shell/3.14/common-assets/menu/menu-hover.svg index a023a8e..6ae13ca 100644 --- a/common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg +++ b/common/gnome-shell/3.14/common-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="16.934585" - inkscape:cy="20.910274" + inkscape:cx="16.532799" + inkscape:cy="17.338845" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,29 +69,16 @@ id="layer1" transform="translate(-137,-382.36221)"> + transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)" + id="g6908" + style="fill:#5294e2;fill-opacity:1"> + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> - - diff --git a/common/gnome-shell/3.14/common-assets/switch/switch-off-selected.svg b/common/gnome-shell/3.14/common-assets/switch/switch-off-selected.svg new file mode 100644 index 0000000..c85eeee --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/switch/switch-off-selected.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/switch/switch-on-selected.svg b/common/gnome-shell/3.14/common-assets/switch/switch-on-selected.svg new file mode 100644 index 0000000..7c2572d --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/switch/switch-on-selected.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/gnome-shell-dark.css b/common/gnome-shell/3.14/gnome-shell-dark.css index 0f4fba2..dc8fddf 100644 --- a/common/gnome-shell/3.14/gnome-shell-dark.css +++ b/common/gnome-shell/3.14/gnome-shell-dark.css @@ -184,19 +184,22 @@ StScrollBar { .slider { -slider-height: 4px; - -slider-background-color: #2b2e39 !important; - -slider-border-color: transparent !important; - -slider-active-background-color: #5294E2 !important; - -slider-active-border-color: transparent !important; + -slider-background-color: #2b2e39; + -slider-border-color: transparent; + -slider-active-background-color: #5294E2; + -slider-active-border-color: transparent; -slider-border-width: 0; -slider-handle-radius: 4px; - -slider-handle-border-color: transparent !important; - -slider-handle-border-width: 0 !important; + -slider-handle-border-color: transparent; + -slider-handle-border-width: 0; height: 18px; border: 0 solid transparent; border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item:active .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -218,11 +221,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("dark-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("dark-assets/switch/switch-on.svg"); } + .popup-menu-item:active .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item:active .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #a9caf1; } @@ -453,7 +459,7 @@ StScrollBar { background-gradient-direction: none !important; border-image: url("dark-assets/menu/submenu.svg") 9 9 9 9; } .popup-menu .popup-submenu-menu-item:open { - color: #D3DAE3 !important; + color: #D3DAE3; background: none !important; box-shadow: none; border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } @@ -466,18 +472,22 @@ StScrollBar { .popup-menu .popup-menu-item:rtl { padding: .4em 0em .4em 3em; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #D3DAE3 !important; + color: #ffffff; background-color: transparent; - border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { - color: rgba(211, 218, 227, 0.5) !important; + color: rgba(211, 218, 227, 0.5); background: none; } .popup-menu .popup-inactive-menu-item { color: #D3DAE3; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(211, 218, 227, 0.45); } - .popup-menu .popup-status-menu-item, .popup-menu .popup-subtitle-menu-item { - color: #D3DAE3 !important; } + .popup-menu .popup-status-menu-item, + .popup-menu .popup-subtitle-menu-item { + color: #D3DAE3; } + .popup-menu .popup-menu-item:active .popup-status-menu-item, + .popup-menu .popup-menu-item:active .popup-subtitle-menu-item { + color: #ffffff; } .popup-menu.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; } @@ -741,7 +751,7 @@ StScrollBar { .system-switch-user-submenu-icon { icon-size: 24px; - border: 1px solid rgba(211, 218, 227, 0.4); } + border: 1px solid rgba(0, 0, 0, 0.2); } #appMenu { spinner-image: url("common-assets/misc/process-working.svg"); @@ -754,7 +764,9 @@ StScrollBar { width: 360px; } .aggregate-menu .popup-menu-icon { padding: 0 4px; - color: #D3DAE3 !important; } + color: #D3DAE3; } + .aggregate-menu .popup-menu-item:active .popup-menu-icon { + color: #ffffff; } .system-menu-action { padding: 13px; diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 7308f41..65dfd22 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -184,19 +184,22 @@ StScrollBar { .slider { -slider-height: 4px; - -slider-background-color: #cfd6e6 !important; - -slider-border-color: transparent !important; - -slider-active-background-color: #5294E2 !important; - -slider-active-border-color: transparent !important; + -slider-background-color: #cfd6e6; + -slider-border-color: transparent; + -slider-active-background-color: #5294E2; + -slider-active-border-color: transparent; -slider-border-width: 0; -slider-handle-radius: 4px; - -slider-handle-border-color: transparent !important; - -slider-handle-border-width: 0 !important; + -slider-handle-border-color: transparent; + -slider-handle-border-width: 0; height: 18px; border: 0 solid transparent; border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item:active .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -218,11 +221,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("light-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("light-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + .popup-menu-item:active .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item:active .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #2679db; } @@ -453,7 +459,7 @@ StScrollBar { background-gradient-direction: none !important; border-image: url("light-assets/menu/submenu.svg") 9 9 9 9; } .popup-menu .popup-submenu-menu-item:open { - color: #5c616c !important; + color: #5c616c; background: none !important; box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } @@ -466,18 +472,22 @@ StScrollBar { .popup-menu .popup-menu-item:rtl { padding: .4em 0em .4em 3em; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #5c616c !important; + color: #ffffff; background-color: transparent; - border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { - color: rgba(92, 97, 108, 0.5) !important; + color: rgba(92, 97, 108, 0.5); background: none; } .popup-menu .popup-inactive-menu-item { color: #5c616c; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(92, 97, 108, 0.55); } - .popup-menu .popup-status-menu-item, .popup-menu .popup-subtitle-menu-item { - color: #5c616c !important; } + .popup-menu .popup-status-menu-item, + .popup-menu .popup-subtitle-menu-item { + color: #5c616c; } + .popup-menu .popup-menu-item:active .popup-status-menu-item, + .popup-menu .popup-menu-item:active .popup-subtitle-menu-item { + color: #ffffff; } .popup-menu.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; } @@ -741,7 +751,7 @@ StScrollBar { .system-switch-user-submenu-icon { icon-size: 24px; - border: 1px solid rgba(92, 97, 108, 0.4); } + border: 1px solid rgba(0, 0, 0, 0.2); } #appMenu { spinner-image: url("common-assets/misc/process-working.svg"); @@ -754,7 +764,9 @@ StScrollBar { width: 360px; } .aggregate-menu .popup-menu-icon { padding: 0 4px; - color: #5c616c !important; } + color: #5c616c; } + .aggregate-menu .popup-menu-item:active .popup-menu-icon { + color: #ffffff; } .system-menu-action { padding: 13px; diff --git a/common/gnome-shell/3.14/light-assets/menu/menu-hover.svg b/common/gnome-shell/3.14/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/common/gnome-shell/3.14/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 863159e..b5bdcf2 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -164,19 +164,24 @@ StScrollBar { // .slider { -slider-height: 4px; - -slider-background-color: $button_border !important; //background of the trough - -slider-border-color: transparentize(black, 1) !important; //trough border color - -slider-active-background-color: $selected_bg_color !important; //active trough fill - -slider-active-border-color: transparentize(black, 1) !important; //active trough border + -slider-background-color: $button_border; //background of the trough + -slider-border-color: transparentize(black, 1); //trough border color + -slider-active-background-color: $selected_bg_color; //active trough fill + -slider-active-border-color: transparentize(black, 1); //active trough border -slider-border-width: 0; -slider-handle-radius: 4px; - -slider-handle-border-color: transparent !important; - -slider-handle-border-width: 0 !important; + -slider-handle-border-color: transparent; + -slider-handle-border-width: 0; height: 18px; border: 0 solid transparent; border-right-width: 1px; border-left-width: 5px; color: transparent; + + .popup-menu-item:active & { + -slider-background-color: transparentize(black, 0.8); + -slider-active-background-color: $selected_fg_color; + } } // @@ -206,11 +211,14 @@ StScrollBar { width: 50px; height: 20px; background-size: contain; + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &-us, &-intl { - background-image: url("#{$asset_path}/switch/switch-off.svg"); + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } - &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + .popup-menu-item:active & { + background-image: url("common-assets/switch/switch-off-selected.svg"); + + &:checked { background-image: url("common-assets/switch/switch-on-selected.svg"); } } } @@ -553,7 +561,7 @@ StScrollBar { } .popup-submenu-menu-item:open { - color: $fg_color !important; + color: $fg_color; background: none !important; box-shadow: none; border-image: url("#{$asset_path}/menu/submenu-open.svg") 9 9 9 9; @@ -567,13 +575,13 @@ StScrollBar { &:rtl { padding: .4em 0em .4em 3em; } &:active, &.selected { - color: $fg_color !important; + color: $selected_fg_color; background-color: transparent; - border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { - color: transparentize($fg_color, 0.5) !important; + color: transparentize($fg_color, 0.5); background: none; } } @@ -583,7 +591,15 @@ StScrollBar { &:insensitive { color: $insensitive_fg_color; } } - .popup-status-menu-item, .popup-subtitle-menu-item { color: $fg_color !important; } + + .popup-status-menu-item, + .popup-subtitle-menu-item { color: $fg_color; } + + .popup-menu-item:active { + .popup-status-menu-item, + .popup-subtitle-menu-item { color: $selected_fg_color; } + } + &.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; @@ -623,7 +639,7 @@ StScrollBar { background-color: transparent; background-gradient-direction: none !important; border: none; - border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } // Background menu @@ -939,7 +955,7 @@ StScrollBar { .system-switch-user-submenu-icon { icon-size: 24px; - border: 1px solid transparentize($fg_color,0.6); + border: 1px solid transparentize(black, 0.8); } #appMenu { @@ -954,7 +970,10 @@ StScrollBar { width: 360px; .popup-menu-icon { padding: 0 4px; - color: $fg_color !important; + color: $fg_color; + } + .popup-menu-item:active .popup-menu-icon { + color: $selected_fg_color; } } diff --git a/common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.16/common-assets/menu/menu-hover.svg similarity index 68% rename from common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg rename to common/gnome-shell/3.16/common-assets/menu/menu-hover.svg index a023a8e..6ae13ca 100644 --- a/common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg +++ b/common/gnome-shell/3.16/common-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="16.934585" - inkscape:cy="20.910274" + inkscape:cx="16.532799" + inkscape:cy="17.338845" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,29 +69,16 @@ id="layer1" transform="translate(-137,-382.36221)"> + transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)" + id="g6908" + style="fill:#5294e2;fill-opacity:1"> + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> - - diff --git a/common/gnome-shell/3.16/common-assets/switch/switch-off-selected.svg b/common/gnome-shell/3.16/common-assets/switch/switch-off-selected.svg new file mode 100644 index 0000000..c85eeee --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/switch/switch-off-selected.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/switch/switch-on-selected.svg b/common/gnome-shell/3.16/common-assets/switch/switch-on-selected.svg new file mode 100644 index 0000000..7c2572d --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/switch/switch-on-selected.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/gnome-shell-dark.css b/common/gnome-shell/3.16/gnome-shell-dark.css index 5571339..335ba6b 100644 --- a/common/gnome-shell/3.16/gnome-shell-dark.css +++ b/common/gnome-shell/3.16/gnome-shell-dark.css @@ -156,6 +156,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -177,11 +180,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("dark-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("dark-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #a9caf1; } @@ -423,9 +429,9 @@ StScrollBar { box-shadow: none; border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #D3DAE3; + color: #ffffff; background-color: transparent; - border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(211, 218, 227, 0.5); background: none; } diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index ad41fcc..5c48616 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -156,6 +156,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -177,11 +180,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("light-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("light-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #2679db; } @@ -423,9 +429,9 @@ StScrollBar { box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #5c616c; + color: #ffffff; background-color: transparent; - border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(92, 97, 108, 0.5); background: none; } diff --git a/common/gnome-shell/3.16/light-assets/menu/menu-hover.svg b/common/gnome-shell/3.16/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/common/gnome-shell/3.16/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 9515e43..6d8af82 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -148,6 +148,11 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; + + .popup-menu-item.selected & { + -slider-background-color: transparentize(black, 0.8); + -slider-active-background-color: $selected_fg_color; + } } // @@ -177,11 +182,14 @@ StScrollBar { width: 50px; height: 20px; background-size: contain; + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &-us, &-intl { - background-image: url("#{$asset_path}/switch/switch-off.svg"); + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } - &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + .popup-menu-item.selected & { + background-image: url("common-assets/switch/switch-off-selected.svg"); + + &:checked { background-image: url("common-assets/switch/switch-on-selected.svg"); } } } @@ -534,9 +542,9 @@ StScrollBar { } &:active, &.selected { - color: $fg_color; + color: $selected_fg_color; background-color: transparent; - border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { diff --git a/common/gnome-shell/3.18/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg similarity index 68% rename from common/gnome-shell/3.18/dark-assets/menu/menu-hover.svg rename to common/gnome-shell/3.18/common-assets/menu/menu-hover.svg index a023a8e..6ae13ca 100644 --- a/common/gnome-shell/3.18/dark-assets/menu/menu-hover.svg +++ b/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="16.934585" - inkscape:cy="20.910274" + inkscape:cx="16.532799" + inkscape:cy="17.338845" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,29 +69,16 @@ id="layer1" transform="translate(-137,-382.36221)"> + transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)" + id="g6908" + style="fill:#5294e2;fill-opacity:1"> + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> - - diff --git a/common/gnome-shell/3.18/common-assets/switch/switch-off-selected.svg b/common/gnome-shell/3.18/common-assets/switch/switch-off-selected.svg new file mode 100644 index 0000000..c85eeee --- /dev/null +++ b/common/gnome-shell/3.18/common-assets/switch/switch-off-selected.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.18/common-assets/switch/switch-on-selected.svg b/common/gnome-shell/3.18/common-assets/switch/switch-on-selected.svg new file mode 100644 index 0000000..7c2572d --- /dev/null +++ b/common/gnome-shell/3.18/common-assets/switch/switch-on-selected.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css index b89c1a4..62c88f5 100644 --- a/common/gnome-shell/3.18/gnome-shell-dark.css +++ b/common/gnome-shell/3.18/gnome-shell-dark.css @@ -130,6 +130,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -151,11 +154,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("dark-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("dark-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #a9caf1; } @@ -452,9 +458,9 @@ StScrollBar { box-shadow: none; border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #D3DAE3; + color: #ffffff; background-color: transparent; - border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(211, 218, 227, 0.5); background: none; } @@ -489,7 +495,7 @@ StScrollBar { .popup-separator-menu-item { height: 2px; - margin: 10px 0px; + margin: 10px 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css index 912c6f6..bf1cfb4 100644 --- a/common/gnome-shell/3.18/gnome-shell.css +++ b/common/gnome-shell/3.18/gnome-shell.css @@ -130,6 +130,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -151,11 +154,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("light-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("light-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #2679db; } @@ -452,9 +458,9 @@ StScrollBar { box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #5c616c; + color: #ffffff; background-color: transparent; - border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(92, 97, 108, 0.5); background: none; } @@ -489,7 +495,7 @@ StScrollBar { .popup-separator-menu-item { height: 2px; - margin: 10px 0px; + margin: 10px 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } diff --git a/common/gnome-shell/3.18/light-assets/menu/menu-hover.svg b/common/gnome-shell/3.18/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/common/gnome-shell/3.18/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss index 9c5afa4..1fdf697 100644 --- a/common/gnome-shell/3.18/sass/_common.scss +++ b/common/gnome-shell/3.18/sass/_common.scss @@ -149,6 +149,11 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; + + .popup-menu-item.selected & { + -slider-background-color: transparentize(black, 0.8); + -slider-active-background-color: $selected_fg_color; + } } // @@ -178,11 +183,14 @@ StScrollBar { width: 50px; height: 20px; background-size: contain; + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &-us, &-intl { - background-image: url("#{$asset_path}/switch/switch-off.svg"); + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } - &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + .popup-menu-item.selected & { + background-image: url("common-assets/switch/switch-off-selected.svg"); + + &:checked { background-image: url("common-assets/switch/switch-on-selected.svg"); } } } @@ -601,9 +609,9 @@ StScrollBar { } &:active, &.selected { - color: $fg_color; + color: $selected_fg_color; background-color: transparent; - border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { @@ -651,10 +659,10 @@ StScrollBar { .popup-separator-menu-item { //-margin-horizontal: 24px; height: 2px; //not really the whole box - margin: 10px 0px; + margin: 10px 0; background-color: transparent; border: none; - border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } // Background menu diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg index c0b0814..ee913d7 100644 --- a/common/gtk-2.0/assets-dark.svg +++ b/common/gtk-2.0/assets-dark.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.9999996" - inkscape:cx="254.60434" - inkscape:cy="52.761079" + inkscape:zoom="11.313708" + inkscape:cx="243.54683" + inkscape:cy="369.23846" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -4184,19 +4184,19 @@ + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> - - + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gtk-2.0/assets-dark/menu-arrow-prelight.png b/common/gtk-2.0/assets-dark/menu-arrow-prelight.png index 2e21d884eadf4d824979d7d9a808210240d51e23..04bff4917dc5787f93c95d75fde6e946dd4eeb21 100644 GIT binary patch delta 111 zcmeyyxQlUuq!VUrreY`05Dt#eH*PEw4Q>4_JzX3_IHHq({C`x>$;|Rc z|KI=r^`bq&KmOnU&nKbIe>p(Id~HTgL|LVOM-#XFwMIrx;{A(ktDGr$76_*A9} z1t7fgfbdlG;cPcbeSOMKloi$49E$2^4@$G^FmbbNq%pe!C@5Lt8c`CQpH@mmtT}V`<;yxP*He*Pl)S( z3=lNsQTX)75z`-MEPR@=@LA@fXW2`hfBpIQ_n&|Nzy_8#Z(jwpf~_RTFWA$|`_bbk311x(fg-`4E{-7_ z(Xr<|g&GtDSPljj-ucdY@z;NATY-kexmNkQm7XV3k~~C(p7Xlgtn;;so-4<)?P#L4 ztSrYFD>*ri8-CjSEEd_hGLCN!y9T}au4*j5rzV#_?WlE_AkcUQPgg&ebxsLQ0C=5~ AE&u=k literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets-dark/menu-checkbox-unchecked-selected.png b/common/gtk-2.0/assets-dark/menu-checkbox-unchecked-selected.png new file mode 100644 index 0000000000000000000000000000000000000000..9066a4c09ac76e83267fc70e811723835b9621c8 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2?f#ZI0f96(URk z2Vq7hjoB4ILCF%=h?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))iiV{3s978lF zzP+@Nw7oMu@6??7wJ8^#{?=~eRE1pmL&1L(&h38%k5S;|H Oi^0>?&t;ucLK6TC%}MwG literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets-dark/menu-radio-checked-selected.png b/common/gtk-2.0/assets-dark/menu-radio-checked-selected.png new file mode 100644 index 0000000000000000000000000000000000000000..0fab00a2d1b590f72de696ba61002f9c3259d48e GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2?f#ZI0f96(URk z2Vq7hjoB4ILCF%=h?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))iik^77IEH9U zoI1(Y?{I>Ei~O{;I~HT1 z2Vq7hjoB4ILCF%=h?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))iimrRQIEH9U z?7igc#T+Pbz%sjOddx=w z-;Y5l7BX)c-G1%6HOW{1%hSI9jK_8yQc{|BTfDIMbIs1n?RMA7EzTe0-!E>s;+mC& l)Zgc8jEkiOPapiwJpGHaqFdz~L!cKKJYD@<);T3K0RZ?|h+hBz literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets-dark/menuitem.png b/common/gtk-2.0/assets-dark/menuitem.png index 56ad7b0482e860dee26bf42b86d19354f6ec026a..ce6bd545e10556db9fc0934681adb675f446aacc 100644 GIT binary patch delta 82 zcmdnMIEQh9gajiq0|UdA>CgIs6mzkYX9x!e$L)vy4<;Jg>N5xUgt!Jxc{Dkj+Yczs i?djqe!XcZyKn}?9W?=koU^NZMV(@hJb6Mw<&;$UwffjfG delta 102 zcmbQkxPftkgd_(W0|Udm$dWTailx}eGlT;OYB*9lCK}i}>3X_2hFJ6_|M~xazX9{i zhStW$hw3|L%{+0{VpV0x=M~Qa&nib5b2BqDTko93nEQ~$ZC1zopr E0P1ff*#H0l diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg index f9adeb6..6d149fc 100644 --- a/common/gtk-2.0/assets.svg +++ b/common/gtk-2.0/assets.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="248.42235" - inkscape:cy="35.189651" + inkscape:zoom="7.9999999" + inkscape:cx="263.38272" + inkscape:cy="373.79667" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -4166,19 +4166,19 @@ + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> - - + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt index e7fc513..08e3959 100644 --- a/common/gtk-2.0/assets.txt +++ b/common/gtk-2.0/assets.txt @@ -31,12 +31,16 @@ radio-checked-insensitive radio-unchecked radio-unchecked-insensitive menu-checkbox-checked +menu-checkbox-checked-selected menu-checkbox-checked-insensitive menu-checkbox-unchecked +menu-checkbox-unchecked-selected menu-checkbox-unchecked-insensitive menu-radio-checked +menu-radio-checked-selected menu-radio-checked-insensitive menu-radio-unchecked +menu-radio-unchecked-selected menu-radio-unchecked-insensitive entry-border-bg-solid entry-border-active-bg-solid diff --git a/common/gtk-2.0/assets/menu-arrow-prelight.png b/common/gtk-2.0/assets/menu-arrow-prelight.png index 1e95c5d2c290530d7fb6abe932b88d4c547d5c08..04bff4917dc5787f93c95d75fde6e946dd4eeb21 100644 GIT binary patch delta 111 zcmeBV+Qm3QQjCRxfnoNKzZ-xQQ?Zk02nR>#8#k7T2DW~do-U3d9MQ=?{y(bcWM=uJ z|L_0*deNTXAOG+F=aW$9Kats>af-<(+M$PMMbrPE4sNn8pC10_>JVcHN>eep*QBQd PG?T&8)z4*}Q$iB}_x36x delta 191 zcmdnR*vT|OQkV`v3g4pZ*!2+mxBV*~n^C-ZWbA c@`s*|m>k1%qh-r8ftnaRUHx3vIVCg!07SAvR{#J2 diff --git a/common/gtk-2.0/assets/menu-checkbox-checked-selected.png b/common/gtk-2.0/assets/menu-checkbox-checked-selected.png new file mode 100644 index 0000000000000000000000000000000000000000..e32f07e593b0fa4b1c24406c8a8bc438c3bdbaa3 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uGBwbBK{D2g5v6E*A2M5RPhyD+MT+RZI$YP+9 z>mbbNq%pe!C@5Lt8c`CQpH@mmtT}V`<;yxP*He*Pl)S( z3=lNsQTX)75z`-MEPR@=@LA@fXW2`hfBpIQ_n&|Nzy_8#Z(jwpf~_RTFWA$|`_bbk311x(fg-`4E{-7_ z(Xr<|g&GtDSPljj-ucdY@z;NATY-kexmNkQm7XV3k~~C(p7Xlgtn;;so-4<)?P#L4 ztSrYFD>*ri8-CjSEEd_hGLCN!y9T}au4*j5rzV#_?WlE_AkcUQPgg&ebxsLQ0C=5~ AE&u=k literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets/menu-checkbox-unchecked-selected.png b/common/gtk-2.0/assets/menu-checkbox-unchecked-selected.png new file mode 100644 index 0000000000000000000000000000000000000000..9066a4c09ac76e83267fc70e811723835b9621c8 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2?f#ZI0f96(URk z2Vq7hjoB4ILCF%=h?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))iiV{3s978lF zzP+@Nw7oMu@6??7wJ8^#{?=~eRE1pmL&1L(&h38%k5S;|H Oi^0>?&t;ucLK6TC%}MwG literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets/menu-radio-checked-selected.png b/common/gtk-2.0/assets/menu-radio-checked-selected.png new file mode 100644 index 0000000000000000000000000000000000000000..0fab00a2d1b590f72de696ba61002f9c3259d48e GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2?f#ZI0f96(URk z2Vq7hjoB4ILCF%=h?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))iik^77IEH9U zoI1(Y?{I>Ei~O{;I~HT1 z2Vq7hjoB4ILCF%=h?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))iimrRQIEH9U z?7igc#T+Pbz%sjOddx=w z-;Y5l7BX)c-G1%6HOW{1%hSI9jK_8yQc{|BTfDIMbIs1n?RMA7EzTe0-!E>s;+mC& l)Zgc8jEkiOPapiwJpGHaqFdz~L!cKKJYD@<);T3K0RZ?|h+hBz literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets/menuitem.png b/common/gtk-2.0/assets/menuitem.png index 6b9faf662c5dae11a69b0b0fde9f146b0174c066..ce6bd545e10556db9fc0934681adb675f446aacc 100644 GIT binary patch delta 54 zcmZ3+IEQgUu0C^sPl#*Klt+`Zx&0Uz7`Q!M978x{lNZPVIo=G6-wmv$0a*;5u6{1- HoD!M .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1626,6 +1625,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1638,6 +1638,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1650,6 +1651,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1662,6 +1664,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1674,6 +1677,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1686,6 +1690,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1698,6 +1703,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1710,6 +1716,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1722,6 +1729,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1734,6 +1742,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1746,6 +1755,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1801,18 +1811,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1833,15 +1847,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index 25337f3..e3d4b6d 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -1310,10 +1310,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1617,6 +1615,7 @@ GtkFileChooserDialog .action-bar.frame .check, GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1629,6 +1628,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1641,6 +1641,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1653,6 +1654,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1665,6 +1667,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1677,6 +1680,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1689,6 +1693,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1701,6 +1706,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1713,6 +1719,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1725,6 +1732,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1737,6 +1745,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1749,6 +1758,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1804,18 +1814,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1836,15 +1850,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index f6f7b26..3db7cb6 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -1307,10 +1307,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #D3DAE3; - background-color: rgba(255, 255, 255, 0.05); - border: solid rgba(255, 255, 255, 0.07); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1614,6 +1612,7 @@ GtkFileChooserDialog .action-bar.frame .check, GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1626,6 +1625,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1638,6 +1638,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1650,6 +1651,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1662,6 +1664,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1674,6 +1677,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1686,6 +1690,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1698,6 +1703,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1710,6 +1716,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1722,6 +1729,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1734,6 +1742,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1746,6 +1755,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1801,18 +1811,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1833,15 +1847,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index a40da22..4221587 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -1310,10 +1310,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1617,6 +1615,7 @@ GtkFileChooserDialog .action-bar.frame .check, GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1629,6 +1628,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1641,6 +1641,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1653,6 +1654,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1665,6 +1667,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1677,6 +1680,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1689,6 +1693,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1701,6 +1706,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1713,6 +1719,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1725,6 +1732,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1737,6 +1745,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1749,6 +1758,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1804,18 +1814,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1836,15 +1850,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index 70956a9..4e1ec80 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -1310,10 +1310,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1617,6 +1615,7 @@ GtkFileChooserDialog .action-bar.frame .check, GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1629,6 +1628,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1641,6 +1641,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1653,6 +1654,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1665,6 +1667,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1677,6 +1680,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1689,6 +1693,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1701,6 +1706,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1713,6 +1719,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1725,6 +1732,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1737,6 +1745,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1749,6 +1758,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1804,18 +1814,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1836,15 +1850,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index 5bf75ca..a95735a 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -1310,10 +1310,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1617,6 +1615,7 @@ GtkFileChooserDialog .action-bar.frame .check, GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1629,6 +1628,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1641,6 +1641,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1653,6 +1654,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1665,6 +1667,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1677,6 +1680,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1689,6 +1693,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1701,6 +1706,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1713,6 +1719,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1725,6 +1732,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1737,6 +1745,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1749,6 +1758,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1804,18 +1814,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1836,15 +1850,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index f314530..40da473 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -1558,10 +1558,8 @@ column-header.button.dnd { // for treeview-like derive widgets .menuitem { padding: 5px; &:hover { - color: $fg_color; - background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95)); - border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93)); - border-width: 1px 0 1px 0; + color: $selected_fg_color; + background-color: $selected_bg_color; } &:insensitive { color: $insensitive_fg_color; @@ -1928,6 +1926,7 @@ GtkSwitch { // the borders of checks and radios are // too similar in luminosity to the selected background color, hence // we need special casing. + .menu .menuitem.#{$w}#{$s}:hover, GtkTreeView.view.#{$w}#{$s}:selected, .list-row:selected .#{$w}#{$s}, GtkInfoBar .#{$w}#{$s} { @@ -2007,6 +2006,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } //selected list-row and infobar sliders + .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, $selected_fg_color); @@ -2055,6 +2055,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { &:insensitive { } } // troughs in selected list-rows and infobars + .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, transparentize(black, 0.8)); diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index a023c99..e73cfe1 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -1321,10 +1321,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #D3DAE3; - background-color: rgba(255, 255, 255, 0.05); - border: solid rgba(255, 255, 255, 0.07); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1659,6 +1657,7 @@ GtkFileChooserDialog .action-bar.frame .check, GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1671,6 +1670,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1683,6 +1683,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1695,6 +1696,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1707,6 +1709,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1719,6 +1722,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1731,6 +1735,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1743,6 +1748,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1755,6 +1761,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1767,6 +1774,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1779,6 +1787,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1791,6 +1800,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1846,18 +1856,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1878,15 +1892,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index a2974e3..e3eb905 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -1324,10 +1324,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1662,6 +1660,7 @@ GtkFileChooserDialog .action-bar.frame .check, GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1674,6 +1673,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1686,6 +1686,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1698,6 +1699,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1710,6 +1712,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1722,6 +1725,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1734,6 +1738,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1746,6 +1751,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1758,6 +1764,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1770,6 +1777,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1782,6 +1790,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1794,6 +1803,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1849,18 +1859,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1881,15 +1895,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index b5d6997..70dc688 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -1321,10 +1321,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #D3DAE3; - background-color: rgba(255, 255, 255, 0.05); - border: solid rgba(255, 255, 255, 0.07); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1659,6 +1657,7 @@ GtkFileChooserDialog .action-bar.frame .check, GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1671,6 +1670,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1683,6 +1683,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1695,6 +1696,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1707,6 +1709,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1719,6 +1722,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1731,6 +1735,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1743,6 +1748,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1755,6 +1761,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1767,6 +1774,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1779,6 +1787,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1791,6 +1800,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1846,18 +1856,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1878,15 +1892,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index 623c69f..485c697 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -1324,10 +1324,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1662,6 +1660,7 @@ GtkFileChooserDialog .action-bar.frame .check, GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1674,6 +1673,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1686,6 +1686,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1698,6 +1699,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1710,6 +1712,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1722,6 +1725,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1734,6 +1738,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1746,6 +1751,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1758,6 +1764,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1770,6 +1777,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1782,6 +1790,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1794,6 +1803,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1849,18 +1859,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1881,15 +1895,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index dfc1d5b..f4dfbe9 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -1324,10 +1324,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1662,6 +1660,7 @@ GtkFileChooserDialog .action-bar.frame .check, GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1674,6 +1673,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1686,6 +1686,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1698,6 +1699,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1710,6 +1712,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1722,6 +1725,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1734,6 +1738,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1746,6 +1751,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1758,6 +1764,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1770,6 +1777,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1782,6 +1790,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1794,6 +1803,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1849,18 +1859,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1881,15 +1895,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index e77c406..7a96f3a 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -1324,10 +1324,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1662,6 +1660,7 @@ GtkFileChooserDialog .action-bar.frame .check, GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1674,6 +1673,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1686,6 +1686,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1698,6 +1699,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1710,6 +1712,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1722,6 +1725,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1734,6 +1738,7 @@ GtkFileChooserDialog .action-bar.frame .radio, GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1746,6 +1751,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1758,6 +1764,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1770,6 +1777,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1782,6 +1790,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1794,6 +1803,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1849,18 +1859,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1881,15 +1895,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index f2d8e1c..85e00f3 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -1572,10 +1572,8 @@ column-header.button.dnd { // for treeview-like derive widgets .menuitem { padding: 5px; &:hover { - color: $fg_color; - background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95)); - border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93)); - border-width: 1px 0 1px 0; + color: $selected_fg_color; + background-color: $selected_bg_color; } &:insensitive { color: $insensitive_fg_color; @@ -2010,6 +2008,7 @@ GtkSwitch { // the borders of checks and radios are // too similar in luminosity to the selected background color, hence // we need special casing. + .menu .menuitem.#{$w}#{$s}:hover, GtkTreeView.view.#{$w}#{$s}:selected, .list-row:selected .#{$w}#{$s}, GtkInfoBar .#{$w}#{$s} { @@ -2089,6 +2088,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } //selected list-row and infobar sliders + .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, $selected_fg_color); @@ -2137,6 +2137,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { &:insensitive { } } // troughs in selected list-rows and infobars + .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, transparentize(black, 0.8)); diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index af71ab4..f995938 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -1390,10 +1390,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #D3DAE3; - background-color: rgba(255, 255, 255, 0.05); - border: solid rgba(255, 255, 255, 0.07); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } .menu .menuitem.separator { @@ -1729,6 +1727,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1741,6 +1740,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1753,6 +1753,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1765,6 +1766,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1777,6 +1779,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1789,6 +1792,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1801,6 +1805,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1813,6 +1818,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1825,6 +1831,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1837,6 +1844,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1849,6 +1857,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1861,6 +1870,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1915,18 +1925,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1947,15 +1961,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 110f5b9..9ced93b 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -1393,10 +1393,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator { @@ -1732,6 +1730,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1744,6 +1743,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1756,6 +1756,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1768,6 +1769,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1780,6 +1782,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1792,6 +1795,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1804,6 +1808,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1816,6 +1821,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1828,6 +1834,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1840,6 +1847,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1852,6 +1860,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1864,6 +1873,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1918,18 +1928,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1950,15 +1964,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index a0bb635..433364e 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -1390,10 +1390,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #D3DAE3; - background-color: rgba(255, 255, 255, 0.05); - border: solid rgba(255, 255, 255, 0.07); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } .menu .menuitem.separator { @@ -1729,6 +1727,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1741,6 +1740,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1753,6 +1753,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1765,6 +1766,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1777,6 +1779,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1789,6 +1792,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1801,6 +1805,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1813,6 +1818,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1825,6 +1831,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1837,6 +1844,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1849,6 +1857,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1861,6 +1870,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1915,18 +1925,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1947,15 +1961,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index d4e4842..b03e798 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -1393,10 +1393,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator { @@ -1732,6 +1730,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1744,6 +1743,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1756,6 +1756,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1768,6 +1769,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1780,6 +1782,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1792,6 +1795,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1804,6 +1808,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1816,6 +1821,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1828,6 +1834,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1840,6 +1847,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1852,6 +1860,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1864,6 +1873,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1918,18 +1928,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1950,15 +1964,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 2b54de1..274f3f1 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -1397,10 +1397,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator { @@ -1736,6 +1734,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1748,6 +1747,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1760,6 +1760,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1772,6 +1773,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1784,6 +1786,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1796,6 +1799,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1808,6 +1812,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1820,6 +1825,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1832,6 +1838,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1844,6 +1851,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1856,6 +1864,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1868,6 +1877,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1922,18 +1932,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1954,15 +1968,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index c02bb15..4321388 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -1397,10 +1397,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator { @@ -1736,6 +1734,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1748,6 +1747,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1760,6 +1760,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1772,6 +1773,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1784,6 +1786,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1796,6 +1799,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1808,6 +1812,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1820,6 +1825,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1832,6 +1838,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1844,6 +1851,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1856,6 +1864,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1868,6 +1877,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1922,18 +1932,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1954,15 +1968,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index dd39d6b..028aa41 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -1517,10 +1517,8 @@ column-header.button.dnd { // for treeview-like derive widgets .menuitem { padding: 5px; &:hover { - color: $fg_color; - background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95)); - border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93)); - border-width: 1px 0 1px 0; + color: $selected_fg_color; + background-color: $selected_bg_color; } &:insensitive { color: $insensitive_fg_color; @@ -1956,6 +1954,7 @@ GtkSwitch { // the borders of checks and radios are // too similar in luminosity to the selected background color, hence // we need special casing. + .menu .menuitem.#{$w}#{$s}:hover, GtkTreeView.view.#{$w}#{$s}:selected, .list-row:selected .#{$w}#{$s}, GtkInfoBar .#{$w}#{$s} { @@ -2036,6 +2035,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } //selected list-row and infobar sliders + .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, $selected_fg_color); @@ -2084,6 +2084,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { &:insensitive { } } // troughs in selected list-rows and infobars + .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, transparentize(black, 0.8)); diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 771475d..c37914f 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1536,15 +1536,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .menu menuitem:hover { - color: #D3DAE3; - background-color: rgba(255, 255, 255, 0.05); - border: solid rgba(255, 255, 255, 0.07); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } menu menuitem:disabled, .menu menuitem:disabled { color: rgba(211, 218, 227, 0.45); } @@ -1907,6 +1903,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1921,6 +1918,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1935,6 +1933,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1949,6 +1948,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1963,6 +1963,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1977,6 +1978,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1991,6 +1993,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2005,6 +2008,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2019,6 +2023,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2033,6 +2038,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2047,6 +2053,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2061,6 +2068,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2131,15 +2139,19 @@ scale { background-color: rgba(69, 74, 89, 0.95); } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2168,19 +2180,23 @@ scale { scale slider:disabled { background-color: #3c414e; border-color: rgba(38, 41, 51, 0.8); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 7ccb467..14db475 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1535,15 +1535,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .menu menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } menu menuitem:disabled, .menu menuitem:disabled { color: rgba(92, 97, 108, 0.55); } @@ -1906,6 +1902,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1920,6 +1917,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1934,6 +1932,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1948,6 +1947,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1962,6 +1962,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1976,6 +1977,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1990,6 +1992,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2004,6 +2007,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2018,6 +2022,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2032,6 +2037,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2046,6 +2052,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2060,6 +2067,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2130,15 +2138,19 @@ scale { background-color: rgba(69, 74, 89, 0.95); } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2167,19 +2179,23 @@ scale { scale slider:disabled { background-color: #fbfbfb; border-color: rgba(123, 142, 186, 0.3); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index cbe313e..8dac95e 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1536,15 +1536,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .menu menuitem:hover { - color: #D3DAE3; - background-color: rgba(255, 255, 255, 0.05); - border: solid rgba(255, 255, 255, 0.07); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } menu menuitem:disabled, .menu menuitem:disabled { color: rgba(211, 218, 227, 0.45); } @@ -1907,6 +1903,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1921,6 +1918,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1935,6 +1933,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1949,6 +1948,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1963,6 +1963,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1977,6 +1978,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1991,6 +1993,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2005,6 +2008,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2019,6 +2023,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2033,6 +2038,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2047,6 +2053,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2061,6 +2068,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2131,15 +2139,19 @@ scale { background-color: #454a59; } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2168,19 +2180,23 @@ scale { scale slider:disabled { background-color: #3c414e; border-color: rgba(38, 41, 51, 0.8); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 02dc153..d184701 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1535,15 +1535,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .menu menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } menu menuitem:disabled, .menu menuitem:disabled { color: rgba(92, 97, 108, 0.55); } @@ -1906,6 +1902,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1920,6 +1917,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1934,6 +1932,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1948,6 +1947,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1962,6 +1962,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1976,6 +1977,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1990,6 +1992,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2004,6 +2007,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2018,6 +2022,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2032,6 +2037,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2046,6 +2052,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2060,6 +2067,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2130,15 +2138,19 @@ scale { background-color: #454a59; } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2167,19 +2179,23 @@ scale { scale slider:disabled { background-color: #fbfbfb; border-color: rgba(123, 142, 186, 0.3); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 949a367..fe5a598 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1539,15 +1539,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .menu menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } menu menuitem:disabled, .menu menuitem:disabled { color: rgba(92, 97, 108, 0.55); } @@ -1910,6 +1906,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1924,6 +1921,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1938,6 +1936,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1952,6 +1951,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1966,6 +1966,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1980,6 +1981,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1994,6 +1996,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2008,6 +2011,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2022,6 +2026,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2036,6 +2041,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2050,6 +2056,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2064,6 +2071,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2134,15 +2142,19 @@ scale { background-color: #454a59; } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2171,19 +2183,23 @@ scale { scale slider:disabled { background-color: #fbfbfb; border-color: rgba(123, 142, 186, 0.3); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 40e3f0b..1ebb175 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1539,15 +1539,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .menu menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } menu menuitem:disabled, .menu menuitem:disabled { color: rgba(92, 97, 108, 0.55); } @@ -1910,6 +1906,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1924,6 +1921,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1938,6 +1936,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1952,6 +1951,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1966,6 +1966,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1980,6 +1981,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1994,6 +1996,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2008,6 +2011,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2022,6 +2026,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2036,6 +2041,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2050,6 +2056,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2064,6 +2071,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2134,15 +2142,19 @@ scale { background-color: rgba(69, 74, 89, 0.95); } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2171,19 +2183,23 @@ scale { scale slider:disabled { background-color: #fbfbfb; border-color: rgba(123, 142, 186, 0.3); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 279c598..ed35b4c 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -1599,14 +1599,10 @@ menu, menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; + padding: 5px; &:hover { - color: $fg_color; - background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95)); - border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93)); - border-width: 1px 0 1px 0; + color: $selected_fg_color; + background-color: $selected_bg_color; } &:disabled { color: $insensitive_fg_color; @@ -2015,6 +2011,7 @@ switch { // the borders of checks and radios are // too similar in luminosity to the selected background color, hence // we need special casing. + menuitem #{$w}#{$s}:hover, .view #{$w}#{$s}:selected, treeview.#{$w}#{$s}:selected, row:selected #{$w}#{$s}, @@ -2125,6 +2122,7 @@ scale { } // Troughs in selected list-rows and infobars + menuitem:hover &, row:selected &, infobar & { background-color: transparentize(black, 0.8); @@ -2180,6 +2178,7 @@ scale { } // Selected list-row and infobar sliders + menuitem:hover &, row:selected &, infobar & { background-clip: border-box; From 324722a0e8f9675083af66db05f2f538c7c82b92 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 29 May 2016 23:57:14 +0200 Subject: [PATCH 06/17] fix xfce-panel progressbar background --- common/gtk-2.0/panel.rc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/gtk-2.0/panel.rc b/common/gtk-2.0/panel.rc index 5b3df75..431bfea 100644 --- a/common/gtk-2.0/panel.rc +++ b/common/gtk-2.0/panel.rc @@ -30,6 +30,10 @@ style "theme-panel" { } } +style "theme-panel-progressbar" { + bg[ACTIVE] = "#1D1F26" +} + style "panelbar" { fg[NORMAL] = "#edf5fb" @@ -158,6 +162,7 @@ widget_class "*Notif*Brasero*" style "theme-panel" # XFCE panel theming. widget "*Xfce*Panel*" style "theme-panel" class "*Xfce*Panel*" style "theme-panel" +widget "*Xfce*Panel*GtkProgressBar" style "theme-panel-progressbar" widget "*WnckPager*" style "workspace-switcher" widget "*TopMenu*" style "theme-panel" widget "*XfceTasklist*" style "window-buttons" From 9ac60f17d9f3794f44490b3e463a2b916a1a2040 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 29 May 2016 23:58:23 +0200 Subject: [PATCH 07/17] panel.rc: clean up --- common/gtk-2.0/panel.rc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/common/gtk-2.0/panel.rc b/common/gtk-2.0/panel.rc index 431bfea..6ca5d92 100644 --- a/common/gtk-2.0/panel.rc +++ b/common/gtk-2.0/panel.rc @@ -105,17 +105,6 @@ style "window-buttons" = "theme-panel" { bg[ACTIVE] = @selected_bg_color bg[PRELIGHT] = shade(1.1,@selected_bg_color) bg[SELECTED] = @selected_bg_color - - engine "murrine" { - reliefstyle = 0 - glazestyle = 0 - glow_shade = 1.0 - highlight_shade = 1.0 - roundness = 0 - gradient_shades = {1.0,1.0,1.0,1.0} - textstyle = 0 - contrast = 0.0 - } } style "indicator" = "theme-panel" { @@ -123,7 +112,7 @@ style "indicator" = "theme-panel" { ythickness = 0 } -widget "*tasklist*" style "panelbuttons" +widget "*tasklist*" style "window-buttons" widget_class "*Xfce*Panel*.GtkToggleButton" style "panelbuttons" widget_class "*Xfce*NetkTasklist*GtkToggleButton" style "panelbuttons" widget_class "*PanelToplevel*Button" style "panelbuttons" From 789d509eba887db6f632c521ce847d11b765914b Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 30 May 2016 00:01:25 +0200 Subject: [PATCH 08/17] merge xfce-notify theme into the gtk2 theme --- README.md | 1 - common/Makefile.am | 7 ------- common/gtk-2.0/gtkrc | 1 + common/gtk-2.0/gtkrc-dark | 1 + common/gtk-2.0/gtkrc-darker | 1 + common/{xfce-notify-4.0/gtkrc => gtk-2.0/xfce-notify.rc} | 0 configure.ac | 1 - 7 files changed, 3 insertions(+), 9 deletions(-) rename common/{xfce-notify-4.0/gtkrc => gtk-2.0/xfce-notify.rc} (100%) diff --git a/README.md b/README.md index cd2be86..065f8f0 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,6 @@ Other options to pass to autogen.sh are --disable-metacity disable Metacity support --disable-unity disable Unity support --disable-xfwm disable XFWM support - --disable-xfce-notify disable XFCE Notify support --with-gnome= build the theme for a specific Gnome version (3.14, 3.16, 3.18, 3.20) Note: Normally the correct version is detected automatically and this diff --git a/common/Makefile.am b/common/Makefile.am index 7966da8..c603f5c 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -247,12 +247,6 @@ endif # ENABLE_DARK endif # ENABLE_UNITY -if ENABLE_XFCE_NOTIFY - $(MKDIR_P) $(ithemedir) - cp -R $(srcdir)/xfce-notify-4.0 $(ithemedir) -endif # ENABLE_XFCE_NOTIFY - - if ENABLE_XFWM if ENABLE_LIGHT @@ -288,7 +282,6 @@ EXTRA_DIST = $(srcdir)/cinnamon \ $(srcdir)/gtk-3.0 \ $(srcdir)/metacity-1 \ $(srcdir)/unity \ - $(srcdir)/xfce-notify-4.0 \ $(srcdir)/xfwm4 \ $(srcdir)/xfwm4-dark \ $(srcdir)/index.theme \ diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc index 60e5559..8d54f3b 100644 --- a/common/gtk-2.0/gtkrc +++ b/common/gtk-2.0/gtkrc @@ -20,4 +20,5 @@ gtk-primary-button-warps-slider = 1 include "main.rc" include "apps.rc" include "panel.rc" +include "xfce-notify.rc" include "menubar-toolbar/menubar-toolbar.rc" diff --git a/common/gtk-2.0/gtkrc-dark b/common/gtk-2.0/gtkrc-dark index 51e1285..9f85145 100644 --- a/common/gtk-2.0/gtkrc-dark +++ b/common/gtk-2.0/gtkrc-dark @@ -20,4 +20,5 @@ gtk-primary-button-warps-slider = 1 include "main.rc" include "apps.rc" include "panel.rc" +include "xfce-notify.rc" include "menubar-toolbar/menubar-toolbar-dark.rc" diff --git a/common/gtk-2.0/gtkrc-darker b/common/gtk-2.0/gtkrc-darker index 3c933f1..73dbfcb 100644 --- a/common/gtk-2.0/gtkrc-darker +++ b/common/gtk-2.0/gtkrc-darker @@ -20,4 +20,5 @@ gtk-primary-button-warps-slider = 1 include "main.rc" include "apps.rc" include "panel.rc" +include "xfce-notify.rc" include "menubar-toolbar/menubar-toolbar-dark.rc" diff --git a/common/xfce-notify-4.0/gtkrc b/common/gtk-2.0/xfce-notify.rc similarity index 100% rename from common/xfce-notify-4.0/gtkrc rename to common/gtk-2.0/xfce-notify.rc diff --git a/configure.ac b/configure.ac index eb1f431..a77f31a 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,6 @@ ARC_ENABLE([GTK3], [gtk3], [GTK3], [disable]) ARC_ENABLE([METACITY], [metacity], [Metacity], [disable]) ARC_ENABLE([UNITY], [unity], [Unity], [disable]) ARC_ENABLE([XFWM], [xfwm], [XFWM], [disable]) -ARC_ENABLE([XFCE_NOTIFY], [xfce-notify], [XFCE Notify], [disable]) ARC_ENABLE([TRANSPARENCY], [transparency], [transparency], [disable]) ARC_GNOME From e4f382c4274018b29419e64af65d660ad24b9d6d Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 30 May 2016 20:34:23 +0200 Subject: [PATCH 09/17] gtk2: make panel buttons consistent --- common/gtk-2.0/panel.rc | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/common/gtk-2.0/panel.rc b/common/gtk-2.0/panel.rc index 6ca5d92..d573b7b 100644 --- a/common/gtk-2.0/panel.rc +++ b/common/gtk-2.0/panel.rc @@ -97,22 +97,12 @@ style "workspace-switcher" = "theme-panel" { bg[SELECTED] = @selected_bg_color } -style "window-buttons" = "theme-panel" { - - xthickness = 3 - ythickness = 3 - - bg[ACTIVE] = @selected_bg_color - bg[PRELIGHT] = shade(1.1,@selected_bg_color) - bg[SELECTED] = @selected_bg_color -} - style "indicator" = "theme-panel" { xthickness = 0 ythickness = 0 } -widget "*tasklist*" style "window-buttons" +widget "*tasklist*" style "panelbuttons" widget_class "*Xfce*Panel*.GtkToggleButton" style "panelbuttons" widget_class "*Xfce*NetkTasklist*GtkToggleButton" style "panelbuttons" widget_class "*PanelToplevel*Button" style "panelbuttons" @@ -154,7 +144,7 @@ class "*Xfce*Panel*" style "theme-panel" widget "*Xfce*Panel*GtkProgressBar" style "theme-panel-progressbar" widget "*WnckPager*" style "workspace-switcher" widget "*TopMenu*" style "theme-panel" -widget "*XfceTasklist*" style "window-buttons" +widget "*XfceTasklist*" style "panelbuttons" # Fix gtk-entries in the panel widget "*bookmark*GtkEntry" style "panel-entry" # fixes smartbookmark-plugin From 543d5a9a26acd8c3f2c7e89a63c5d58b5c8cfef0 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 30 May 2016 22:35:54 +0200 Subject: [PATCH 10/17] gtk2: fix entry styling (fix #547) --- common/gtk-2.0/apps.rc | 49 ++ common/gtk-2.0/assets-dark.svg | 516 +++++++++++------- .../combo-entry-focus-notebook-rtl.png | Bin 271 -> 222 bytes .../combo-entry-focus-notebook.png | Bin 254 -> 225 bytes .../assets-dark/combo-entry-focus-rtl.png | Bin 271 -> 232 bytes .../gtk-2.0/assets-dark/combo-entry-focus.png | Bin 254 -> 233 bytes .../assets-dark/combo-entry-notebook-rtl.png | Bin 269 -> 238 bytes .../assets-dark/combo-entry-notebook.png | Bin 251 -> 225 bytes .../gtk-2.0/assets-dark/combo-entry-rtl.png | Bin 269 -> 231 bytes common/gtk-2.0/assets-dark/combo-entry.png | Bin 251 -> 228 bytes ...ctive-bg-solid.png => entry-active-bg.png} | Bin .../assets-dark/entry-active-notebook.png | Bin 0 -> 265 bytes .../assets-dark/entry-active-toolbar.png | Bin 0 -> 280 bytes common/gtk-2.0/assets-dark/entry-bg.png | Bin 0 -> 298 bytes .../assets-dark/entry-border-bg-solid.png | Bin 273 -> 0 bytes .../gtk-2.0/assets-dark/entry-border-fill.png | Bin 154 -> 0 bytes ...-disabled-bg.png => entry-disabled-bg.png} | Bin ...led-bg.png => entry-disabled-notebook.png} | Bin ...bled-bg.png => entry-disabled-toolbar.png} | Bin common/gtk-2.0/assets-dark/entry-notebook.png | Bin 0 -> 269 bytes common/gtk-2.0/assets-dark/entry-toolbar.png | Bin 0 -> 267 bytes .../notebook-entry-border-active-bg.png | Bin 307 -> 0 bytes .../assets-dark/notebook-entry-border-bg.png | Bin 304 -> 0 bytes .../toolbar-entry-border-active-bg.png | Bin 301 -> 0 bytes .../assets-dark/toolbar-entry-border-bg.png | Bin 274 -> 0 bytes common/gtk-2.0/assets.svg | 516 +++++++++++------- common/gtk-2.0/assets.txt | 19 +- .../assets/combo-entry-focus-notebook-rtl.png | Bin 269 -> 231 bytes .../assets/combo-entry-focus-notebook.png | Bin 251 -> 222 bytes .../gtk-2.0/assets/combo-entry-focus-rtl.png | Bin 269 -> 234 bytes common/gtk-2.0/assets/combo-entry-focus.png | Bin 256 -> 225 bytes .../combo-entry-insensitive-notebook-rtl.png | Bin 226 -> 226 bytes .../combo-entry-insensitive-notebook.png | Bin 218 -> 218 bytes .../assets/combo-entry-notebook-rtl.png | Bin 259 -> 216 bytes .../gtk-2.0/assets/combo-entry-notebook.png | Bin 247 -> 214 bytes common/gtk-2.0/assets/combo-entry-rtl.png | Bin 259 -> 220 bytes common/gtk-2.0/assets/combo-entry.png | Bin 251 -> 217 bytes ...ctive-bg-solid.png => entry-active-bg.png} | Bin .../gtk-2.0/assets/entry-active-notebook.png | Bin 0 -> 245 bytes .../gtk-2.0/assets/entry-active-toolbar.png | Bin 0 -> 276 bytes ...entry-border-bg-solid.png => entry-bg.png} | Bin common/gtk-2.0/assets/entry-border-fill.png | Bin 154 -> 0 bytes ...-disabled-bg.png => entry-disabled-bg.png} | Bin .../assets/entry-disabled-notebook.png | Bin 0 -> 250 bytes ...bled-bg.png => entry-disabled-toolbar.png} | Bin common/gtk-2.0/assets/entry-notebook.png | Bin 0 -> 237 bytes common/gtk-2.0/assets/entry-toolbar.png | Bin 0 -> 247 bytes .../notebook-entry-border-active-bg.png | Bin 292 -> 0 bytes .../assets/notebook-entry-border-bg.png | Bin 268 -> 0 bytes .../notebook-entry-border-disabled-bg.png | Bin 250 -> 0 bytes .../assets/toolbar-entry-border-active-bg.png | Bin 303 -> 0 bytes .../assets/toolbar-entry-border-bg.png | Bin 294 -> 0 bytes common/gtk-2.0/main.rc | 188 +------ .../entry-active-toolbar-dark.png | Bin 0 -> 280 bytes .../menubar-toolbar/entry-active-toolbar.png | Bin 0 -> 276 bytes .../entry-disabled-toolbar-dark.png | Bin 0 -> 250 bytes .../entry-disabled-toolbar.png | Bin 0 -> 251 bytes .../menubar-toolbar/entry-toolbar-dark.png | Bin 0 -> 267 bytes .../gtk-2.0/menubar-toolbar/entry-toolbar.png | Bin 0 -> 247 bytes .../menubar-toolbar/menubar-toolbar-dark.rc | 50 +- .../menubar-toolbar/menubar-toolbar.rc | 50 +- .../toolbar-entry-border-active-bg-dark.png | Bin 409 -> 0 bytes .../toolbar-entry-border-active-bg.png | Bin 391 -> 0 bytes .../toolbar-entry-border-bg-dark.png | Bin 352 -> 0 bytes .../toolbar-entry-border-bg.png | Bin 366 -> 0 bytes .../toolbar-entry-border-disabled-bg-dark.png | Bin 321 -> 0 bytes .../toolbar-entry-border-disabled-bg.png | Bin 321 -> 0 bytes 67 files changed, 755 insertions(+), 633 deletions(-) rename common/gtk-2.0/assets-dark/{entry-border-active-bg-solid.png => entry-active-bg.png} (100%) create mode 100644 common/gtk-2.0/assets-dark/entry-active-notebook.png create mode 100644 common/gtk-2.0/assets-dark/entry-active-toolbar.png create mode 100644 common/gtk-2.0/assets-dark/entry-bg.png delete mode 100644 common/gtk-2.0/assets-dark/entry-border-bg-solid.png delete mode 100644 common/gtk-2.0/assets-dark/entry-border-fill.png rename common/gtk-2.0/assets-dark/{entry-border-disabled-bg.png => entry-disabled-bg.png} (100%) rename common/gtk-2.0/assets-dark/{notebook-entry-border-disabled-bg.png => entry-disabled-notebook.png} (100%) rename common/gtk-2.0/assets-dark/{toolbar-entry-border-disabled-bg.png => entry-disabled-toolbar.png} (100%) create mode 100644 common/gtk-2.0/assets-dark/entry-notebook.png create mode 100644 common/gtk-2.0/assets-dark/entry-toolbar.png delete mode 100644 common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png delete mode 100644 common/gtk-2.0/assets-dark/notebook-entry-border-bg.png delete mode 100644 common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png delete mode 100644 common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png rename common/gtk-2.0/assets/{entry-border-active-bg-solid.png => entry-active-bg.png} (100%) create mode 100644 common/gtk-2.0/assets/entry-active-notebook.png create mode 100644 common/gtk-2.0/assets/entry-active-toolbar.png rename common/gtk-2.0/assets/{entry-border-bg-solid.png => entry-bg.png} (100%) delete mode 100644 common/gtk-2.0/assets/entry-border-fill.png rename common/gtk-2.0/assets/{entry-border-disabled-bg.png => entry-disabled-bg.png} (100%) create mode 100644 common/gtk-2.0/assets/entry-disabled-notebook.png rename common/gtk-2.0/assets/{toolbar-entry-border-disabled-bg.png => entry-disabled-toolbar.png} (100%) create mode 100644 common/gtk-2.0/assets/entry-notebook.png create mode 100644 common/gtk-2.0/assets/entry-toolbar.png delete mode 100644 common/gtk-2.0/assets/notebook-entry-border-active-bg.png delete mode 100644 common/gtk-2.0/assets/notebook-entry-border-bg.png delete mode 100644 common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png delete mode 100644 common/gtk-2.0/assets/toolbar-entry-border-active-bg.png delete mode 100644 common/gtk-2.0/assets/toolbar-entry-border-bg.png create mode 100644 common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png create mode 100644 common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png create mode 100644 common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png create mode 100644 common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png create mode 100644 common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png create mode 100644 common/gtk-2.0/menubar-toolbar/entry-toolbar.png delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png diff --git a/common/gtk-2.0/apps.rc b/common/gtk-2.0/apps.rc index 6a010b0..2fcbdd5 100644 --- a/common/gtk-2.0/apps.rc +++ b/common/gtk-2.0/apps.rc @@ -25,3 +25,52 @@ widget_class "*ThunarWindow*." style "thunar-frame" widget_class "*ThunarShortcutsView*" style "dark-sidebar" widget_class "*ThunarTreeView*" style "dark-sidebar" widget_class "*ThunarWindow*." style "thunar-handle" + +# +# Mousepad +# + +style "entry_border" { + + engine "pixmap" { + + image { + function = SHADOW + detail = "entry" + state = NORMAL + shadow = IN + file = "assets/entry-border-bg.png" + border = { 12, 12, 12, 12 } + stretch = TRUE + } + + image { + function = SHADOW + detail = "entry" + state = ACTIVE + file = "assets/entry-border-active-bg.png" + border = { 12, 12, 12, 12 } + stretch = TRUE + } + + image { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + overlay_file = "assets/null.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } + + image { + function = FLAT_BOX + detail = "entry_bg" + state = ACTIVE + overlay_file = "assets/null.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } + } +} + +widget_class "*MousepadSearchBar*." style "entry_border" diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg index ee913d7..83c6a16 100644 --- a/common/gtk-2.0/assets-dark.svg +++ b/common/gtk-2.0/assets-dark.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="243.54683" - inkscape:cy="369.23846" + inkscape:zoom="2.8284271" + inkscape:cx="32.121536" + inkscape:cy="224.28999" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -1753,8 +1753,8 @@ transform="matrix(1.9947791,0,0,1.9939719,403.25667,278.01933)" id="sjhgfjsgf-2" /> - + + - + + + y="-279.63782" + rx="0" + ry="0" /> - - + + - + + + y="-279.63782" + rx="0" + ry="0" /> - + + - + + + y="-279.63782" + rx="0" + ry="0" /> - + + - + + + x="-91" + y="-279.63782" + rx="0" + ry="0" + transform="scale(-1,1)" /> - + + - + + + x="-91" + y="-279.63782" + rx="0" + ry="0" + transform="scale(-1,1)" /> - + + - + + + y="-279.63782" + rx="0" + ry="0" /> - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png index 3d78384a692fc8520b157545b29997692f1919d9..0e5ada5bb82e6ec8c7dcefb12e956a9b4190dbd8 100644 GIT binary patch delta 133 zcmV;00DAwA0^R|T7zqRe0002zr>lFBAxv>3P)t-sKt)nPOI$)qT}51dMO}POfx=FM z#7>08PlCcvgu_yk-%^y~W#R|y0000iNkl%EItdY3K_ z=)UaW8sr*N>l$0**L=jU<*0wl;h@R)gQh&vJ$x?-sExBE$S;_IjhiPkr?}*|&~zz( zprECvi(`n!`D6hH_CI@K=I}@~Ol)oLX5>zId{FJwk$&GPjtL=CrY$-X;XGGa)|0EGYk0pS6VZFDD4OjJccMN&aZTtQ1)LP}jlTzy7eeNKVGPJ+NrgTzjR#ZQFA zQj_0Ol;Ti){jdN404zyFK~xx5V_=!9oO+VFMETzz}C6`(+XmJInyV dX6c592>`xo9{}1^Ztnm9002ovPDHLkV1lJyF2(== delta 153 zcmaFJ_>XZyZoNT(Plzi614C%TRo}Fke&uVt%GddpE)VFw6wrOy!8OP=rq(UC*01@9 zU&~SdmZL$F?*~nJbZTP?7f=sJNswPK0~=RncH!^et$PjJfMPnHE{-7*;mI$ozRPpj z8R!_NG&HZ~P&=%w@~vI*oZGk4fhymM+*x)P%iH)cm{$vF^s2o1VgS_0;OXk;vd$@? F2>@olFBAxwKJP)t-sI6O)}L{dLicR)o_KuKCaNn1cx zc1(i9O@P5ofx=CK!cKw0QIg+Ml;Wlb@^klGQfQQL41^~h0Owht)9gzS4002ovPDHLkV1k0rH3t9y delta 183 zcmaFC*v~XUf|G-pfq_9O+^uS&qEEeXfKP}kkRRG`)h)K$A#18<=^D?nHSUE=+zOWZ zcU`iu@v;vqcL*!F;uxZFK3Twl{f|w|93F{=iLK4ujNA#2kE)$I((gOPF(G8iv_)qkoaZXbdh-}= iDk?BeIA$YnuFk-o#{8>oSGgz96b4UMKbLh*2~7Y4p+MUJ diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus.png b/common/gtk-2.0/assets-dark/combo-entry-focus.png index e1e35fd18f3f4824104edaa472107a1a35ce4d28..75e2590b0f4169837a5dcf7a4450c61ca6a1145d 100644 GIT binary patch delta 131 zcmV-}0DS-c0qFsdZG0_IOjJcUJW4-ScR)o_Kt)wRS9n8Mc0*WqL|Ao9g2PRL!cBt2 zPl?Y@iO^A!-%^y~EtN4d0000kNkl3s(U4;Z|Qm7qX@VW|>=eHn@UXo$0s l{nC!a_DM#t8Rx>o1OVI~K=*p_!59Dl002ovPDHLkV1jo9HNpS@ delta 153 zcmaFK_>XZyZoNT(Plzi614C%TRo}Fko~5hYOV@Z5F7ofX=-+k8!p6%!tlS~I!l&u5 zZ{s1~rXzuq?gveI+*x*ima*|+P~jHRsAU(*eGb&f;OXk;vd$@? F2>=-6Icfj^ diff --git a/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png index f21d25b482ae38c86c0b68358aa34a54325bc465..4753a67d41330910a0556ca0a0d97ec1485136e9 100644 GIT binary patch delta 150 zcmeBWddE0Hf|G@rfq~)q^3~N76@BV;1AIbUwe>7@^sV%b?DUQ842dw?17|fkb`T`w5yXtfCdSSc*WNPYcYVM?G zV56;PsiSYDZ)B%$Y-eC>XJzMYW$*3a8Wi8C#tziRSrX(I%)rLYlbKUo@>^)Sls{0= z+|$J|MC1J1i-t@L3LJ+IY*RS#-~Nr>n!L0|)xec6FY}SH-VOqx@#s g-6`?@_E}9%a5tksO8bQGKrgfzZi#w;Pl&6wo~4eymA;XkzOkKwk-dS5ot2%Jm7TYpbAX*ofW32oy=#zz zYf!azoEifIgN~<*V~9j}vPIen2KJSk&pRAsWa~EO*k&R$JH2D`#J@?MNBkmt6Xe5N b*f|+q8Ej%>KT)#~sE@(Z)z4*}Q$iB}(S9ay delta 150 zcmaFJ_?vM;ZoO`RPlzi61B14z8QAC<+Gy)p>gZeP8`?Uj;D)bh(vgD#pcb-Tv8H!(nbdk zhOtae6cXB<*s*!y-=;UmllwUO_r`Ma3p3RHlJwlkf9<(EP$Pq8u^{jLaZS)Lm^bBnc4DC!TTum)p zEo{7O9sO;c{OnzV99)CqFMNIp)N17E;us=vIXR_)$?dAfG2?)5|D$(5%xSC7_CosjX+FYiOfqV54VfYhvMQYT;^O8|LF#kXdP{8aq9R7)m9C+UuA!}-fsMYgoq?g9iG{0$jhBt1zbz0s`PsV! zIk*Nn3-j|cFfizNx;TbNgePZ&r!+KQvMpcufT{UuEK4+7=UM9`H&4`EbW57P)^Wpa d*@uoy3=e${xZK*)m9C+UuA!}- zfsKiUtA&l%{TBC|Kn)xvL4LsuY+RYyg};Bd?lo`&is^W|IEF}sCs*v=#LOinu}<3P zz`-z<$%#TjyAwM$PyD+{q_g&{;K90TAvraM`j?VfPW&$Z%|ML|p00i_>zopr0BZa# ASO5S3 diff --git a/common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png b/common/gtk-2.0/assets-dark/entry-active-bg.png similarity index 100% rename from common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png rename to common/gtk-2.0/assets-dark/entry-active-bg.png diff --git a/common/gtk-2.0/assets-dark/entry-active-notebook.png b/common/gtk-2.0/assets-dark/entry-active-notebook.png new file mode 100644 index 0000000000000000000000000000000000000000..b49b365537cc16e0ed8a5d592ff6144b4005b6a0 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3-oX$H;yMQq09po*^6@9Je3(KLBz$3p^r= zfy%FgFr$;k>oc5!lIL8@MUQTpt6HXu`t1AIbU z9bAJPy5Dzd=Owj<-|F7d-oT!q@S;)1;nb zTPLasr%x2t?wY^PLq9m`oc5!lIL8@MUQTpt6HXu`N0(?ST z^-b(81M)2c^Q;03?A#;l+#~HgBJ4aO?OlTGU4tB4gS;E|dp8{LZaC!Kc+jU|pKtvE z--d&MlkNpgc@+Ig_c_oUKTj9O5RLP1CmAv|DDWKN;|kJd+V=ndYW@XxWzWnqWXxER z`$C~1E%D}qWYs&aF;VTC)<+}?CG7vTs4Hk*mmp7obw+6Z>~ARwrTN>mAG5AsAvGi2 Sdd~x($qb&ZelF{r5}E++f?+}c literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets-dark/entry-bg.png b/common/gtk-2.0/assets-dark/entry-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..66655122862b265dc8047d992a2931aae890cdd2 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3-oX$H;yMQq09po*^6@9Je3(KLBz$3p^r= zfy%FgFr$;k>oc5!lIL8@MUQTpt6HXu`t1AIbU zwe>8u^{jODt#u8obq#HF4Q=%dZ1fCmO)Xq4Y`iRNJuPg#ENwh3Z9VN>0_|Ob9bAJ& z7pas1wF{O6`31j22Qpd_cYu;Uo-U3d8t30$GGuBn;BdYepv@LN;rIM&%v0X+{rlR> z*%P}#WiFeX+)k0jg3nJFg?n5PVS1wW=Zott-=7@2uA7MFY~FSDF2~}q^xYZy3`Z3W T;;t8f!hpfk)z4*}Q$iB}mUCsC literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets-dark/entry-border-bg-solid.png b/common/gtk-2.0/assets-dark/entry-border-bg-solid.png deleted file mode 100644 index e7f3a9cb83b57cbf12e71e3dffc1e030fa998de4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3-oX$H;yMQq09po*^6@9Je3(KLBz$3p^r= zfy%FgFr$;k>oc5!lIL8@MUQTpt6HXu{Y0(?ST zwe>8u^{jODt#u8obq#HF4Q=%dZ1fCmO)OkZEnF>Zyew=zEo{9kZ9FY)J?)(X?OlQ# zT!Y+J$NT`A;Opt)7@~3h?WK*34F()87nub))f~UYUt@Ht;;#RF%6bQ9V&@T=vNI=^ zzR0ntp61Ky>g(u`cgR0}$=xaZj%mKmi8iZl-?{T(+0~otp6SnZRCcnixV;Z(FoUP7 KpUXO@geCyyp;i(A diff --git a/common/gtk-2.0/assets-dark/entry-border-fill.png b/common/gtk-2.0/assets-dark/entry-border-fill.png deleted file mode 100644 index 387a98bf72156ae9f8841a133e00956fce4bdb99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^tUxTm!3HFa)Xf(FDVAa<&kznEsNqQI0P;BtJR*yM z>aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0xGo-U3d s5>u16Y$*JDzJYDV1y(oK_Sp&yeOin!%xpV90hKU#y85}Sb4q9e01fyk`~Uy| diff --git a/common/gtk-2.0/assets-dark/entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/entry-disabled-bg.png similarity index 100% rename from common/gtk-2.0/assets-dark/entry-border-disabled-bg.png rename to common/gtk-2.0/assets-dark/entry-disabled-bg.png diff --git a/common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/entry-disabled-notebook.png similarity index 100% rename from common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png rename to common/gtk-2.0/assets-dark/entry-disabled-notebook.png diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/entry-disabled-toolbar.png similarity index 100% rename from common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png rename to common/gtk-2.0/assets-dark/entry-disabled-toolbar.png diff --git a/common/gtk-2.0/assets-dark/entry-notebook.png b/common/gtk-2.0/assets-dark/entry-notebook.png new file mode 100644 index 0000000000000000000000000000000000000000..cb3ede218aaf5b162d9fd35ceb7844b76eaeb7f6 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3-oX$H;yMQq09po*^6@9Je3(KLBz$3p^r= zfy%FgFr$;k>oc5!lIL8@MUQTpt6HXu`t1AIbU zwe>7@^sV%b?DUQ842EaloasKTkL#6`?9L^UNwk=9J`Pct8b4PXizpuTV8Co}lOb_Mp=e1tvo9k1} zrBcMjSixamJJByVXu-VGS{rt4x_!p%K-{LyvCaBACW>KQx!qHN<}!G?`njxgN@xNA D>b6rm literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets-dark/entry-toolbar.png b/common/gtk-2.0/assets-dark/entry-toolbar.png new file mode 100644 index 0000000000000000000000000000000000000000..5c04ca3eac97b705781502c75a1915c25bed9965 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3-oX$H;yMQq09po*^6@9Je3(KLBz$3p^r= zfy%FgFr$;k>oc5!lIL8@MUQTpt6HXu`t1AIbU zRW*&&wN2EuP1SWwHFYgC_06?(Ep!a5bquZbP3*1gy{+witR1|q9enIv0_|Ob99)A| z99d!x)b8c!;uxZF{_Q10rUnHbmV>4X6qywN*RSO__#&2P{Zw{Y>ykxn^A10rdVbZ3 zo-LXWEG-3Q*Zoqoc5!lIL8@MUQTpt6HXu{&1AIbU zfplorRL|T=zD0|Dizo(01h{pN1mo_ps zDDb#k>|T_?#OU*F{#8bfy{-FepUS%I{yC*o^u=6`;F5xao0Z?>7<6^=^tt}KES_ol sH0_1vvO5drEWRBRqqx*HT{<+*Yd(AQ-J4&GfJQTTy85}Sb4q9e0L<-jl>h($ diff --git a/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png b/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png deleted file mode 100644 index 37a9dc86956bd195b3e5b057246f38c3690b155d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3-oX$H;yMQq09po*^6@9Je3(KLBz$3p^r= zfy%FgFr$;k>oc5!lIL8@MUQTpt6HXu`N0(?ST zfwY5zgSokxr>pRv$2_zv4xYVrJJ6Cjh>;6ww|SqzLma_oxZW1fw7&HotKrJ zx0SuOgKJQAbmwBAe(sVWzhDL)zLJu%^76{xzo+i~vkEBe@9E+gqH+H1rHzaY1{^LI zofiu#dK~(<+seTs|6zW7WqU#J%%IN=_gf8I*~@SAZQ1OosUE~3cG5q7$<-;d4|(}* nJ-9P%`_2l5s?+Db^;9rwxUf7w{NSt!&}arvS3j3^P6oc5!lIL8@MUQTpt6HXu`N0(?ST zfwV(tgL(8Mmz+5+IrChz<~U`~an7FO*LlIO>!QAiy=6eYWni9FV1akTe(#0@-VKMm z8xICfx)(I%Q5IJVBTzqANswPK0}o$GNm+U2@85ji`>z2-eLY`B>6ZYH+Uq^gUgcyqV(DCY(Sh+Z50)BEj=Kz)YdiA)V0viF;~+zQPnh3*EUhtHdWU#)iJQvF|^h - + + - + + + y="-279.63782" + rx="0" + ry="0" /> - - + + - + + + y="-279.63782" + rx="0" + ry="0" /> - + + - + + + y="-279.63782" + rx="0" + ry="0" /> - + + - + + + x="-91" + y="-279.63782" + rx="0" + ry="0" + transform="scale(-1,1)" /> - + + - + + + x="-91" + y="-279.63782" + rx="0" + ry="0" + transform="scale(-1,1)" /> - + + - + + + y="-279.63782" + rx="0" + ry="0" /> - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt index 08e3959..8ebc233 100644 --- a/common/gtk-2.0/assets.txt +++ b/common/gtk-2.0/assets.txt @@ -42,18 +42,17 @@ menu-radio-checked-insensitive menu-radio-unchecked menu-radio-unchecked-selected menu-radio-unchecked-insensitive -entry-border-bg-solid -entry-border-active-bg-solid -entry-border-disabled-bg entry-border-bg entry-border-active-bg -notebook-entry-border-bg -notebook-entry-border-active-bg -notebook-entry-border-disabled-bg -toolbar-entry-border-bg -toolbar-entry-border-active-bg -toolbar-entry-border-disabled-bg -entry-border-fill +entry-bg +entry-active-bg +entry-disabled-bg +entry-notebook +entry-active-notebook +entry-disabled-notebook +entry-toolbar +entry-active-toolbar +entry-disabled-toolbar combo-entry combo-entry-focus combo-entry-insensitive diff --git a/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png index ee73552b473c2e9ce46ca28ce8cdbdbaa8c6f345..689534b56da790f31d902cb1ff93d13225098f08 100644 GIT binary patch delta 142 zcmV;90CE3~0_Opc7zqRe0002zr>lFBAxwHFP)t-sQk3FWm*Z!l=5?y*cB<%itLV$$ z_RQe+(Bk*e;`jRe{`>s?|Ns9kanMBo001&cL_t&-S7T&=0!Gs=#xqd%|KsQ2Y=%D- w2=;$h1e?KRXtV#hVfEwx?e7@jVG@=J0HgdN3FA_PDF6Tf07*qoM6N<$f~lHFE&u=k delta 181 zcmV;m080Po0gVEX7zqdi0000YS4Mh~AxwWWP)t-s00010fYqY8=#{_fkGbrSyX=?0 z?U=vqWuWF#l;T#G<8`X&cB<%itLVz!^~>M&{{H^5FCyLm000SeQchC<1`7;nY;$z` z5|<+AMX1p~_lt>vXg7V!J*rVE+6!{_b jr79+kHQaOs`*|5J6Se^o)z(yt00000NkvXXu0mjfS`JW@ diff --git a/common/gtk-2.0/assets/combo-entry-focus-notebook.png b/common/gtk-2.0/assets/combo-entry-focus-notebook.png index 888aa9b56f02ff8e834909842a566a4a32b686fa..d223057d9895a76d1c69f1a5af2a29fa9ac01182 100644 GIT binary patch delta 120 zcmV-;0Ehqk0p0oy$#001mWL_t&-S7X>7$N&e$vvxzl1_saF2(}awn|p|}k^K^h#4hSWu(v0| ag9HEtZ=?J=EUw`I0000yR!od z8W^q{GQh!71e0MB61!oDvyuI>6^VV#5y5_Y5*{W1gNYe>Y!4g7F#rGn07*qoM6N<$ Ef)6r4VE_OC diff --git a/common/gtk-2.0/assets/combo-entry-focus-rtl.png b/common/gtk-2.0/assets/combo-entry-focus-rtl.png index 2380d75155a1e6f4af4a32f5420b76c38262aeaf..f59ae2a37cc2172c5fa0db1c255dd095dd18c2ea 100644 GIT binary patch delta 145 zcmV;C0B-+{0_p*f7zqRe0002zr>lFBAxwQLP)t-sQk3FWm*Z!l=5wg#bg1TaspiDl z@WtBj(Bk*e;`jCT_xk+)`~3d@|NkIkA>;r605VBLK~xx5V`P8=M$;_DyHNK3ZRg-@ zhTj66Og2kF+4kdkG|Y00000NkvXXu0mjf+0RM^ delta 181 zcmV;m080Pr0gVEX7zqdi0000YS4Mh~AxwWWP)t-s00010fYqY8=#{_fjkf8Fw&#+% z>65+dWS-?xl;T#G<8!Fybg1TaspiDl@WtBj_4fCCiIz72000SeQchC<1`7;nY;$z` z5|<+AMX1p~_lt>vXg7V!J*rVE+6!{_b jr79+kHQaOs`*|5J6Se^o)z(yt00000NkvXXu0mjf8*oqz diff --git a/common/gtk-2.0/assets/combo-entry-focus.png b/common/gtk-2.0/assets/combo-entry-focus.png index c7e7a6e5dde5a49e98b31428fcb10b4b35d20cbd..d04c9e5616f7b1ccac783a19da538c58df4ffaf2 100644 GIT binary patch delta 123 zcmV->0EGX50^tFWZFDD4OjJcul;T#G<7c7fXrbnFr{;60=5(m$#M$uB;`h?y_x1Mo z`~3d@|NlZ53{(IB04zyFK~xx5V^|)@00+gh&p^Qe2G27Hwlor(XNa?r{St}9F6u_G dmnXu51ON}gvQ)mV?TY{a002ovPDHLkV1o8QJih<{ delta 155 zcmV;M0A&B+0e}LKZGSLOOjJbx0032h)tR&Ajkf2Cwda+)=$F3hWS-?^p5;=M;#QaA zbEoEWsOEI2=ET|X_4fCX5F&X1000SeQchC<1`26wadG?mi}eHA0000jNkl?4V@Q5^?ug+0y9Eyu02Cu098rIV0IL81002ov JPDHLkV1n3VL;3&! diff --git a/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png index 8e6d815416fbc393e08d483660879ff6d6c84ef6..b41c462118aa58ff53b571130f896400255d2aa4 100644 GIT binary patch delta 44 zcmV+{0Mq~C0pbCWdm`%X^y=>P>+SUQ_W1So`S delta 44 zcmV+{0Mq~C0pbCWdm`!V^XcvL>g@CN_W1So`S$nv_W1hx`}_O+{Qmy_N2JfXk)1^i C3nQoi diff --git a/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png b/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png index 7ccb9d3d453f3385d69475fb9273fda448dcc8bc..9e525134706e8bf47da70cb3dca47aaaa44ef8eb 100644 GIT binary patch delta 35 tcmV+;0NnrD0onnOei`cR^y}^P_4fGp`1|gwv>4M0Y;Ata5e+m0R)?A0fNmiVQ90Nk^I7r@FQcy1qOJSoELon0D12mBhHMI{{R30 M07*qoM6N<$f)i;?5&!@I diff --git a/common/gtk-2.0/assets/combo-entry-notebook.png b/common/gtk-2.0/assets/combo-entry-notebook.png index c29a8fb6a9e62c0cf915970bb19e02b36f6d6f67..c82543ea3befc0390bed04ad2408fd9255336525 100644 GIT binary patch delta 112 zcmV-$0FVFo0oDPKZD}4*OjJeB*5=UH=hfTk+1~5f-|O-7_wn=i^7Q!r{{H{}|F$S` zNB{r;DoI2^R2Wxdm})GGy z@bdQX^7sD!{w3hKT>t<82XsOjJeB*5=UH=hfTk*WBsX-RbJ>^78cf_4fDv{{H{}|1}kq z$N&HUFiAu~R2Ug!WPk!j6KlqqQ1<^*@8E2PzpD`J{}l)}L;BEWBl`u(k08Ip!^A}! Y01qA@IR_cq82|tP07*qoM6N<$g8Y9xH2?qr delta 158 zcmV;P0Ac^!0fPdNZGSCLOjJbx007n1)#&Kx>gwv<;_Teu>fYk(-sSDn+33&K=Fr#Y z*WBsX-RbJ>^7Z!ju-L6O00009bW%=J00s*TX>4M0Y;Ata5e+m0R)?A0fNmiVQ90Nk^I7r@FQcy1qOJSoELon0D12mBhHMI{{R30 M07*qoM6N<$g6ZT;vH$=8 diff --git a/common/gtk-2.0/assets/combo-entry.png b/common/gtk-2.0/assets/combo-entry.png index da69e1913a625607b80b1ed9bfb4394949a9d0a1..df09596f5a2067fd036ff7261b1eac176af269c0 100644 GIT binary patch delta 115 zcmV-(0F3|p0oehNZEPV>OjJeB*5=UH=hfTk*WBsX-RbJ>@#^jJ^7Q!i_V@n&{{R2~ zAAE-Z0000gNkl)+(<)7j|H*5=UH=hxin z*WKyr?eXgE^7Z!jnJ+qK00008bW%=J00s(aYjJV=MA1Np0000iNklv$6vU z8W@fnGQh!71e0MB61!oDvyuI>42gZ*5y5`D6CNf2TT~e{Bp8x;=07*qoM6N<$ Ef})d1dH?_b diff --git a/common/gtk-2.0/assets/entry-border-active-bg-solid.png b/common/gtk-2.0/assets/entry-active-bg.png similarity index 100% rename from common/gtk-2.0/assets/entry-border-active-bg-solid.png rename to common/gtk-2.0/assets/entry-active-bg.png diff --git a/common/gtk-2.0/assets/entry-active-notebook.png b/common/gtk-2.0/assets/entry-active-notebook.png new file mode 100644 index 0000000000000000000000000000000000000000..a314dc766c93562bc352b405cf281d24846f4f61 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!VDzE)_nK|q?n7HJVQ7*IBq}me*oli7I;J! z1C?I~VMZs7*%d%R$r9IylHmNblJdl&REF~Ma=pyF?Be9af>gcyqV(DCY(S=J1^9%x z22FVsHvMtw$`_@pUX-nRQNH>`<(ik(YhRwe|Lx3!Z=b&Z{R~7u{{H{}-|)GX98j07 zr;B5V#O352i6oc5!lIL8@MUQTpt6HXu_i1AIbU zgQh$Ro%Xn3$&-SmPYRblDO&cVY~}OvRnIF{J>PZy#qJ9)p1*kg_S4U|pMSpl{PX?i zpZ`GMKM>46>KXzx#MjfsF+}71+e;f68w@yHE;?WEFwl5ozlOQxi`c(!Q_Brf4~cA) z`ts$($`8wKywfRWboF&~&^zQGzvSu^{>Ht_6fc;qx*g-*zA_~J_U^r5$5oT>JPADo PG?>BD)z4*}Q$iB}5MX+n literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets/entry-border-bg-solid.png b/common/gtk-2.0/assets/entry-bg.png similarity index 100% rename from common/gtk-2.0/assets/entry-border-bg-solid.png rename to common/gtk-2.0/assets/entry-bg.png diff --git a/common/gtk-2.0/assets/entry-border-fill.png b/common/gtk-2.0/assets/entry-border-fill.png deleted file mode 100644 index 15f67464afbfc0e57a0bf88cf6652732d3b6c15f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^tUxTm!3HFa)Xf(FDVAa<&kznEsNqQI0P;BtJR*yM z>aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0xGo-U3d s5>u1^{Qv*Ip3USyi=Kg&#T^#L|EF1W7S(TS2P$FkboFyt=akR{05H!gI{*Lx diff --git a/common/gtk-2.0/assets/entry-border-disabled-bg.png b/common/gtk-2.0/assets/entry-disabled-bg.png similarity index 100% rename from common/gtk-2.0/assets/entry-border-disabled-bg.png rename to common/gtk-2.0/assets/entry-disabled-bg.png diff --git a/common/gtk-2.0/assets/entry-disabled-notebook.png b/common/gtk-2.0/assets/entry-disabled-notebook.png new file mode 100644 index 0000000000000000000000000000000000000000..91b4c2de26a436547d9f03a52978a7f80a487706 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!VDzE)_nK|q?n7HJVQ7*IBq}me*oli7I;J! z1C?I~VMZs7*%d%R$r9IylHmNblJdl&REF~Ma=pyF?Be9af>gcyqV(DCY(S>!2Ka=y zK7H}=>B~>g-+X@Y`tz%|UtYcY^7`$Uuit-u{r>CwkKf;a{{Hdv_pjf-fB*UO|NsB` zhQz}_jrN`{jv*44lPl()U|>%AEn#-`UTfp)X*}=B1sAk9iglJxY!vS-Pn7sHp|*O0 rqO7WlnX=Q%Hqpc0?iCze>zEn(WuKe#JYwSm8pYu0>gTe~DWM4fx^!vy literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/assets/entry-disabled-toolbar.png similarity index 100% rename from common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png rename to common/gtk-2.0/assets/entry-disabled-toolbar.png diff --git a/common/gtk-2.0/assets/entry-notebook.png b/common/gtk-2.0/assets/entry-notebook.png new file mode 100644 index 0000000000000000000000000000000000000000..0ccc4ed6142a97fdba5c8737e183c06d85343911 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!VDzE)_nK|q?n7HJVQ7*IBq}me*oli7I;J! z1C?I~VMZs7*%d%R$r9IylHmNblJdl&REF~Ma=pyF?Be9af>gcyqV(DCY(SW~WG=m7Bv39`Gt>I~&SjFw>E%bNhrw?#}HA5}yKUyJdvV@@U2uoZ~8Qd)oFv dKx7>g!<0Q6|8sZWG6tH&;OXk;vd$@?2>?BvU3~xm literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets/entry-toolbar.png b/common/gtk-2.0/assets/entry-toolbar.png new file mode 100644 index 0000000000000000000000000000000000000000..885a5d8a85486a85c8f60628f5e2d5cc89d217ef GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!VDzE)_nK|q?n7HJVQ7*IBq}me*oli7I;J! z1C?I~VMZs7*%d%R$r9IylHmNblJdl&REF~Ma=pyF?Be9af>gcyqV(DCY(S=J1^9%x zp1=0&{I%y-Za%+q>-qJ&uWsCZ`QR}Sy?XxQ_4n^TzyJ984+Q=LfspzxZlErEPZ!4! ziSXo%;FJc&g*VW-$N& literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets/notebook-entry-border-active-bg.png b/common/gtk-2.0/assets/notebook-entry-border-active-bg.png deleted file mode 100644 index 66092deabc2d9f10b168af2f29bedbaa794e7310..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3-oX$H;yMQq09po*^6@9Je3(KLBz$3p^r= zfy%FgFr$;k>oc5!lIL8@MUQTpt6HXu{Y0(?ST zf%K~Vua=y6JLllrIS1a&I{0qRp?9eZo~12#7BuBi*!0JxD_@kZdQrCOMfvI%r|x|{ zegEsffB&p=?3RM;E(!7rX5ir~DJ!r1{rizsxiC=B+tbA{MC1J1Nrp@f1{_EDvRx;5 z{rsQ)yW!Bgglj#VhkR3=&obAUA7Y#Pra~&{S3}S`4@Hd$@wI`Wn*6O-nJvEO%gcyqV(DCY(S>!2Ka=y z0_j(;UcG($_R;eXkHP54iw{?By*z*I*@f%RZ{B--^Zx4(pT2$g^!?wzf8{>2O@SIX zN`m}?8F=_g%E~K$_okPN0L5%QT^vIs!jmgDZ(?Rko11KrcY=XgX)8~+q=3S#L?t2r zNedY}j~nt-p4fNQg}d`{V?kep?%~^WKM2gJgcyqV(DCY(S>!2Ka=y zK7H}=>B~>gUwwN1`qRrdpI^TH{OZl;uit-u{r>A45dHY|{l~9gzkmP!^XK2ce~e!* zBm*_td%8G=NL)^?n0tbOIqA2A+4Xy^jjw0%yek)6(Bdf8Sw68*yt6z};?soM>IsUn psw!rRPA}WU4tu*-aCEI>W~gC)F8+Qw+g+eh44$rjF6*2UngGG^YZCwf diff --git a/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png deleted file mode 100644 index aa5c284fbbbe03e3348ad575957454a54a15ae70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3-oX$H;yMQq09po*^6@9Je3(KLBz$3p^r= zfy%FgFr$;k>oc5!lIL8@MUQTpt6HXu`N0(?ST zf%Mc>uO@A~J#pL9$vd9|$qCz@PTKK&;`V3BbDkv6eG)X~QRuYC1xub3EPYbA^hwdO zC%ewS*nQ!}^B1rGzn%3HsGqwe$S;_Ihp(ihth~JP_wT8D|EvNE`+2%JhG?9BdubzM zg8_%jMd!tV2LulN+im6Gk^eA1zOwzpGNYwund`(4iO9aGC|fd@ZRs2j#RwJq+KFMo rd0k;etJt2;y8G-=W5MZj*WC9QU19mWw(!PApverLu6{1-oD!Moc5!lIL8@MUQTpt6HXu{Y0(?ST zf%Mg@uWsMIef`e!TlZexxbytR-RHOOzq)z%#l`E-FWq>4{@Szi*PdUw`TWYQ=MNsg zeDL_y^B1p~7G$OZb#j*k`2{oZ@RgL5m6uok{ylZ?pH)C%Z%-G;5RLP1Cs{K!DDWJO z6Lo$0|KIehb2nMfFimbM5uGRSwdH=Vf#Y$G7k!g1D}-nZ8HjyYzi&mDrg`JGsM6;C jxZL8sw^JfaXS>?*^RZlYnSXW#&{zgfS3j3^P6*" style "gimp_ widget_class "*Chrom*Button*" style "button" widget_class "***" style "chrome_menu_item" -# We use this weird selector to target an offscreen entry as created -# by Chrome/Chromium to derive the style for its toolbar -widget_class "" style "standalone_entry" - # Eclipse/SWT widget "gtk-tooltips*" style "eclipse-tooltips" widget "*swt-toolbar-flat" style "null" @@ -2445,10 +2315,6 @@ widget "*swt-toolbar-flat" style "null" # Openoffice, Libreoffice class "GtkWindow" style "toplevel_hack" widget "*openoffice-toplevel*" style "ooo_stepper_hack" -widget "*openoffice-toplevel*GtkEntry" style "libreoffice_entry" -widget "*openoffice-toplevel*GtkSpinButton" style "libreoffice_entry" -widget "*libreoffice-toplevel*GtkEntry" style "libreoffice_entry" -widget "*libreoffice-toplevel*GtkSpinButton" style "libreoffice_entry" # Xfce widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view" diff --git a/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..ac880fb83e4d13d81403f017758420d13bb1c30b GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3-oX$H;yMQq09po*^6@9Je3(KLBz$3p^r= zfy%FgFr$;k>oc5!lIL8@MUQTpt6HXu`N0(?ST z^-b(81M)2c^Q;03?A#;l+#~HgBJ4aO?OlTGU4tB4gS;E|dp8{LZaC!Kc+jU|pKtvE z--d&MlkNpgc@+Ig_c_oUKTj9O5RLP1CmAv|DDWKN;|kJd+V=ndYW@XxWzWnqWXxER z`$C~1E%D}qWYs&aF;VTC)<+}?CG7vTs4Hk*mmp7obw+6Z>~ARwrTN>mAG5AsAvGi2 Sdd~x($qb&ZelF{r5}E++f?+}c literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png new file mode 100644 index 0000000000000000000000000000000000000000..359b39947cccd85eea3f280c3396791ea33a6e2e GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3-oX$H;yMQq09po*^6@9Je3(KLBz$3p^r= zfy%FgFr$;k>oc5!lIL8@MUQTpt6HXu_i1AIbU zgQh$Ro%Xn3$&-SmPYRblDO&cVY~}OvRnIF{J>PZy#qJ9)p1*kg_S4U|pMSpl{PX?i zpZ`GMKM>46>KXzx#MjfsF+}71+e;f68w@yHE;?WEFwl5ozlOQxi`c(!Q_Brf4~cA) z`ts$($`8wKywfRWboF&~&^zQGzvSu^{>Ht_6fc;qx*g-*zA_~J_U^r5$5oT>JPADo PG?>BD)z4*}Q$iB}5MX+n literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d6f19b7991591441b4e78f577a77ab4e21752520 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!VDzE)_nK|q?n7HJVQ7*IBq}me*oli7I;J! z1C?I~VMZs7*%d%R$r9IylHmNblJdl&REF~Ma=pyF?Be9af>gcyqV(DCY(S>!2Ka=y zs%jdkX`85nkg2+ksg8lQj-j=_iM^q@vk?$k0FjHiosXrxx21zG^H!DsphkO77sn8Z z%gGw02@QgcyqV(DCY(S-V4E zfBr;HZLS6Cwe@sy43P*=j(B;3fmvy@#Im`+`I++%N!I*RKA^~EsdCSmtxn}$d*TV_ tZ*N_oc5!lIL8@MUQTpt6HXu`t1AIbU zRW*&&wN2EuP1SWwHFYgC_06?(Ep!a5bquZbP3*1gy{+witR1|q9enIv0_|Ob99)A| z99d!x)b8c!;uxZF{_Q10rUnHbmV>4X6qywN*RSO__#&2P{Zw{Y>ykxn^A10rdVbZ3 zo-LXWEG-3Q*ZoqgcyqV(DCY(S=J1^9%x zp1=0&{I%y-Za%+q>-qJ&uWsCZ`QR}Sy?XxQ_4n^TzyJ984+Q=LfspzxZlErEPZ!4! ziSXo%;FJc&g*VW-$N& literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc index 122443c..4ebb209 100644 --- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc +++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc @@ -126,9 +126,9 @@ style "toolbar_button" { } style "toolbar_entry" { - xthickness = 6 - base[NORMAL] = "#414857" + base[NORMAL] = "#404552" + base[ACTIVE] = "#404552" base[INSENSITIVE] = "#39404d" text[NORMAL] = "#afb8c5" @@ -137,50 +137,30 @@ style "toolbar_entry" { image { function = SHADOW - detail = "entry" state = NORMAL - shadow = IN - file = "menubar-toolbar/toolbar-entry-border-bg-dark.png" - border = { 12, 12, 12, 12 } + detail = "entry" + file = "menubar-toolbar/entry-toolbar-dark.png" + border = {6, 6, 6, 6} stretch = TRUE } image { function = SHADOW + state = ACTIVE detail = "entry" + file = "menubar-toolbar/entry-active-toolbar-dark.png" + border = {6, 6, 6, 6} + stretch = TRUE + } + + image { + function = SHADOW state = INSENSITIVE - shadow = IN - file = "menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png" - border = { 12, 12, 12, 12 } - stretch = TRUE - } - - image { - function = SHADOW detail = "entry" - state = ACTIVE - file = "menubar-toolbar/toolbar-entry-border-active-bg-dark.png" - border = { 12, 12, 12, 12 } + file = "menubar-toolbar/entry-disabled-toolbar-dark.png" + border = {6, 6, 6, 6} stretch = TRUE } - - image { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - overlay_file = "assets/null.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - - image { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - overlay_file = "assets/null.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } } } diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc index c02626d..5a9f177 100644 --- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc +++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc @@ -71,10 +71,6 @@ style "menubar-text" { } style "toolbar_entry" { - xthickness = 6 - - base[NORMAL] = "#fdfdfd" - base[INSENSITIVE] = "#f4f5f6" text[NORMAL] = "#70788d" @@ -82,50 +78,30 @@ style "toolbar_entry" { image { function = SHADOW - detail = "entry" state = NORMAL - shadow = IN - file = "menubar-toolbar/toolbar-entry-border-bg.png" - border = { 12, 12, 12, 12 } + detail = "entry" + file = "menubar-toolbar/entry-toolbar.png" + border = {6, 6, 6, 6} stretch = TRUE } image { function = SHADOW + state = ACTIVE detail = "entry" + file = "menubar-toolbar/entry-active-toolbar.png" + border = {6, 6, 6, 6} + stretch = TRUE + } + + image { + function = SHADOW state = INSENSITIVE - shadow = IN - file = "menubar-toolbar/toolbar-entry-border-disabled-bg.png" - border = { 12, 12, 12, 12 } - stretch = TRUE - } - - image { - function = SHADOW detail = "entry" - state = ACTIVE - file = "menubar-toolbar/toolbar-entry-border-active-bg.png" - border = { 12, 12, 12, 12 } + file = "menubar-toolbar/entry-disabled-toolbar.png" + border = {6, 6, 6, 6} stretch = TRUE } - - image { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - overlay_file = "assets/null.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - - image { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - overlay_file = "assets/null.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } } } diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png deleted file mode 100644 index 4c358b30b04c02a76fdb5098f8d2691255fef8fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 409 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3HFsG`&3vq*#ibJVQ8upoSx*1IXtr@Q5r1 zs=p4xj7}P}D}aKMC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP20F7l7^K@|x z@#svxV!rYJdEM+23K;??4yb9IK5*j5AqUspH7zCvgyVB)#|}FTb@WrG%d6F<*)6XppbED@qeE!+gRA# zbfvatTv-&@4P;Cb`}_ZU`$5GmjqPD#Gu-_j{r>-+pZW6o@BNYyN1hsGqzZ0l2!FP| zykBC5D=VwikJ3GJmR$9zJE<)ZTT}4%fPPlQ1A$uy7Qc}QKBJs}>(93{Mrv-g!oUB= z7_sp4(HG)Gmu}R)3=BpFPgg&ebxsLQ0G%qU AaR2}S diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png deleted file mode 100644 index 427548ae280a7a309a056a086da6c326f995825b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)=sex^+Qb;YI0GfL3Q@=P7^G>WoCyjm&e9gB;`_2mMQk6(Q

RZ diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png deleted file mode 100644 index 716060adf49003ceae216cb77fef63325d9f0852..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3HFsG`&3vq*#ibJVQ8upoSx*1IXtr@Q5r1 zs=p4xj7}P}D}aKMC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2fQ-HC>EamT z(fRh8Vb);-iK8FWkIzq43O_61!Ng@DspT}?sXb#G-@m@ zx_neV>N9gP2fQ)_Z>EamT z(fRh;UN2@xk+z5L&&*7W-MnV5`9$g9gMI=By*>yr?Obhg^T%ecrU@4#B+V|C*7ddC zIGVRj;Mv}W&mzlzp4hj?^S#op+!k&I1rOna1_5uiMcf>}>pj}ry-()~YvruIQVDGPa0HJty8D4CpHCB>C-dm9_aDT4$rODV1th`njxg HN@xNAFM5); diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png deleted file mode 100644 index 8304a5d60765011811a49870954a1fc2eccd941f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3HFsG`&3vq*#ibJVQ8upoSx*1IXtr@Q5r1 zs=p4xj7}P}D}aKMC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2fQ;Se>EamT z(fRh8b>3kE0oRMGAI@09%X-r9&W`i{!YALDBpCQ-=LB9A+fbGVu?OZ9-7DBvb8U{0 z;o2#4GG|I0cGPtfJ*&C#*nuD48jJbZG8bQQ;^6*Va+FEx@hOXakN<4s{g5Rv$KJ8^ zca5{xNsITlmG&3i3-)r0`;}*#|6b$IT4&i;0qs^_>K8_pF?+3)Ryii%bc46+A-iC+ z+!Z7L`vI@NU6SsboEo{~eE6Eu6@f=L@pioYc9pGCO)28FfmFVdQ&MBb@09vJgvj6}9 diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png deleted file mode 100644 index 512d5bd92a7de8e991554ebd8d4d798d468a5934..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)h!3HFsG`&3vq*#ibJVQ8upoSx*1IXtr@Q5r1 zs=p4xj7}P}D}aKMC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2fQ;Se>EamT z(fRh8W8NVH0k?zlXT?%UV*BfeEDWFc4R3tz>9-e+6XXG$t$TzH#bAA0#a zZ)k@l=k+=k4LiSMnG0XL7YQW=D7rqs#5;p`%A9B^h4(Eh4(Xp->ats9w$4JJPZ&I1 L{an^LB{Ts5>dSoL From d9d17728899c2741f0fc4cad7626db395e41c9c9 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 30 May 2016 22:41:04 +0200 Subject: [PATCH 11/17] bump version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a77f31a..bd6b146 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT( [arc-theme], - [20160331], + [20160530], [https://github.com/horst3180/Arc-theme/issues], [arc-theme], [https://github.com/horst3180/Arc-theme], From 2b1a290469ad575432d51ba8107e878537b3178b Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 1 Jun 2016 13:12:26 +0200 Subject: [PATCH 12/17] fix hexchat input box (#558) --- common/gtk-2.0/apps.rc | 19 +++++++++++------ common/gtk-2.0/assets-dark.svg | 16 +++++++++++--- .../assets-dark/entry-border-active-bg.png | Bin 301 -> 312 bytes .../gtk-2.0/assets-dark/entry-border-bg.png | Bin 297 -> 308 bytes common/gtk-2.0/assets.svg | 20 +++++++++++++----- .../gtk-2.0/assets/entry-border-active-bg.png | Bin 303 -> 314 bytes common/gtk-2.0/assets/entry-border-bg.png | Bin 290 -> 303 bytes 7 files changed, 40 insertions(+), 15 deletions(-) diff --git a/common/gtk-2.0/apps.rc b/common/gtk-2.0/apps.rc index 2fcbdd5..ecabed7 100644 --- a/common/gtk-2.0/apps.rc +++ b/common/gtk-2.0/apps.rc @@ -27,29 +27,30 @@ widget_class "*ThunarTreeView*" style "dark-sidebar" widget_class "*ThunarWindow*." style "thunar-handle" # -# Mousepad +# Workaround for colored entries # - style "entry_border" { + xthickness = 7 + ythickness = 5 + engine "pixmap" { image { function = SHADOW - detail = "entry" state = NORMAL - shadow = IN + detail = "entry" file = "assets/entry-border-bg.png" - border = { 12, 12, 12, 12 } + border = {6, 6, 6, 6} stretch = TRUE } image { function = SHADOW - detail = "entry" state = ACTIVE + detail = "entry" file = "assets/entry-border-active-bg.png" - border = { 12, 12, 12, 12 } + border = {6, 6, 6, 6} stretch = TRUE } @@ -73,4 +74,8 @@ style "entry_border" { } } +# Mousepad search entry widget_class "*MousepadSearchBar*." style "entry_border" + +# Hexchat input box +class "SexySpellEntry" style:highest "entry_border" diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg index 83c6a16..20aeedd 100644 --- a/common/gtk-2.0/assets-dark.svg +++ b/common/gtk-2.0/assets-dark.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8284271" - inkscape:cx="32.121536" - inkscape:cy="224.28999" + inkscape:zoom="11.313708" + inkscape:cx="-24.583201" + inkscape:cy="377.40868" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -5621,6 +5621,11 @@ id="entry-border-bg" inkscape:label="#g9335" transform="translate(-1,31)"> + + w1Y{pGr-TCmrII^fq{Y7)59eQNXr1R6bCbqoZNM0_e8~2xe=Z&jv*T7-(Ip5 zYETeix#(E9Q1HU}zwci$Mii~CdD(I~$!Wr-t8GtNl;+-B`EZ+n;Q3YS_9~qD>Ym=Q zs_|EUyo`Ige%pz#k<#BW&0w3jQfkuR^JtmO*l;)sa{CqCH!YtgBo rytcqgj8n3=oINRfDb3{e-KVT4cCvkuarwI%XaR$#tDnm{r-UW|iw8Ay diff --git a/common/gtk-2.0/assets-dark/entry-border-bg.png b/common/gtk-2.0/assets-dark/entry-border-bg.png index 2cd6bf29c3b2e64267f443b0aa5fb326a6448375..3d4ae5a69b315346466c42cdd2b0f2c1417c6121 100644 GIT binary patch delta 150 zcmZ3%m#gA8gfamn^k-G($AXzh!BKPuq&B z!2ch+AK$(?Susj3L?2HV#}JM4ZzmZt zH5hOl;ae-psQvVR|5wJ=y9d`u3b)KY)ijI!PgV=7)s4dU9xs`_b}F?laH#w08oKn3 q$hA|9bE>zUJt_Q9dG_0xADK4Pv2^6$-g^gVK7*&LpUXO@geCxC + + id="rect9321-3-7" + transform="translate(-113,-345.63782)" /> + -S^&@u*3S3j3^P6)cTF*}3JLwin(NeQ>en8_HJYD@<);T3K0RX37F>C+; From 2f80d3ccf8171e12a26b8d329cb51c6b0db7f083 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 1 Jun 2016 20:00:36 +0200 Subject: [PATCH 13/17] fix switches in selected menuitems (fix #556) --- common/gtk-3.0/3.14/gtk-dark.css | 4 ++++ common/gtk-3.0/3.14/gtk-darker.css | 4 ++++ common/gtk-3.0/3.14/gtk-solid-dark.css | 4 ++++ common/gtk-3.0/3.14/gtk-solid-darker.css | 4 ++++ common/gtk-3.0/3.14/gtk-solid.css | 4 ++++ common/gtk-3.0/3.14/gtk.css | 4 ++++ common/gtk-3.0/3.14/sass/_common.scss | 1 + common/gtk-3.0/3.16/gtk-dark.css | 4 ++++ common/gtk-3.0/3.16/gtk-darker.css | 4 ++++ common/gtk-3.0/3.16/gtk-solid-dark.css | 4 ++++ common/gtk-3.0/3.16/gtk-solid-darker.css | 4 ++++ common/gtk-3.0/3.16/gtk-solid.css | 4 ++++ common/gtk-3.0/3.16/gtk.css | 4 ++++ common/gtk-3.0/3.16/sass/_common.scss | 1 + common/gtk-3.0/3.18/gtk-dark.css | 4 ++++ common/gtk-3.0/3.18/gtk-darker.css | 4 ++++ common/gtk-3.0/3.18/gtk-solid-dark.css | 4 ++++ common/gtk-3.0/3.18/gtk-solid-darker.css | 4 ++++ common/gtk-3.0/3.18/gtk-solid.css | 4 ++++ common/gtk-3.0/3.18/gtk.css | 4 ++++ common/gtk-3.0/3.18/sass/_common.scss | 1 + common/gtk-3.0/3.20/gtk-dark.css | 4 ++++ common/gtk-3.0/3.20/gtk-darker.css | 4 ++++ common/gtk-3.0/3.20/gtk-solid-dark.css | 4 ++++ common/gtk-3.0/3.20/gtk-solid-darker.css | 4 ++++ common/gtk-3.0/3.20/gtk-solid.css | 4 ++++ common/gtk-3.0/3.20/gtk.css | 4 ++++ common/gtk-3.0/3.20/sass/_common.scss | 1 + 28 files changed, 100 insertions(+) diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index 37c127c..fc91262 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -1564,6 +1564,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1575,6 +1576,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1586,6 +1588,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1597,6 +1600,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index e3d4b6d..d84b0db 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -1567,6 +1567,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1578,6 +1579,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1589,6 +1591,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1600,6 +1603,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index 3db7cb6..faa1525 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -1564,6 +1564,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1575,6 +1576,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1586,6 +1588,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1597,6 +1600,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index 4221587..7b57d43 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -1567,6 +1567,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1578,6 +1579,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1589,6 +1591,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1600,6 +1603,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index 4e1ec80..4f17543 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -1567,6 +1567,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1578,6 +1579,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1589,6 +1591,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1600,6 +1603,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index a95735a..c31f52e 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -1567,6 +1567,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1578,6 +1579,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1589,6 +1591,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1600,6 +1603,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 40da473..4834b6d 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -1888,6 +1888,7 @@ GtkSwitch { background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); } + .menu .menuitem:hover GtkSwitch.trough#{$k}, .list-row:selected GtkSwitch.trough#{$k}, GtkInfoBar GtkSwitch.trough#{$k} { background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index e73cfe1..1497a4e 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -1609,6 +1609,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1620,6 +1621,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1631,6 +1633,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1642,6 +1645,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index e3eb905..d721e4e 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -1612,6 +1612,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1623,6 +1624,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1634,6 +1636,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1645,6 +1648,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index 70dc688..42ef291 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -1609,6 +1609,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1620,6 +1621,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1631,6 +1633,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1642,6 +1645,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index 485c697..59309be 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -1612,6 +1612,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1623,6 +1624,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1634,6 +1636,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1645,6 +1648,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index f4dfbe9..86e2b70 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -1612,6 +1612,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1623,6 +1624,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1634,6 +1636,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1645,6 +1648,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index 7a96f3a..104e7c5 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -1612,6 +1612,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1623,6 +1624,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1634,6 +1636,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1645,6 +1648,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 85e00f3..9850650 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -1970,6 +1970,7 @@ GtkSwitch { background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); } + .menu .menuitem:hover GtkSwitch.trough#{$k}, .list-row:selected GtkSwitch.trough#{$k}, GtkInfoBar GtkSwitch.trough#{$k} { background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index f995938..76c5335 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -1679,6 +1679,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1690,6 +1691,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1701,6 +1703,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1712,6 +1715,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 9ced93b..fd52416 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -1682,6 +1682,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1693,6 +1694,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1704,6 +1706,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1715,6 +1718,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index 433364e..00b1933 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -1679,6 +1679,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1690,6 +1691,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1701,6 +1703,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1712,6 +1715,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index b03e798..b7457dd 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -1682,6 +1682,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1693,6 +1694,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1704,6 +1706,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1715,6 +1718,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 274f3f1..6cee8b6 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -1686,6 +1686,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1697,6 +1698,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1708,6 +1710,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1719,6 +1722,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index 4321388..bc208a6 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -1686,6 +1686,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1697,6 +1698,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1708,6 +1710,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1719,6 +1722,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 028aa41..a20f5d6 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -1916,6 +1916,7 @@ GtkSwitch { background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); } + .menu .menuitem:hover GtkSwitch.trough#{$k}, .list-row:selected GtkSwitch.trough#{$k}, GtkInfoBar GtkSwitch.trough#{$k} { background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index c37914f..98ea97e 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1854,6 +1854,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1865,6 +1866,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1876,6 +1878,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1887,6 +1890,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 14db475..f735403 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1853,6 +1853,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1864,6 +1865,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1875,6 +1877,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1886,6 +1889,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 8dac95e..4165e5b 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1854,6 +1854,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1865,6 +1866,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1876,6 +1878,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1887,6 +1890,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index d184701..dac6610 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1853,6 +1853,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1864,6 +1865,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1875,6 +1877,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1886,6 +1889,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index fe5a598..20305dc 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1857,6 +1857,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1868,6 +1869,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1879,6 +1881,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1890,6 +1893,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 1ebb175..bc24bb5 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1857,6 +1857,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1868,6 +1869,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1879,6 +1881,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1890,6 +1893,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index ed35b4c..4f36e35 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -1970,6 +1970,7 @@ switch { background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); } + menuitem:hover switch#{$k}, row:selected switch#{$k}, infobar switch#{$k} { background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); From 519718b36cfd395034ddf678466dcc24ae70a0bd Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 1 Jun 2016 20:02:32 +0200 Subject: [PATCH 14/17] use more specific selectors --- common/gtk-3.0/3.14/gtk-dark.css | 16 ++++++++-------- common/gtk-3.0/3.14/gtk-darker.css | 16 ++++++++-------- common/gtk-3.0/3.14/gtk-solid-dark.css | 16 ++++++++-------- common/gtk-3.0/3.14/gtk-solid-darker.css | 16 ++++++++-------- common/gtk-3.0/3.14/gtk-solid.css | 16 ++++++++-------- common/gtk-3.0/3.14/gtk.css | 16 ++++++++-------- common/gtk-3.0/3.14/sass/_common.scss | 4 ++-- common/gtk-3.0/3.16/gtk-dark.css | 16 ++++++++-------- common/gtk-3.0/3.16/gtk-darker.css | 16 ++++++++-------- common/gtk-3.0/3.16/gtk-solid-dark.css | 16 ++++++++-------- common/gtk-3.0/3.16/gtk-solid-darker.css | 16 ++++++++-------- common/gtk-3.0/3.16/gtk-solid.css | 16 ++++++++-------- common/gtk-3.0/3.16/gtk.css | 16 ++++++++-------- common/gtk-3.0/3.16/sass/_common.scss | 4 ++-- common/gtk-3.0/3.18/gtk-dark.css | 16 ++++++++-------- common/gtk-3.0/3.18/gtk-darker.css | 16 ++++++++-------- common/gtk-3.0/3.18/gtk-solid-dark.css | 16 ++++++++-------- common/gtk-3.0/3.18/gtk-solid-darker.css | 16 ++++++++-------- common/gtk-3.0/3.18/gtk-solid.css | 16 ++++++++-------- common/gtk-3.0/3.18/gtk.css | 16 ++++++++-------- common/gtk-3.0/3.18/sass/_common.scss | 4 ++-- 21 files changed, 150 insertions(+), 150 deletions(-) diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index fc91262..729f91e 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -1815,22 +1815,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1851,19 +1851,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index d84b0db..761b85d 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -1818,22 +1818,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1854,19 +1854,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index faa1525..090e694 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -1815,22 +1815,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1851,19 +1851,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index 7b57d43..c322fc4 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -1818,22 +1818,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1854,19 +1854,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index 4f17543..f467693 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -1818,22 +1818,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1854,19 +1854,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index c31f52e..04e5f99 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -1818,22 +1818,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1854,19 +1854,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 4834b6d..a70c93f 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -2007,7 +2007,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } //selected list-row and infobar sliders - .menuitem:hover &, + .menu .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, $selected_fg_color); @@ -2056,7 +2056,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { &:insensitive { } } // troughs in selected list-rows and infobars - .menuitem:hover &, + .menu .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, transparentize(black, 0.8)); diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index 1497a4e..3ee17e4 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -1860,22 +1860,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1896,19 +1896,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index d721e4e..9c7548e 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -1863,22 +1863,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1899,19 +1899,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index 42ef291..1038d04 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -1860,22 +1860,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1896,19 +1896,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index 59309be..fe6c2f0 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -1863,22 +1863,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1899,19 +1899,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index 86e2b70..b62fdf9 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -1863,22 +1863,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1899,19 +1899,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index 104e7c5..ca6624b 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -1863,22 +1863,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1899,19 +1899,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 9850650..e462381 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -2089,7 +2089,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } //selected list-row and infobar sliders - .menuitem:hover &, + .menu .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, $selected_fg_color); @@ -2138,7 +2138,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { &:insensitive { } } // troughs in selected list-rows and infobars - .menuitem:hover &, + .menu .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, transparentize(black, 0.8)); diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 76c5335..4f073b4 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -1929,22 +1929,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1965,19 +1965,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index fd52416..fd811f1 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -1932,22 +1932,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1968,19 +1968,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index 00b1933..f3415c5 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -1929,22 +1929,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1965,19 +1965,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index b7457dd..8874150 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -1932,22 +1932,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1968,19 +1968,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 6cee8b6..6b619be 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -1936,22 +1936,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1972,19 +1972,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index bc208a6..ad8f3e8 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -1936,22 +1936,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } - .menuitem:hover .scale.slider, + .menu .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } - .menuitem:hover .scale.slider:hover, + .menu .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } - .menuitem:hover .scale.slider:active, + .menu .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } - .menuitem:hover .scale.slider:insensitive, + .menu .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1972,19 +1972,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } - .menuitem:hover .scale.trough, + .menu .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } - .menuitem:hover .scale.trough.highlight, + .menu .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } - .menuitem:hover .scale.trough.highlight:insensitive, + .menu .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } - .menuitem:hover .scale.trough:insensitive, + .menu .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index a20f5d6..83aff34 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -2036,7 +2036,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } //selected list-row and infobar sliders - .menuitem:hover &, + .menu .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, $selected_fg_color); @@ -2085,7 +2085,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { &:insensitive { } } // troughs in selected list-rows and infobars - .menuitem:hover &, + .menu .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, transparentize(black, 0.8)); From 226098a06b646981022f0e260fd4d3ca64ff5616 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 2 Jun 2016 12:33:43 +0200 Subject: [PATCH 15/17] gtk2: more entry fixes --- common/gtk-2.0/apps.rc | 22 ++++++++------- common/gtk-2.0/assets-dark.svg | 24 ++++++++++++++-- .../assets-dark/entry-background-disabled.png | Bin 0 -> 154 bytes .../gtk-2.0/assets-dark/entry-background.png | Bin 0 -> 154 bytes common/gtk-2.0/assets.svg | 26 ++++++++++++++++-- common/gtk-2.0/assets.txt | 2 ++ .../assets/entry-background-disabled.png | Bin 0 -> 155 bytes common/gtk-2.0/assets/entry-background.png | Bin 0 -> 155 bytes common/gtk-2.0/main.rc | 24 +++++++++++++--- .../menubar-toolbar/menubar-toolbar-dark.rc | 20 ++++++++++++++ .../menubar-toolbar/menubar-toolbar.rc | 20 ++++++++++++++ 11 files changed, 119 insertions(+), 19 deletions(-) create mode 100644 common/gtk-2.0/assets-dark/entry-background-disabled.png create mode 100644 common/gtk-2.0/assets-dark/entry-background.png create mode 100644 common/gtk-2.0/assets/entry-background-disabled.png create mode 100644 common/gtk-2.0/assets/entry-background.png diff --git a/common/gtk-2.0/apps.rc b/common/gtk-2.0/apps.rc index ecabed7..fc010cf 100644 --- a/common/gtk-2.0/apps.rc +++ b/common/gtk-2.0/apps.rc @@ -56,20 +56,22 @@ style "entry_border" { image { function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - overlay_file = "assets/null.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + state = ACTIVE + detail = "entry_bg" + file = "assets/null.png" } image { function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - overlay_file = "assets/null.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + state = INSENSITIVE + detail = "entry_bg" + file = "assets/null.png" + } + + image { + function = FLAT_BOX + detail = "entry_bg" + file = "assets/null.png" } } } diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg index 20aeedd..41c9339 100644 --- a/common/gtk-2.0/assets-dark.svg +++ b/common/gtk-2.0/assets-dark.svg @@ -566,8 +566,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.313708" - inkscape:cx="-24.583201" - inkscape:cy="377.40868" + inkscape:cx="84.915241" + inkscape:cy="372.56435" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -5672,5 +5672,25 @@ id="rect7903-7-3-7-7" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + diff --git a/common/gtk-2.0/assets-dark/entry-background-disabled.png b/common/gtk-2.0/assets-dark/entry-background-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..06e559837611390610599d81c6b861800812a10c GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol;0U|59*B=E^EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4USZ1n3jSz!(Gvk+Ti=K%2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4fWw|7v5(ZCKKbLh*2~7ZHUMH&n literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg index e8b23d8..cf942b4 100644 --- a/common/gtk-2.0/assets.svg +++ b/common/gtk-2.0/assets.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="-25.898322" - inkscape:cy="369.44312" + inkscape:zoom="7.9999996" + inkscape:cx="68.971701" + inkscape:cy="353.39299" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -5640,5 +5640,25 @@ id="rect7903-7-3-7-7" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt index 8ebc233..853a182 100644 --- a/common/gtk-2.0/assets.txt +++ b/common/gtk-2.0/assets.txt @@ -42,6 +42,8 @@ menu-radio-checked-insensitive menu-radio-unchecked menu-radio-unchecked-selected menu-radio-unchecked-insensitive +entry-background +entry-background-disabled entry-border-bg entry-border-active-bg entry-bg diff --git a/common/gtk-2.0/assets/entry-background-disabled.png b/common/gtk-2.0/assets/entry-background-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..6b2c6b9918dd18e04e20a072736f1f25bf718059 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol;0U|59*B=E^EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<253JebVDz#hON7Ad5)52%L0)78&qol`;+0O*A(mH+?% literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/assets/entry-background.png b/common/gtk-2.0/assets/entry-background.png new file mode 100644 index 0000000000000000000000000000000000000000..5914b3f25ea6945a7bb6a75f6a8bee6f27d30cf7 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol;0U|59*B=E^EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<253JeUlWxX7Y#_pNOaPz{5ptDnm{r-UW|5Lhgt literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/main.rc b/common/gtk-2.0/main.rc index 1d22cbb..24b5ca7 100644 --- a/common/gtk-2.0/main.rc +++ b/common/gtk-2.0/main.rc @@ -980,10 +980,6 @@ style "entry" { xthickness = 6 ythickness = 4 - base[NORMAL] = @base_color - base[ACTIVE] = @base_color - base[INSENSITIVE] = @insensitive_bg_color - engine "pixmap" { image { @@ -1012,6 +1008,26 @@ style "entry" { border = {6, 6, 6, 6} stretch = TRUE } + + image { + function = FLAT_BOX + state = ACTIVE + detail = "entry_bg" + file = "assets/entry-background.png" + } + + image { + function = FLAT_BOX + state = INSENSITIVE + detail = "entry_bg" + file = "assets/entry-background-disabled.png" + } + + image { + function = FLAT_BOX + detail = "entry_bg" + file = "assets/entry-background.png" + } } } diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc index 4ebb209..baf7f44 100644 --- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc +++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc @@ -161,6 +161,26 @@ style "toolbar_entry" { border = {6, 6, 6, 6} stretch = TRUE } + + image { + function = FLAT_BOX + state = ACTIVE + detail = "entry_bg" + file = "assets/null.png" + } + + image { + function = FLAT_BOX + state = INSENSITIVE + detail = "entry_bg" + file = "assets/null.png" + } + + image { + function = FLAT_BOX + detail = "entry_bg" + file = "assets/null.png" + } } } diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc index 5a9f177..4cb89eb 100644 --- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc +++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc @@ -102,6 +102,26 @@ style "toolbar_entry" { border = {6, 6, 6, 6} stretch = TRUE } + + image { + function = FLAT_BOX + state = ACTIVE + detail = "entry_bg" + file = "assets/null.png" + } + + image { + function = FLAT_BOX + state = INSENSITIVE + detail = "entry_bg" + file = "assets/null.png" + } + + image { + function = FLAT_BOX + detail = "entry_bg" + file = "assets/null.png" + } } } From 76d343ff8b258854a3865f313aee168ec2caef55 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 3 Jun 2016 14:43:29 +0200 Subject: [PATCH 16/17] fix unity window decorations (#566) --- common/gtk-3.0/3.14/gtk-dark.css | 1 + common/gtk-3.0/3.14/gtk-darker.css | 1 + common/gtk-3.0/3.14/gtk-solid-dark.css | 1 + common/gtk-3.0/3.14/gtk-solid-darker.css | 1 + common/gtk-3.0/3.14/gtk-solid.css | 1 + common/gtk-3.0/3.14/gtk.css | 1 + common/gtk-3.0/3.14/sass/_unity.scss | 1 + common/gtk-3.0/3.16/gtk-dark.css | 1 + common/gtk-3.0/3.16/gtk-darker.css | 1 + common/gtk-3.0/3.16/gtk-solid-dark.css | 1 + common/gtk-3.0/3.16/gtk-solid-darker.css | 1 + common/gtk-3.0/3.16/gtk-solid.css | 1 + common/gtk-3.0/3.16/gtk.css | 1 + common/gtk-3.0/3.16/sass/_unity.scss | 1 + common/gtk-3.0/3.18/gtk-dark.css | 1 + common/gtk-3.0/3.18/gtk-darker.css | 1 + common/gtk-3.0/3.18/gtk-solid-dark.css | 1 + common/gtk-3.0/3.18/gtk-solid-darker.css | 1 + common/gtk-3.0/3.18/gtk-solid.css | 1 + common/gtk-3.0/3.18/gtk.css | 1 + common/gtk-3.0/3.18/sass/_unity.scss | 1 + common/gtk-3.0/3.20/gtk-dark.css | 1 + common/gtk-3.0/3.20/gtk-darker.css | 1 + common/gtk-3.0/3.20/gtk-solid-dark.css | 1 + common/gtk-3.0/3.20/gtk-solid-darker.css | 1 + common/gtk-3.0/3.20/gtk-solid.css | 1 + common/gtk-3.0/3.20/gtk.css | 1 + common/gtk-3.0/3.20/sass/_unity.scss | 1 + 28 files changed, 28 insertions(+) diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index 729f91e..c62a38f 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -3254,6 +3254,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index 761b85d..e7633fc 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -3257,6 +3257,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index 090e694..4c7651e 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -3254,6 +3254,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index c322fc4..1495cc5 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -3257,6 +3257,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index f467693..a47ffa6 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -3257,6 +3257,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(82, 93, 118, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index 04e5f99..f2be733 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -3257,6 +3257,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(82, 93, 118, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.14/sass/_unity.scss b/common/gtk-3.0/3.14/sass/_unity.scss index aaedf92..2441035 100644 --- a/common/gtk-3.0/3.14/sass/_unity.scss +++ b/common/gtk-3.0/3.14/sass/_unity.scss @@ -36,6 +36,7 @@ UnityDecoration { } &.left, &.right, &.bottom, &.left:backdrop, &.right:backdrop, &.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), transparentize(black, 0.9))); } } diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index 3ee17e4..1f5cbed 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -3131,6 +3131,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index 9c7548e..a94ef55 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -3134,6 +3134,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index 1038d04..bb3978a 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -3131,6 +3131,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index fe6c2f0..f342c13 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -3134,6 +3134,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index b62fdf9..9826ddc 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -3134,6 +3134,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(82, 93, 118, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index ca6624b..9a51506 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -3134,6 +3134,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(82, 93, 118, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.16/sass/_unity.scss b/common/gtk-3.0/3.16/sass/_unity.scss index aaedf92..2441035 100644 --- a/common/gtk-3.0/3.16/sass/_unity.scss +++ b/common/gtk-3.0/3.16/sass/_unity.scss @@ -36,6 +36,7 @@ UnityDecoration { } &.left, &.right, &.bottom, &.left:backdrop, &.right:backdrop, &.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), transparentize(black, 0.9))); } } diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 4f073b4..a6d91ac 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -3283,6 +3283,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index fd811f1..aeba0b1 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -3286,6 +3286,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index f3415c5..b9f9f39 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -3283,6 +3283,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index 8874150..99f247a 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -3286,6 +3286,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 6b619be..1eacc5f 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -3290,6 +3290,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(82, 93, 118, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index ad8f3e8..5aff150 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -3290,6 +3290,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(82, 93, 118, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.18/sass/_unity.scss b/common/gtk-3.0/3.18/sass/_unity.scss index aaedf92..2441035 100644 --- a/common/gtk-3.0/3.18/sass/_unity.scss +++ b/common/gtk-3.0/3.18/sass/_unity.scss @@ -36,6 +36,7 @@ UnityDecoration { } &.left, &.right, &.bottom, &.left:backdrop, &.right:backdrop, &.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), transparentize(black, 0.9))); } } diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 98ea97e..1f0e767 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -3593,6 +3593,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index f735403..aeb90a7 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -3591,6 +3591,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 4165e5b..c81bf0a 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -3593,6 +3593,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index dac6610..c935724 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -3591,6 +3591,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 20305dc..e82e4bc 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -3595,6 +3595,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(82, 93, 118, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index bc24bb5..ef72998 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -3595,6 +3595,7 @@ UnityDecoration { border-bottom-width: 0; color: rgba(82, 93, 118, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } UnityPanelWidget, diff --git a/common/gtk-3.0/3.20/sass/_unity.scss b/common/gtk-3.0/3.20/sass/_unity.scss index 87866fc..f83e73c 100644 --- a/common/gtk-3.0/3.20/sass/_unity.scss +++ b/common/gtk-3.0/3.20/sass/_unity.scss @@ -36,6 +36,7 @@ UnityDecoration { } &.left, &.right, &.bottom, &.left:backdrop, &.right:backdrop, &.bottom:backdrop { + background-color: transparent; background-image: linear-gradient(to bottom, if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), transparentize(black, 0.9))); } } From 1de4ef7977f075e2ce0c75b26f45f55cdf77c881 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 3 Jun 2016 23:55:24 +0200 Subject: [PATCH 17/17] gnome-shell: remove menu separator margins --- common/gnome-shell/3.14/gnome-shell-dark.css | 2 +- common/gnome-shell/3.14/gnome-shell.css | 2 +- common/gnome-shell/3.14/sass/_common.scss | 2 +- common/gnome-shell/3.16/gnome-shell-dark.css | 2 +- common/gnome-shell/3.16/gnome-shell.css | 2 +- common/gnome-shell/3.16/sass/_common.scss | 2 +- common/gnome-shell/3.18/gnome-shell-dark.css | 2 +- common/gnome-shell/3.18/gnome-shell.css | 2 +- common/gnome-shell/3.18/sass/_common.scss | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/gnome-shell/3.14/gnome-shell-dark.css b/common/gnome-shell/3.14/gnome-shell-dark.css index dc8fddf..b7ca459 100644 --- a/common/gnome-shell/3.14/gnome-shell-dark.css +++ b/common/gnome-shell/3.14/gnome-shell-dark.css @@ -517,7 +517,7 @@ StScrollBar { .popup-separator-menu-item { -gradient-height: 0px; height: 2px; - margin: 10px 0px; + margin: 0; background-color: transparent; background-gradient-direction: none !important; border: none; diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 65dfd22..9a04257 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -517,7 +517,7 @@ StScrollBar { .popup-separator-menu-item { -gradient-height: 0px; height: 2px; - margin: 10px 0px; + margin: 0; background-color: transparent; background-gradient-direction: none !important; border: none; diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index b5bdcf2..671c993 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -635,7 +635,7 @@ StScrollBar { -gradient-height: 0px; //-margin-horizontal: 24px; height: 2px; //not really the whole box - margin: 10px 0px; + margin: 0; background-color: transparent; background-gradient-direction: none !important; border: none; diff --git a/common/gnome-shell/3.16/gnome-shell-dark.css b/common/gnome-shell/3.16/gnome-shell-dark.css index 335ba6b..2ef2e78 100644 --- a/common/gnome-shell/3.16/gnome-shell-dark.css +++ b/common/gnome-shell/3.16/gnome-shell-dark.css @@ -466,7 +466,7 @@ StScrollBar { .popup-separator-menu-item { height: 2px; - margin: 10px 0px; + margin: 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index 5c48616..3850dd4 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -466,7 +466,7 @@ StScrollBar { .popup-separator-menu-item { height: 2px; - margin: 10px 0px; + margin: 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 6d8af82..35720b7 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -592,7 +592,7 @@ StScrollBar { .popup-separator-menu-item { //-margin-horizontal: 24px; height: 2px; //not really the whole box - margin: 10px 0px; + margin: 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css index 62c88f5..ac310dd 100644 --- a/common/gnome-shell/3.18/gnome-shell-dark.css +++ b/common/gnome-shell/3.18/gnome-shell-dark.css @@ -495,7 +495,7 @@ StScrollBar { .popup-separator-menu-item { height: 2px; - margin: 10px 0; + margin: 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css index bf1cfb4..b83026b 100644 --- a/common/gnome-shell/3.18/gnome-shell.css +++ b/common/gnome-shell/3.18/gnome-shell.css @@ -495,7 +495,7 @@ StScrollBar { .popup-separator-menu-item { height: 2px; - margin: 10px 0; + margin: 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss index 1fdf697..3033f52 100644 --- a/common/gnome-shell/3.18/sass/_common.scss +++ b/common/gnome-shell/3.18/sass/_common.scss @@ -659,7 +659,7 @@ StScrollBar { .popup-separator-menu-item { //-margin-horizontal: 24px; height: 2px; //not really the whole box - margin: 10px 0; + margin: 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1;