From 3f7db54ab3d48c7e0d0e4b48517531159459364f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Wed, 14 Sep 2016 11:45:35 +0200
Subject: [PATCH] Remove use of external fonts in Hawk UI (bsc#997041)

---
 hawk/app/assets/stylesheets/application.scss             | 3 ---
 hawk/app/assets/stylesheets/application/_basics.scss     | 2 +-
 hawk/app/assets/stylesheets/application/_content.scss    | 2 +-
 hawk/app/assets/stylesheets/authentication.scss          | 5 +----
 hawk/app/assets/stylesheets/authentication/_basics.scss  | 2 +-
 hawk/vendor/assets/stylesheets/bootstrap/_variables.scss | 2 +-
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/hawk/app/assets/stylesheets/application.scss b/hawk/app/assets/stylesheets/application.scss
index 0b300aa..6767781 100644
--- a/hawk/app/assets/stylesheets/application.scss
+++ b/hawk/app/assets/stylesheets/application.scss
@@ -1,9 +1,6 @@
 // Copyright (c) 2009-2015 Tim Serong <tserong@suse.com>
 // See COPYING for license.
 
-@import url("https://fonts.googleapis.com/css?family=Roboto");
-@import url("https://fonts.googleapis.com/css?family=Raleway");
-
 @import "bootstrap/variables";
 @import "bootstrap/mixins";
 
diff --git a/hawk/app/assets/stylesheets/application/_basics.scss b/hawk/app/assets/stylesheets/application/_basics.scss
index f80283b..9c4e450 100644
--- a/hawk/app/assets/stylesheets/application/_basics.scss
+++ b/hawk/app/assets/stylesheets/application/_basics.scss
@@ -6,7 +6,7 @@ html {
 }
 
 body {
-  font-family: "Raleway", sans-serif;
+  font-family: $font-family-base;
   color: #3a3e40;
   background-color: #f7f7f7;
   -webkit-font-smoothing: antialiased;
diff --git a/hawk/app/assets/stylesheets/application/_content.scss b/hawk/app/assets/stylesheets/application/_content.scss
index 20d11fe..87560d3 100644
--- a/hawk/app/assets/stylesheets/application/_content.scss
+++ b/hawk/app/assets/stylesheets/application/_content.scss
@@ -82,7 +82,7 @@
       @include gradient-vertical(#f4f4f4, #e7e7e7);
 
       h2 {
-        font-family: Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
+        font-family: $headings-font-family;
         color: rgb(58, 62, 64);
         -webkit-font-smoothing: antialiased;
         font-size: 14px;
diff --git a/hawk/app/assets/stylesheets/authentication.scss b/hawk/app/assets/stylesheets/authentication.scss
index d527d7d..f916673 100644
--- a/hawk/app/assets/stylesheets/authentication.scss
+++ b/hawk/app/assets/stylesheets/authentication.scss
@@ -1,9 +1,5 @@
 // Copyright (c) 2009-2015 Tim Serong <tserong@suse.com>
 // See COPYING for license.
-
-@import url("https://fonts.googleapis.com/css?family=Roboto");
-@import url("https://fonts.googleapis.com/css?family=Raleway");
-
 @import "bootstrap/variables";
 @import "bootstrap/mixins";
 
diff --git a/hawk/app/assets/stylesheets/authentication/_basics.scss b/hawk/app/assets/stylesheets/authentication/_basics.scss
index a8a1650..966edd1 100644
--- a/hawk/app/assets/stylesheets/authentication/_basics.scss
+++ b/hawk/app/assets/stylesheets/authentication/_basics.scss
@@ -12,7 +12,7 @@ html {
 }
 
 body {
-  font-family: "Raleway", sans-serif;
+  font-family: $font-family-base;
   color: #3a3e40;
   height: 100%;
   cursor: default;
diff --git a/hawk/vendor/assets/stylesheets/bootstrap/_variables.scss b/hawk/vendor/assets/stylesheets/bootstrap/_variables.scss
index bf9373b..6c89b50 100644
--- a/hawk/vendor/assets/stylesheets/bootstrap/_variables.scss
+++ b/hawk/vendor/assets/stylesheets/bootstrap/_variables.scss
@@ -43,7 +43,7 @@ $link-hover-decoration: underline !default;
 //
 //## Font, line-height, and color for body text, headings, and more.
 
-$font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif !default;
+$font-family-sans-serif:  "Liberation Sans", "DejaVu Sans", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif !default;
 //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
 $font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace !default;
-- 
2.9.0

