From c596cbbc7bfd976d7258924a550adc7aed9a038d Mon Sep 17 00:00:00 2001
From: Howard Johnson <merlin@merlinthp.org>
Date: May 13 2016 19:54:44 +0000
Subject: Add font-face for FontAwesome to font.less (and admin.css and ipsilon.css)


The admin template navbar drop-down uses FontAwesome for the down-arrow
glyph, but there's no font-face statement in the page CSS to define and
load FA.  Fix that by adding a statement pointing to a system copy of the
font.

Add a Requires: for the system font.

Signed-off-by: Howard Johnson <merlin@merlinthp.org>

---

diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec
index 8456522..d1c0ab3 100644
--- a/contrib/fedora/ipsilon.spec
+++ b/contrib/fedora/ipsilon.spec
@@ -42,6 +42,7 @@ Requires:       python-jinja2
 Requires:       python-lxml
 Requires:       python-sqlalchemy
 Requires:       open-sans-fonts
+Requires:       fontawesome-fonts
 Requires:       pam
 Requires(pre):  shadow-utils
 Requires(post): %_sbindir/semanage, %_sbindir/restorecon
diff --git a/less/font.less b/less/font.less
index 9305392..ee7222c 100644
--- a/less/font.less
+++ b/less/font.less
@@ -88,4 +88,12 @@
   font-weight: 900;
   src: local('Open Sans Extrabold Italic'),
        url('../fonts/open-sans/OpenSans-ExtraBoldItalic.ttf') format('truetype');
-}
\ No newline at end of file
+}
+
+@font-face {
+  font-family: 'FontAwesome';
+  font-style: normal;
+  font-weight: normal;
+  src: local('FontAwesome'),
+       url('../fonts/fontawesome/fontawesome-webfont.ttf') format('truetype');
+}
diff --git a/ui/css/admin.css b/ui/css/admin.css
index 1c79b45..d7c502f 100644
--- a/ui/css/admin.css
+++ b/ui/css/admin.css
@@ -6914,6 +6914,12 @@ fieldset[disabled] .btn-primary.active {
   font-weight: 900;
   src: local('Open Sans Extrabold Italic'), url('../fonts/open-sans/OpenSans-ExtraBoldItalic.ttf') format('truetype');
 }
+@font-face {
+  font-family: 'FontAwesome';
+  font-style: normal;
+  font-weight: normal;
+  src: local('FontAwesome'), url('../fonts/fontawesome/fontawesome-webfont.ttf') format('truetype');
+}
 .ipsilon-row {
   border-top: 1px solid #d1d1d1;
   padding: 10px;
diff --git a/ui/css/ipsilon.css b/ui/css/ipsilon.css
index f7fad06..f5b16c9 100644
--- a/ui/css/ipsilon.css
+++ b/ui/css/ipsilon.css
@@ -3226,3 +3226,9 @@ fieldset[disabled] .btn-primary.active {
   font-weight: 900;
   src: local('Open Sans Extrabold Italic'), url('../fonts/open-sans/OpenSans-ExtraBoldItalic.ttf') format('truetype');
 }
+@font-face {
+  font-family: 'FontAwesome';
+  font-style: normal;
+  font-weight: normal;
+  src: local('FontAwesome'), url('../fonts/fontawesome/fontawesome-webfont.ttf') format('truetype');
+}