#93 Add font-face for FontAwesome to admin.css
Merged 7 years ago by merlinthp. Opened 7 years ago by merlinthp.
merlinthp/ipsilon fontfix  into  master

@@ -42,6 +42,7 @@ 

  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

file modified
+9 -1
@@ -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');

+ }

file modified
+6
@@ -6914,6 +6914,12 @@ 

    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;

file modified
+6
@@ -3226,3 +3226,9 @@ 

    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');

+ }

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.

We also need to Requires: the FA package so it's present to be served up.

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

rebased

7 years ago

rebased

7 years ago

Thanks, this looks good to me.

Commit 586b0b3 fixes this pull-request

Pull-Request has been merged by merlin@merlinthp.org

7 years ago