[BACKLOG-18719] Fixes file-open-save loading page font style issues a…

…nd cleans up CSS
tzraeq · Dec 27, 2017 · aac8114 · aac8114
1 parent 8a76a83
commit aac8114
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/plugins/file-open-save/core/src/main/javascript/app/app.module.js b/plugins/file-open-save/core/src/main/javascript/app/app.module.js
@@ -65,11 +65,11 @@ define([
    */
   function activate() {
     angular.module(module.name, [resizeModule.name, "ui.router"])
+      .component(loadingComponent.name, loadingComponent.options)
       .component(appComponent.name, appComponent.options)
       .component(cardComponent.name, cardComponent.options)
       .component(folderComponent.name, folderComponent.options)
       .component(errorComponent.name, errorComponent.options)
-      .component(loadingComponent.name, loadingComponent.options)
       .component(breadcrumbComponent.name, breadcrumbComponent.options)
       .component(filesComponent.name, filesComponent.options)
       .component(searchComponent.name, searchComponent.options)

diff --git a/plugins/file-open-save/core/src/main/resources-filtered/app/index.html b/plugins/file-open-save/core/src/main/resources-filtered/app/index.html
@@ -7,8 +7,8 @@
   <!-- Requesting webcontext.js one level above to workaround the filter on PDI issue (BACKLOG-17885) -->
   <!-- Remove '../' when not needed -->
   <script type="text/javascript" src="../webcontext.js?requireJsOnly=true"></script>
-  <link rel="stylesheet" href="css/fonts/opensans/style.css">
-  <link rel="stylesheet" href="css/index.css">
+  <link rel="stylesheet" type="text/css" href="css/fonts/opensans/style.css">
+  <link rel="stylesheet" type="text/css" href="css/index.css">
   <script>
     (function () {
       "use strict";

diff --git a/plugins/file-open-save/core/src/main/resources/app/css/fonts/opensans/style.css b/plugins/file-open-save/core/src/main/resources/app/css/fonts/opensans/style.css
@@ -1,6 +1,5 @@
 @font-face {
   font-family: 'OpenSansRegular';
-  src: url('opensans-regular.eot');
   src: url('opensans-regular.eot') format('embedded-opentype'),
   url('opensans-regular.woff') format('woff'),
   url('opensans-regular.ttf') format('truetype'),
@@ -9,7 +8,6 @@
 
 @font-face {
   font-family: 'OpenSansLight';
-  src: url('opensans-light.eot');
   src: url('opensans-light.eot') format('embedded-opentype'),
   url('opensans-light.woff') format('woff'), url('opensans-light.ttf')
   format('truetype'), url('opensans-light.svg#OpenSansLight')