Use RCUE fonts

https://fedorahosted.org/freeipa/ticket/3902

4 files changed, 8 insertions, 38 deletions

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 85b356668..9e55d440d 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -680,11 +680,11 @@ fi
 %{_usr}/share/ipa/ui/*.ico
 %{_usr}/share/ipa/ui/*.css
 %{_usr}/share/ipa/ui/*.js
-%{_usr}/share/ipa/ui/*.eot
-%{_usr}/share/ipa/ui/*.svg
-%{_usr}/share/ipa/ui/*.ttf
-%{_usr}/share/ipa/ui/*.woff
 %{_usr}/share/ipa/ui/css/*.css
+%{_usr}/share/ipa/ui/font/*.eot
+%{_usr}/share/ipa/ui/font/*.svg
+%{_usr}/share/ipa/ui/font/*.ttf
+%{_usr}/share/ipa/ui/font/*.woff
 %dir %{_usr}/share/ipa/ui/js
 %dir %{_usr}/share/ipa/ui/js/dojo
 %{_usr}/share/ipa/ui/js/dojo/dojo.js
diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am
index 278845366..7e126eb01 100644
--- a/install/ui/Makefile.am
+++ b/install/ui/Makefile.am
@@ -19,14 +19,6 @@ app_DATA =				\
 	login.html			\
 	login.js			\
 	logout.html			\
-	overpass_bold-web.eot		\
-	overpass_bold-web.svg		\
-	overpass_bold-web.ttf		\
-	overpass_bold-web.woff		\
-	overpass_regular-web.eot	\
-	overpass_regular-web.svg	\
-	overpass_regular-web.ttf	\
-	overpass_regular-web.woff	\
 	reset_password.js		\
 	reset_password.html		\
 	$(NULL)
diff --git a/install/ui/ipa.css b/install/ui/ipa.css
index 26df94095..792ce1c7b 100644
--- a/install/ui/ipa.css
+++ b/install/ui/ipa.css
@@ -10,30 +10,6 @@
 */
 
 
-@font-face {
-    font-family: 'Overpass';
-    src: url('overpass_regular-web.eot');
-    src: url('overpass_regular-web.eot?#iefix') format('eot'),
-         url('overpass_regular-web.woff') format('woff'),
-         url('overpass_regular-web.ttf') format('truetype'),
-         url('overpass_regular-web.svg#webfontLTZe4IYH') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'Overpass Bold';
-    src: url('overpass_bold-web.eot');
-    src: url('overpass_bold-web.eot?#iefix') format('eot'),
-         url('overpass_bold-web.woff') format('woff'),
-         url('overpass_bold-web.ttf') format('truetype'),
-         url('overpass_bold-web.svg#webfontzAU82Ltw') format('svg');
-    font-weight: bold;
-    font-style: normal;
-
-}
-
 html {
     height: 100%;
 }
@@ -46,7 +22,6 @@ body {
     background-position: left top;
     background-color: #FFFFFF;
     border-width: 0;
-    font-family: "Liberation Sans",Arial,Sans;
     font-size: 11px;
     margin: 0;
     padding: 0;
diff --git a/install/ui/less/rcue/font.less b/install/ui/less/rcue/font.less
index 33d0a9cb7..5c12e2d3d 100644
--- a/install/ui/less/rcue/font.less
+++ b/install/ui/less/rcue/font.less
@@ -110,6 +110,8 @@ src: url('../font/OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded
      url('../font/OpenSans-ExtraBoldItalic-webfont.ttf') format('truetype'),
      url('../font/OpenSans-ExtraBoldItalic-webfont.svg#OpenSansExtraboldItalic') format('svg');
 }
+
+*/
 @font-face {
   font-family: 'Overpass';
   font-style: normal;
@@ -120,6 +122,7 @@ src: url('../font/OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded
        url('../font/Overpass-Regular-webfont.ttf') format('truetype'),
        url('../font/Overpass-Regular-webfont.svg#OpenSansExtrabold') format('svg');
 }
+
 @font-face {
   font-family: 'Overpass';
   font-style: normal;
@@ -130,7 +133,7 @@ src: url('../font/OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded
        url('../font/Overpass-Bold-webfont.ttf') format('truetype'),
        url('../font/Overpass-Bold-webfont.svg#OpenSansExtrabold') format('svg');
 }
-*/
+
 body {
   font-family: OpenSansRegular, Arial, Helvetica, sans-serif;
 }
\ No newline at end of file