Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

Upgrade to Font Awesome v5 #148

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dist/menu/SpeciesSelectorMenuSection.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/menu/SpeciesSelectorMenuSection.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dist/scss/components/_startMenu.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/views/AOncoPrint.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
1 change: 0 additions & 1 deletion src/common/common.ts
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();
}
}

4 changes: 2 additions & 2 deletions src/menu/SpeciesSelectorMenuSection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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>`;
});

}
Expand Down Expand Up @@ -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>
`);
Expand Down
6 changes: 3 additions & 3 deletions src/scss/components/_startMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
2 changes: 1 addition & 1 deletion src/views/AOncoPrint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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!;
Expand Down