Granite

Merge lp:~victored/granite/lp-1309713 into lp:~elementary-pantheon/granite/granite

  1. lp-1309713
  2. Merge into granite
Proposed by Victor Martinez
Status: Merged
Approved by: David Gomes
Approved revision: 721
Merged at revision: 721
Proposed branch: lp:~victored/granite/lp-1309713
Merge into: lp:~elementary-pantheon/granite/granite
Diff against target: 33 lines (+3/-2)
2 files modified
lib/Widgets/OverlayBar.vala (+2/-2)
lib/style-classes.vala (+1/-0)
To merge this branch: bzr merge lp:~victored/granite/lp-1309713
Reviewer Review Type Date Requested Status
David Gomes (community) Approve
Review via email: mp+216483@code.launchpad.net

Commit message

Style class: Change "granite-overlay-bar" to "overlay-bar". Fixes lp:1309713

Description of the change

Style class: Change "granite-overlay-bar" to "overlay-bar". Fixes lp:1309713

To post a comment you must log in.
Revision history for this message
David Gomes (davidgomes) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/Widgets/OverlayBar.vala'
2--- lib/Widgets/OverlayBar.vala 2014-04-05 08:35:38 +0000
3+++ lib/Widgets/OverlayBar.vala 2014-04-18 19:37:08 +0000
4@@ -42,7 +42,7 @@
5 public class Granite.Widgets.OverlayBar : Gtk.EventBox {
6
7 private const string FALLBACK_THEME = """
8- .granite-overlay-bar {
9+ .overlay-bar {
10 background-color: @bg_color;
11 border-radius: 3px;
12 padding: 3px 6px;
13@@ -168,7 +168,7 @@
14
15 private void set_default_style () {
16 int priority = Gtk.STYLE_PROVIDER_PRIORITY_FALLBACK;
17- Granite.Widgets.Utils.set_theming (this, FALLBACK_THEME, "granite-overlay-bar", priority);
18+ Granite.Widgets.Utils.set_theming (this, FALLBACK_THEME, StyleClass.OVERLAY_BAR, priority);
19 }
20
21 private bool enter_notify_callback (Gdk.EventCrossing event) {
22
23=== modified file 'lib/style-classes.vala'
24--- lib/style-classes.vala 2013-04-20 19:16:50 +0000
25+++ lib/style-classes.vala 2014-04-18 19:37:08 +0000
26@@ -29,6 +29,7 @@
27 public const string POPOVER_BG = "popover_bg";
28 public const string HELP_BUTTON = "help_button";
29 public const string THIN_PANE_SEPARATOR = "sidebar-pane-separator";
30+ public const string OVERLAY_BAR = "overlay-bar";
31
32 public const string TITLE_TEXT = "title";
33 public const string H1_TEXT = "h1";

Subscribers

People subscribed via source and target branches