Merge lp:~elementary-apps/granite/fix-welcome-style into lp:~elementary-pantheon/granite/granite

[Danielle Foré]

* fix welcome widget text color for dark themes.
* uses h styles from the theme, not utils
* remove content view class

Basically just remove a bunch of styling garbage and let the theme do its job.

* fixes welcome widget text color for dark themes.
* uses h styles from the theme, not utils
* remove content view class

[lp:~elementary-apps/granite/fix-welcome-style]

747. By Danielle Foré on 2014-07-03

remove more BS

[Robert Roth (evfool)]

Looks fine, cleaning up BS is always good.

review: Approve

[Danielle Foré (danrabbit)]

review: Approve

=== modified file 'lib/Widgets/Welcome.vala'
--- lib/Widgets/Welcome.vala	2014-04-08 20:21:10 +0000
+++ lib/Widgets/Welcome.vala	2014-07-03 05:29:08 +0000
@@ -79,23 +79,19 @@
         // Box properties
         content.homogeneous = false;
 
-        // Add content-view styling
-        get_style_context().add_class (StyleClass.CONTENT_VIEW);
-
         // Top spacer
         content.pack_start (new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0), true, true, 0);
 
         // Labels
         title_label = new Gtk.Label (title_text);
-        Utils.apply_text_style_to_label (TextStyle.H1, title_label);
+        title_label.get_style_context ().add_class ("h1");
 
         title_label.set_justify (Gtk.Justification.CENTER);
         content.pack_start (title_label, false, true, 0);
 
         subtitle_label = new Gtk.Label (subtitle_text);
-        Utils.apply_text_style_to_label (TextStyle.H2, subtitle_label);
+        subtitle_label.get_style_context ().add_class ("h2");
 
-        subtitle_label.sensitive = false;
         subtitle_label.set_justify (Gtk.Justification.CENTER);
 
         content.pack_start (subtitle_label, false, true, 2);
@@ -189,17 +185,15 @@
       */
     public int append_with_image (Gtk.Image? image, string option_text, string description_text) {
         // Option label
-        var label = new Gtk.Label (Markup.printf_escaped ("<span weight='medium' size='11700'>%s</span>", option_text));
-        label.use_markup = true;
+        var label = new Gtk.Label (option_text);
+        label.get_style_context ().add_class ("h3");
         label.halign = Gtk.Align.START;
         label.valign = Gtk.Align.CENTER;
 
         // Description label
-        var description = new Gtk.Label (Markup.printf_escaped ("<span weight='medium' size='11400'>%s</span>", description_text));
-        description.use_markup = true;
+        var description = new Gtk.Label (description_text);
         description.halign = Gtk.Align.START;
         description.valign = Gtk.Align.CENTER;
-        description.sensitive = false;
 
         // Button
         var button = new Gtk.Button ();
@@ -237,5 +231,4 @@
 
         return this.children.index (button);
     }
-}
-
+}
 \ No newline at end of file