From ca76d0e2e55cb9a6b69a29c19225c22bb50c6f96 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Sun, 29 May 2016 19:22:18 +0200
Subject: use accent color for menu highlight (fix #135)
---
.../3.18/common-assets/menu/menu-hover.svg | 84 ++++++++
.../common-assets/switch/switch-off-selected.svg | 201 +++++++++++++++++++
.../common-assets/switch/switch-on-selected.svg | 220 +++++++++++++++++++++
.../3.18/dark-assets/menu/menu-hover.svg | 97 ---------
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 ++-
8 files changed, 548 insertions(+), 217 deletions(-)
create mode 100644 common/gnome-shell/3.18/common-assets/menu/menu-hover.svg
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/dark-assets/menu/menu-hover.svg
delete mode 100644 common/gnome-shell/3.18/light-assets/menu/menu-hover.svg
(limited to 'common/gnome-shell/3.18')
diff --git a/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg b/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg
new file mode 100644
index 0000000..6ae13ca
--- /dev/null
+++ b/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg
@@ -0,0 +1,84 @@
+
+
+
+
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 @@
+
+
+
+
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 @@
+
+
+
+
diff --git a/common/gnome-shell/3.18/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.18/dark-assets/menu/menu-hover.svg
deleted file mode 100644
index a023a8e..0000000
--- a/common/gnome-shell/3.18/dark-assets/menu/menu-hover.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
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 @@
-
-
-
-
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
--
cgit v1.2.3