Merge lp:~elementary-design/egtk/font-family-changes into lp:~elementary-design/egtk/trunk

[Danielle Foré]

Make font-family changes that conform with switch to Open Sans system default

[lp:~elementary-design/egtk/font-family-changes]

647. By Danielle Foré on 2016-04-05

remove last reference to open sans

=== modified file 'gtk-3.0/apps.css'
--- gtk-3.0/apps.css	2016-03-07 04:02:53 +0000
+++ gtk-3.0/apps.css	2016-04-05 22:56:42 +0000
@@ -256,7 +256,6 @@
 .composited-indicator > revealer label,
 .composited-indicator > revealer image,
 .composited-indicator > GtkRevealer {
-    font-family: 'Open Sans';
     color: #fff;
     font-weight: bold;
     text-shadow: 0 0 2px alpha (#000, 0.3),

=== modified file 'gtk-3.0/gtk-widgets.css'
--- gtk-3.0/gtk-widgets.css	2016-03-23 23:27:59 +0000
+++ gtk-3.0/gtk-widgets.css	2016-04-05 22:56:42 +0000
@@ -118,7 +118,6 @@
 .tooltip GtkLabel,
 .overlay-bar GtkLabel {
     color: white;
-    font-family: 'Open Sans';
     text-shadow: 0 1px 2px alpha (#000, 0.6);
 }
 
@@ -3600,7 +3599,7 @@
 
 GraniteWidgetsWelcome GtkLabel {
     color: @placeholder_text_color;
-    font: open sans 11;
+    font-size: 11;
     text-shadow: none;
 }
 
@@ -4005,13 +4004,23 @@
 * Text Styles *
 **************/
 
-.h1 { font: open sans 24px; }
-.h2 { font: open sans light 18px; }
-.h3 { font: open sans 11px; }
+.h1 {
+    font-size: 24px;
+}
+
+.h2 {
+    font-weight: 300;
+    font-size: 18px;
+}
+
+.h3 {
+    font-size: 11px;
+}
+
 .h4,
 .category-label {
     color: mix (@bg_color, @text_color, 0.7);
-    font-weight: 600;
+    font-weight: bold;
     text-shadow: 0 1px @text_shadow_color;
 }