[gnome-shell] theme: Bring fallback app-menu style closer to GTK+
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] theme: Bring fallback app-menu style closer to GTK+
- Date: Tue, 27 May 2014 17:51:56 +0000 (UTC)
commit a72a24ebff603bc4746cde50f7593fc85d786298
Author: Florian Müllner <fmuellner gnome org>
Date: Sun May 25 16:46:09 2014 +0200
theme: Bring fallback app-menu style closer to GTK+
The fallback app-menu in GTK+'s client side decorations obviously
uses the GTK+ theme rather than the shell one; update the style
of our own fallback app-menu to resemble that style.
https://bugzilla.gnome.org/show_bug.cgi?id=730752
data/theme/gnome-shell.css | 74 ++++++++++++++++++++++++++++++++++++++++++++
js/ui/windowMenu.js | 3 ++
2 files changed, 77 insertions(+), 0 deletions(-)
---
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index df2e52d..64f2d8f 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -153,6 +153,21 @@ StScrollBar StButton#vhandle:active {
-arrow-rise: 11px;
}
+.popup-menu-boxpointer.fallback-app-menu {
+ -arrow-border-radius: 4px;
+ -arrow-background-color: #ededed;
+ -arrow-border-width: 1px;
+ -arrow-border-color: #a6a6a6;
+ -arrow-base: 24px;
+ -arrow-rise: 11px;
+}
+
+.popup-menu-boxpointer.fallback-app-menu.dark {
+ -arrow-background-color: #3f4747;
+ -arrow-border-color: #282b2b;
+}
+
+
.popup-menu {
min-width: 200px;
}
@@ -166,6 +181,15 @@ StScrollBar StButton#vhandle:active {
background-color: #333333;
}
+.fallback-app-menu .popup-submenu-menu-item:open {
+ background-color: #888888;
+ color: white;
+}
+
+.fallback-app-menu.dark .popup-submenu-menu-item:open {
+ background-color: #333333;
+}
+
.popup-sub-menu {
background-gradient-start: rgba(80,80,80,0.3);
background-gradient-end: rgba(80,80,80,0.4);
@@ -173,6 +197,20 @@ StScrollBar StButton#vhandle:active {
box-shadow: inset 0px 2px 4px rgba(0,0,0,0.9);
}
+.fallback-app-menu .popup-sub-menu {
+ background-gradient-start: #dddddd;
+ background-gradient-end: #dfdfdf;
+ background-gradient-direction: vertical;
+ box-shadow: inset 0px 2px 4px rgba(0,0,0,0.4);
+}
+
+.fallback-app-menu.dark .popup-sub-menu {
+ background-gradient-start: #474747;
+ background-gradient-end: #4b4b4b;
+ background-gradient-direction: vertical;
+ box-shadow: inset 0px 2px 4px rgba(0,0,0,0.9);
+}
+
.popup-sub-menu:scrolled .popup-menu-item:ltr {
padding-right: 0em;
}
@@ -221,6 +259,31 @@ StScrollBar StButton#vhandle:active {
color: #9f9f9f;
}
+.fallback-app-menu .popup-menu-item {
+ color: #43484a;
+}
+
+.fallback-app-menu .popup-menu-item:active {
+ color: white;
+ background-color: #4689cd;
+}
+
+.fallback-app-menu .popup-menu-item:insensitive {
+ color: gray;
+}
+
+.fallback-app-menu.dark .popup-menu-item {
+ color: white;
+}
+
+.fallback-app-menu.dark .popup-menu-item:active {
+ background-color: #445f7d;
+}
+
+.fallback-app-menu.dark .popup-menu-item:insensitive {
+ color: #9f9f9f;
+}
+
.popup-separator-menu-item {
-gradient-height: 1px;
-gradient-start: rgba(255,255,255,0.0);
@@ -230,6 +293,17 @@ StScrollBar StButton#vhandle:active {
padding: 8px 0px;
}
+.fallback-app-menu .popup-separator-menu-item {
+ -gradient-start: #a0a2a3;
+ -gradient-end: #a0a2a3;
+ -margin-horizontal: 0;
+}
+
+.fallback-app-menu.dark .popup-separator-menu-item {
+ -gradient-start: #818584;
+ -gradient-end: #818584;
+}
+
.popup-status-menu-item {
font-weight: normal;
color: #999;
diff --git a/js/ui/windowMenu.js b/js/ui/windowMenu.js
index c6dc729..b1f8073 100644
--- a/js/ui/windowMenu.js
+++ b/js/ui/windowMenu.js
@@ -133,6 +133,9 @@ const AppMenu = new Lang.Class({
this.parent(Main.layoutManager.dummyCursor, app.menu, app.action_group);
this.actor.add_style_class_name('fallback-app-menu');
+ let variant = window.get_gtk_theme_variant();
+ if (variant)
+ this.actor.add_style_class_name(variant);
Main.layoutManager.uiGroup.add_actor(this.actor);
this.actor.hide();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]