From 387d9fcb6bbf8b90d9420bbd19faab602ef3e8ff Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Tue, 15 Dec 2020 13:45:40 +0100 Subject: [PATCH 1/2] Switch branches --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3d4f639..d3b7c17 100644 --- a/package.json +++ b/package.json @@ -68,9 +68,9 @@ "dependencies": { "jstat": "^1.9.3", "jquery-ui": "1.12.1", - "tdp_core": "github:datavisyn/tdp_core#dmoitzi/refactor_stylesheets_organiation_and_imports" + "tdp_core": "github:datavisyn/tdp_core#fontawesome-v5" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#dmoitzi/refactor_stylesheets_organiation_and_imports" + "ordino": "github:Caleydo/ordino#fontawesome-v5" } } From dffde7a036eb0699eec0c45f9ab3e19d2ab77fcc Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Tue, 15 Dec 2020 13:57:40 +0100 Subject: [PATCH 2/2] Upgrade to Font Awesome v5 #147 --- dist/menu/SpeciesSelectorMenuSection.js | 4 ++-- dist/menu/SpeciesSelectorMenuSection.js.map | 2 +- dist/scss/components/_startMenu.scss | 6 +++--- dist/views/AOncoPrint.js | 2 +- src/common/common.ts | 1 - src/menu/SpeciesSelectorMenuSection.ts | 4 ++-- src/scss/components/_startMenu.scss | 6 +++--- src/views/AOncoPrint.ts | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dist/menu/SpeciesSelectorMenuSection.js b/dist/menu/SpeciesSelectorMenuSection.js index 3f7d7ea..1fc9738 100644 --- a/dist/menu/SpeciesSelectorMenuSection.js +++ b/dist/menu/SpeciesSelectorMenuSection.js @@ -60,7 +60,7 @@ export class SpeciesSelectorMenuSection { if (!className) { text = d.name.substr(0, 1).toUpperCase(); } - return ``; + return ``; }); } buildEntityTypes($parent) { @@ -107,7 +107,7 @@ export class SpeciesSelectorMenuSection { $enter.append('div').classed('body', true) .html(`
- + Loading...
`); diff --git a/dist/menu/SpeciesSelectorMenuSection.js.map b/dist/menu/SpeciesSelectorMenuSection.js.map index cb7c35c..cedb16c 100644 --- a/dist/menu/SpeciesSelectorMenuSection.js.map +++ b/dist/menu/SpeciesSelectorMenuSection.js.map @@ -1 +1 @@ -{"version":3,"file":"SpeciesSelectorMenuSection.js","sourceRoot":"","sources":["../../src/menu/SpeciesSelectorMenuSection.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"SpeciesSelectorMenuSection.js","sourceRoot":"","sources":["../../src/menu/SpeciesSelectorMenuSection.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/scss/components/_startMenu.scss b/dist/scss/components/_startMenu.scss index 634f32d..5fd659a 100644 --- a/dist/scss/components/_startMenu.scss +++ b/dist/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/dist/views/AOncoPrint.js b/dist/views/AOncoPrint.js index 81a0719..ab6cf85 100644 --- a/dist/views/AOncoPrint.js +++ b/dist/views/AOncoPrint.js @@ -139,7 +139,7 @@ export class AOncoPrint extends AView { // inject stats const base = params.querySelector('form') || params; base.insertAdjacentHTML('beforeend', `
-
+
`); let s = 0; const scaleElem = base.lastElementChild; diff --git a/src/common/common.ts b/src/common/common.ts index 4ddea5a..fd924a4 100644 --- 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 index 0e1d074..7168903 100644 --- 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 ``; + return ``; }); } @@ -136,7 +136,7 @@ export class SpeciesSelectorMenuSection implements IStartMenuSection { $enter.append('div').classed('body', true) .html(`
- + Loading...
`); diff --git a/src/scss/components/_startMenu.scss b/src/scss/components/_startMenu.scss index 634f32d..5fd659a 100644 --- 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 index 701da4e..b3106eb 100644 --- a/src/views/AOncoPrint.ts +++ b/src/views/AOncoPrint.ts @@ -179,7 +179,7 @@ export abstract class AOncoPrint extends AView { // inject stats const base = params.querySelector('form') || params; base.insertAdjacentHTML('beforeend', `
-
+
`); let s = 0; const scaleElem = base.lastElementChild!;