[gtk+/gtk-3-20] Adwaita: ensure menuitem labels are not overridden
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-20] Adwaita: ensure menuitem labels are not overridden
- Date: Tue, 31 May 2016 19:02:45 +0000 (UTC)
commit b1a59daa71c8426f17e7e9999afecfbca0de93c9
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Tue May 31 20:58:35 2016 +0200
Adwaita: ensure menuitem labels are not overridden
see https://bugzilla.gnome.org/show_bug.cgi?id=767058
gtk/theme/Adwaita/_common.scss | 7 +++-
gtk/theme/Adwaita/gtk-contained-dark.css | 58 +++++++++++++++++++++---------
gtk/theme/Adwaita/gtk-contained.css | 58 +++++++++++++++++++++---------
3 files changed, 88 insertions(+), 35 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 120d983..9b54a37 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1825,7 +1825,8 @@ menubar,
}
menu,
-.menu {
+.menu,
+.context-menu {
margin: 4px;
padding: 2px 0px;
background-color: $menu_color;
@@ -1872,6 +1873,10 @@ menu,
margin-right: 10px;
}
}
+
+ // avoids labels color being overridden, see
+ // https://bugzilla.gnome.org/show_bug.cgi?id=767058
+ label { &:dir(rtl), &:dir(ltr) { color: inherit; }}
}
// overflow arrows
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 152432a..979d791 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2120,52 +2120,71 @@ menubar,
box-shadow: none; }
menu,
-.menu {
+.menu,
+.context-menu {
margin: 4px;
padding: 2px 0px;
background-color: #2c2d2d;
border: 1px solid #1c1f1f; }
.csd menu, .csd
- .menu {
+ .menu, .csd
+ .context-menu {
border: none; }
menu:backdrop,
- .menu:backdrop {
+ .menu:backdrop,
+ .context-menu:backdrop {
background-color: #2f3030; }
menu menuitem,
- .menu menuitem {
+ .menu menuitem,
+ .context-menu menuitem {
min-height: 16px;
min-width: 40px;
padding: 4px 6px;
text-shadow: none; }
menu menuitem:hover,
- .menu menuitem:hover {
+ .menu menuitem:hover,
+ .context-menu menuitem:hover {
color: #ffffff;
background-color: #215d9c; }
menu menuitem:disabled,
- .menu menuitem:disabled {
+ .menu menuitem:disabled,
+ .context-menu menuitem:disabled {
color: #949796; }
menu menuitem:disabled:backdrop,
- .menu menuitem:disabled:backdrop {
+ .menu menuitem:disabled:backdrop,
+ .context-menu menuitem:disabled:backdrop {
color: #5d6767; }
menu menuitem:backdrop, menu menuitem:backdrop:hover,
.menu menuitem:backdrop,
- .menu menuitem:backdrop:hover {
+ .menu menuitem:backdrop:hover,
+ .context-menu menuitem:backdrop,
+ .context-menu menuitem:backdrop:hover {
color: #949796;
background-color: transparent; }
menu menuitem arrow,
- .menu menuitem arrow {
+ .menu menuitem arrow,
+ .context-menu menuitem arrow {
min-height: 16px;
min-width: 16px; }
menu menuitem arrow:dir(ltr),
- .menu menuitem arrow:dir(ltr) {
+ .menu menuitem arrow:dir(ltr),
+ .context-menu menuitem arrow:dir(ltr) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
margin-left: 10px; }
menu menuitem arrow:dir(rtl),
- .menu menuitem arrow:dir(rtl) {
+ .menu menuitem arrow:dir(rtl),
+ .context-menu menuitem arrow:dir(rtl) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
margin-right: 10px; }
+ menu menuitem label:dir(rtl), menu menuitem label:dir(ltr),
+ .menu menuitem label:dir(rtl),
+ .menu menuitem label:dir(ltr),
+ .context-menu menuitem label:dir(rtl),
+ .context-menu menuitem label:dir(ltr) {
+ color: inherit; }
menu > arrow,
- .menu > arrow {
+ .menu > arrow,
+ .context-menu > arrow {
border-color: transparent;
background-color: transparent;
background-image: none;
@@ -2178,23 +2197,28 @@ menu,
background-color: #2c2d2d;
border-radius: 0; }
menu > arrow.top,
- .menu > arrow.top {
+ .menu > arrow.top,
+ .context-menu > arrow.top {
margin-top: -6px;
border-bottom: 1px solid #3d3d3d;
-gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
menu > arrow.bottom,
- .menu > arrow.bottom {
+ .menu > arrow.bottom,
+ .context-menu > arrow.bottom {
margin-bottom: -6px;
border-top: 1px solid #3d3d3d;
-gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
menu > arrow:hover,
- .menu > arrow:hover {
+ .menu > arrow:hover,
+ .context-menu > arrow:hover {
background-color: #3d3d3d; }
menu > arrow:backdrop,
- .menu > arrow:backdrop {
+ .menu > arrow:backdrop,
+ .context-menu > arrow:backdrop {
background-color: #2f3030; }
menu > arrow:disabled,
- .menu > arrow:disabled {
+ .menu > arrow:disabled,
+ .context-menu > arrow:disabled {
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 8e59644..c3dd1f3 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2133,52 +2133,71 @@ menubar,
box-shadow: none; }
menu,
-.menu {
+.menu,
+.context-menu {
margin: 4px;
padding: 2px 0px;
background-color: #ffffff;
border: 1px solid #9d9d99; }
.csd menu, .csd
- .menu {
+ .menu, .csd
+ .context-menu {
border: none; }
menu:backdrop,
- .menu:backdrop {
+ .menu:backdrop,
+ .context-menu:backdrop {
background-color: #fcfcfc; }
menu menuitem,
- .menu menuitem {
+ .menu menuitem,
+ .context-menu menuitem {
min-height: 16px;
min-width: 40px;
padding: 4px 6px;
text-shadow: none; }
menu menuitem:hover,
- .menu menuitem:hover {
+ .menu menuitem:hover,
+ .context-menu menuitem:hover {
color: #ffffff;
background-color: #4a90d9; }
menu menuitem:disabled,
- .menu menuitem:disabled {
+ .menu menuitem:disabled,
+ .context-menu menuitem:disabled {
color: #8b8e8f; }
menu menuitem:disabled:backdrop,
- .menu menuitem:disabled:backdrop {
+ .menu menuitem:disabled:backdrop,
+ .context-menu menuitem:disabled:backdrop {
color: #c3c3c0; }
menu menuitem:backdrop, menu menuitem:backdrop:hover,
.menu menuitem:backdrop,
- .menu menuitem:backdrop:hover {
+ .menu menuitem:backdrop:hover,
+ .context-menu menuitem:backdrop,
+ .context-menu menuitem:backdrop:hover {
color: #8b8e8f;
background-color: transparent; }
menu menuitem arrow,
- .menu menuitem arrow {
+ .menu menuitem arrow,
+ .context-menu menuitem arrow {
min-height: 16px;
min-width: 16px; }
menu menuitem arrow:dir(ltr),
- .menu menuitem arrow:dir(ltr) {
+ .menu menuitem arrow:dir(ltr),
+ .context-menu menuitem arrow:dir(ltr) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
margin-left: 10px; }
menu menuitem arrow:dir(rtl),
- .menu menuitem arrow:dir(rtl) {
+ .menu menuitem arrow:dir(rtl),
+ .context-menu menuitem arrow:dir(rtl) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
margin-right: 10px; }
+ menu menuitem label:dir(rtl), menu menuitem label:dir(ltr),
+ .menu menuitem label:dir(rtl),
+ .menu menuitem label:dir(ltr),
+ .context-menu menuitem label:dir(rtl),
+ .context-menu menuitem label:dir(ltr) {
+ color: inherit; }
menu > arrow,
- .menu > arrow {
+ .menu > arrow,
+ .context-menu > arrow {
border-color: transparent;
background-color: transparent;
background-image: none;
@@ -2191,23 +2210,28 @@ menu,
background-color: #ffffff;
border-radius: 0; }
menu > arrow.top,
- .menu > arrow.top {
+ .menu > arrow.top,
+ .context-menu > arrow.top {
margin-top: -6px;
border-bottom: 1px solid #eaebeb;
-gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
menu > arrow.bottom,
- .menu > arrow.bottom {
+ .menu > arrow.bottom,
+ .context-menu > arrow.bottom {
margin-bottom: -6px;
border-top: 1px solid #eaebeb;
-gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
menu > arrow:hover,
- .menu > arrow:hover {
+ .menu > arrow:hover,
+ .context-menu > arrow:hover {
background-color: #eaebeb; }
menu > arrow:backdrop,
- .menu > arrow:backdrop {
+ .menu > arrow:backdrop,
+ .context-menu > arrow:backdrop {
background-color: #fcfcfc; }
menu > arrow:disabled,
- .menu > arrow:disabled {
+ .menu > arrow:disabled,
+ .context-menu > arrow:disabled {
color: transparent;
background-color: transparent;
border-color: transparent; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]