Merge lp:~elementary-design/egtk/menuitem into lp:~elementary-design/egtk/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: Danielle Foré
Approved revision: 469
Merged at revision: 469
Proposed branch: lp:~elementary-design/egtk/menuitem
Merge into: lp:~elementary-design/egtk/trunk
Diff against target: 40 lines (+10/-4)
1 file modified
gtk-3.0/gtk-widgets.css (+10/-4)
To merge this branch: bzr merge lp:~elementary-design/egtk/menuitem
Reviewer Review Type Date Requested Status
elementary UX Pending
Review via email: mp+258697@code.launchpad.net

Commit message

select "popover menuitem" in addition to "menu menuitem"

Description of the change

select "menuitem" instead of "menu menuitem"

This is to solve a style issue with menuitems in popovers. Please test thoroughly.

To post a comment you must log in.
lp:~elementary-design/egtk/menuitem updated
469. By Danielle Foré

add popover menuitem

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'gtk-3.0/gtk-widgets.css'
--- gtk-3.0/gtk-widgets.css 2015-05-06 19:31:52 +0000
+++ gtk-3.0/gtk-widgets.css 2015-05-08 23:01:17 +0000
@@ -1718,7 +1718,8 @@
1718 padding: 3px 6px;1718 padding: 3px 6px;
1719}1719}
17201720
1721.menu .menuitem {1721.menu .menuitem,
1722.popover .menuitem {
1722 padding: 6px;1723 padding: 6px;
1723 text-shadow: none;1724 text-shadow: none;
1724 icon-shadow: none;1725 icon-shadow: none;
@@ -1734,7 +1735,9 @@
1734}1735}
17351736
1736.menu .menuitem GtkLabel,1737.menu .menuitem GtkLabel,
1737.menu .menuitem GtkImage {1738.menu .menuitem GtkImage,
1739.popover .menuitem GtkLabel,
1740.popover .menuitem GtkImage, {
1738 padding: 0 3px;1741 padding: 0 3px;
1739 -gtk-icon-style: symbolic;1742 -gtk-icon-style: symbolic;
1740}1743}
@@ -1742,11 +1745,14 @@
1742.menu .menuitem:active,1745.menu .menuitem:active,
1743.menu .menuitem:hover,1746.menu .menuitem:hover,
1744.popup .menuitem:active,1747.popup .menuitem:active,
1745.popup .menuitem:hover {1748.popup .menuitem:hover,
1749.popover .menuitem:active,
1750.popover .menuitem:hover {
1746 background-color: alpha (@text_color, 0.15);1751 background-color: alpha (@text_color, 0.15);
1747}1752}
17481753
1749.menu .menuitem *:insensitive {1754.menu .menuitem *:insensitive,
1755.popover .menuitem *:insensitive {
1750 color: @insensitive_color;1756 color: @insensitive_color;
1751}1757}
17521758

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: