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
1=== modified file 'gtk-3.0/gtk-widgets.css'
2--- gtk-3.0/gtk-widgets.css 2015-05-06 19:31:52 +0000
3+++ gtk-3.0/gtk-widgets.css 2015-05-08 23:01:17 +0000
4@@ -1718,7 +1718,8 @@
5 padding: 3px 6px;
6 }
7
8-.menu .menuitem {
9+.menu .menuitem,
10+.popover .menuitem {
11 padding: 6px;
12 text-shadow: none;
13 icon-shadow: none;
14@@ -1734,7 +1735,9 @@
15 }
16
17 .menu .menuitem GtkLabel,
18-.menu .menuitem GtkImage {
19+.menu .menuitem GtkImage,
20+.popover .menuitem GtkLabel,
21+.popover .menuitem GtkImage, {
22 padding: 0 3px;
23 -gtk-icon-style: symbolic;
24 }
25@@ -1742,11 +1745,14 @@
26 .menu .menuitem:active,
27 .menu .menuitem:hover,
28 .popup .menuitem:active,
29-.popup .menuitem:hover {
30+.popup .menuitem:hover,
31+.popover .menuitem:active,
32+.popover .menuitem:hover {
33 background-color: alpha (@text_color, 0.15);
34 }
35
36-.menu .menuitem *:insensitive {
37+.menu .menuitem *:insensitive,
38+.popover .menuitem *:insensitive {
39 color: @insensitive_color;
40 }
41

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: