[gtk+] Adwaita: Update menu styling
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: Update menu styling
- Date: Tue, 3 Nov 2015 02:35:00 +0000 (UTC)
commit f8c3e48bd21de865c38abd56ba503f7d47378b98
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Nov 2 20:47:04 2015 -0500
Adwaita: Update menu styling
Support the element names introduced in the previous commit.
gtk/theme/Adwaita/_common.scss | 3 +-
gtk/theme/Adwaita/gtk-contained-dark.css | 36 ++++++++++++++++++++----------
gtk/theme/Adwaita/gtk-contained.css | 36 ++++++++++++++++++++----------
3 files changed, 50 insertions(+), 25 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index dc551c5..876553b 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1466,6 +1466,7 @@ treeview.view {
}
}
+menu,
.menu {
margin: 4px;
padding: 0px;
@@ -1491,7 +1492,7 @@ treeview.view {
&.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
&.arrow:dir(rtl) {-gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl'); }
}
- & button { // overlow buttons
+ & arrow { // overlow buttons
@extend %undecorated_button;
border-style: none;
border-radius: 0;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 0c6950d..fd1a330 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1145,9 +1145,8 @@ modelbutton.flat,
.menuitem.button.flat:backdrop,
.menuitem.button.flat:backdrop:hover, button:link, headerbar button.titlebutton:link,
.titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
-.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked,
button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop,
button:visited:backdrop, .menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton,
-.menu .titlebar button.titlebutton,
-.titlebar .menu button.titlebutton, notebook tab button, notebook tab headerbar button.titlebutton,
headerbar notebook tab button.titlebutton,
+.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked,
button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop,
button:visited:backdrop, menu arrow,
+.menu arrow, notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab
button.titlebutton,
notebook tab .titlebar button.titlebutton,
.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification
.sidebar-button.button, .app-notification headerbar button.titlebutton, headerbar .app-notification
button.titlebutton,
.app-notification .titlebar button.titlebutton,
@@ -1989,42 +1988,55 @@ treeview.view header .titlebar button.titlebutton,
color: #949796;
box-shadow: none; }
+menu,
.menu {
margin: 4px;
padding: 0px;
background-color: #292929;
border: 1px solid #1c1f1f; }
- .csd .menu {
+ .csd menu, .csd
+ .menu {
border: none; }
+ menu .menuitem,
.menu .menuitem {
text-shadow: none;
padding: 4px; }
+ menu .menuitem:hover,
.menu .menuitem:hover {
color: #ffffff;
background-color: #215d9c; }
+ menu .menuitem:insensitive,
.menu .menuitem:insensitive {
color: #949796; }
+ menu .menuitem:insensitive:backdrop,
.menu .menuitem:insensitive:backdrop {
color: #5d6767; }
- .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
+ menu .menuitem:backdrop, menu .menuitem:backdrop:hover,
+ .menu .menuitem:backdrop,
+ .menu .menuitem:backdrop:hover {
color: #949796;
background-color: #2c2c2c; }
+ menu .menuitem.arrow,
.menu .menuitem.arrow {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+ menu .menuitem.arrow:dir(rtl),
.menu .menuitem.arrow:dir(rtl) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
- .menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton,
- .menu .titlebar button.titlebutton,
- .titlebar .menu button.titlebutton {
+ menu arrow,
+ .menu arrow {
border-style: none;
border-radius: 0; }
- .menu button.top {
+ menu arrow.top,
+ .menu arrow.top {
border-bottom: 1px solid #3d3d3d; }
- .menu button.bottom {
+ menu arrow.bottom,
+ .menu arrow.bottom {
border-top: 1px solid #3d3d3d; }
- .menu button:hover {
+ menu arrow:hover,
+ .menu arrow:hover {
background-color: #3d3d3d; }
- .menu button:insensitive {
+ menu arrow:insensitive,
+ .menu arrow:insensitive {
color: transparent;
background-color: transparent;
border-color: transparent; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 66235b5..d2b67dc 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1145,9 +1145,8 @@ modelbutton.flat,
.menuitem.button.flat:backdrop,
.menuitem.button.flat:backdrop:hover, button:link, headerbar button.titlebutton:link,
.titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
-.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked,
button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop,
button:visited:backdrop, .menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton,
-.menu .titlebar button.titlebutton,
-.titlebar .menu button.titlebutton, notebook tab button, notebook tab headerbar button.titlebutton,
headerbar notebook tab button.titlebutton,
+.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked,
button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop,
button:visited:backdrop, menu arrow,
+.menu arrow, notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab
button.titlebutton,
notebook tab .titlebar button.titlebutton,
.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification
.sidebar-button.button, .app-notification headerbar button.titlebutton, headerbar .app-notification
button.titlebutton,
.app-notification .titlebar button.titlebutton,
@@ -1995,42 +1994,55 @@ treeview.view header .titlebar button.titlebutton,
color: #8e9192;
box-shadow: none; }
+menu,
.menu {
margin: 4px;
padding: 0px;
background-color: #ffffff;
border: 1px solid #a1a1a1; }
- .csd .menu {
+ .csd menu, .csd
+ .menu {
border: none; }
+ menu .menuitem,
.menu .menuitem {
text-shadow: none;
padding: 4px; }
+ menu .menuitem:hover,
.menu .menuitem:hover {
color: #ffffff;
background-color: #4a90d9; }
+ menu .menuitem:insensitive,
.menu .menuitem:insensitive {
color: #8e9192; }
+ menu .menuitem:insensitive:backdrop,
.menu .menuitem:insensitive:backdrop {
color: #c7c7c7; }
- .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
+ menu .menuitem:backdrop, menu .menuitem:backdrop:hover,
+ .menu .menuitem:backdrop,
+ .menu .menuitem:backdrop:hover {
color: #8e9192;
background-color: white; }
+ menu .menuitem.arrow,
.menu .menuitem.arrow {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+ menu .menuitem.arrow:dir(rtl),
.menu .menuitem.arrow:dir(rtl) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
- .menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton,
- .menu .titlebar button.titlebutton,
- .titlebar .menu button.titlebutton {
+ menu arrow,
+ .menu arrow {
border-style: none;
border-radius: 0; }
- .menu button.top {
+ menu arrow.top,
+ .menu arrow.top {
border-bottom: 1px solid #eaebeb; }
- .menu button.bottom {
+ menu arrow.bottom,
+ .menu arrow.bottom {
border-top: 1px solid #eaebeb; }
- .menu button:hover {
+ menu arrow:hover,
+ .menu arrow:hover {
background-color: #eaebeb; }
- .menu button:insensitive {
+ menu arrow:insensitive,
+ .menu arrow:insensitive {
color: transparent;
background-color: transparent;
border-color: transparent; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]