Upgrade to Font Awesome v5

#147
Caleydo · Dec 15, 2020 · dffde7a · dffde7a
1 parent 387d9fc
commit dffde7a
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git a/dist/menu/SpeciesSelectorMenuSection.js b/dist/menu/SpeciesSelectorMenuSection.js
diff --git a/dist/menu/SpeciesSelectorMenuSection.js.map b/dist/menu/SpeciesSelectorMenuSection.js.map
diff --git a/dist/scss/components/_startMenu.scss b/dist/scss/components/_startMenu.scss
diff --git a/dist/views/AOncoPrint.js b/dist/views/AOncoPrint.js
diff --git a/src/common/common.ts b/src/common/common.ts
@@ -160,4 +160,3 @@ export class SpeciesUtils {
     return !filter.species || filter.species === SpeciesUtils.getSelectedSpecies();
   }
 }
-
diff --git a/src/menu/SpeciesSelectorMenuSection.ts b/src/menu/SpeciesSelectorMenuSection.ts
@@ -80,7 +80,7 @@ export class SpeciesSelectorMenuSection implements IStartMenuSection {
           text = d.name.substr(0, 1).toUpperCase();
         }
 
-        return `<i class="fa ${className} fa-fw fa-3x" aria-hidden="true">${text}</i>`;
+        return `<i class="fas ${className} fa-fw fa-3x" aria-hidden="true">${text}</i>`;
       });
 
   }
@@ -136,7 +136,7 @@ export class SpeciesSelectorMenuSection implements IStartMenuSection {
     $enter.append('div').classed('body', true)
       .html(`
         <div class="loading">
-          <i class="fa fa-spinner fa-pulse fa-fw"></i>
+          <i class="fas fa-spinner fa-pulse fa-fw"></i>
           <span class="sr-only">Loading...</span>
         </div>
       `);

diff --git a/src/scss/components/_startMenu.scss b/src/scss/components/_startMenu.scss
@@ -128,9 +128,9 @@
   }
 
   .speciesSelector > header > h1 > label:before {
-    @include fa-icon();
-    content: $fa-var-database;
-    width: (18em / 14);
+    @extend .fas;
+    content: fa-content($fa-var-database);
+    width: 1.8em;
     text-align: center;
   }
 }
diff --git a/src/views/AOncoPrint.ts b/src/views/AOncoPrint.ts
@@ -179,7 +179,7 @@ export abstract class AOncoPrint extends AView {
     // inject stats
     const base = <HTMLElement>params.querySelector('form') || params;
     base.insertAdjacentHTML('beforeend', `<div class="form-group oncoPrintScale" data-scale="">
-  <button class="fa fa-search-minus"></button><div><div></div><div></div><div></div></div><button class="fa fa-search-plus"></button>
+  <button class="fas fa-search-minus"></button><div><div></div><div></div><div></div></div><button class="fas fa-search-plus"></button>
 </div>`);
     let s = 0;
     const scaleElem = <HTMLElement>base.lastElementChild!;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -160,4 +160,3 @@ export class SpeciesUtils {
		return !filter.species \|\| filter.species === SpeciesUtils.getSelectedSpecies();
		}
		}