Commit 2c80c3b2 authored by Curtis Adam's avatar Curtis Adam

Update FontAwesome to 5.9

parent 410dcf84
......@@ -40,7 +40,6 @@ simple:katex
pfafman:filesaver
mizzao:user-status
harrison:papa-parse
fortawesome:fontawesome
alanning:roles
matb33:collection-hooks
aslagle:reactive-table
......
......@@ -57,7 +57,6 @@ facebook-oauth@1.6.0
fastclick@1.0.13
fetch@0.1.1
fezvrasta:bootstrap-material-design@0.5.9
fortawesome:fontawesome@4.7.0
fourseven:scss@4.12.0
geojson-utils@1.0.10
google-config-ui@1.0.1
......
let footerNavigation = {
"agb": "<i class='fa fa-legal'></i>&nbsp;",
"agb": "<i class='fa fa-gavel'></i>&nbsp;",
"backToHome": "<i class='fa fa-home'></i>&nbsp;",
"datenschutz": "<i class='fa fa-lock'></i>&nbsp;",
"demo": "<i class='fa fa-tv'></i>&nbsp;",
"faq": "<i class='fa fa-question-circle'></i>&nbsp;",
"help": "<i class='fa fa-medkit'></i>&nbsp;",
"impressum": "<i class='fa fa-legal'></i>&nbsp;",
"impressum": "<i class='fa fa-gavel'></i>&nbsp;",
"learning": "<i class='fa fa-graduation-cap'></i>&nbsp;",
"statistics": "<i class='fa fa-folder-open'></i>&nbsp;"
};
......
......@@ -85,7 +85,7 @@
<li>
<a class="{{#if isActiveRoute regex='admin_dashboard'}}active{{/if}}"
href="{{pathFor route='admin_dashboard'}}">
<i class="fa fa-dashboard"></i>
<i class="fa fa-tachometer-alt"></i>
<span>{{_ "admin.dashboard"}}</span>
</a>
</li>
......
......@@ -44,7 +44,7 @@ Template.admin_apiAccess.helpers({
sortable: false,
cellClass: 'edit',
fn: function (value) {
return new Spacebars.SafeString("<button id='" + value + "' class='exportAPICardset btn btn-xs btn-raised'><i class=\"fa fa-archive\"></i> <i class='fa fa-cloud-download'></i> " + TAPi18n.__('export.filename.export') + "</button>");
return new Spacebars.SafeString("<button id='" + value + "' class='exportAPICardset btn btn-xs btn-raised'><i class=\"fa fa-archive\"></i> <i class='fa fa-cloud-download-alt'></i> " + TAPi18n.__('export.filename.export') + "</button>");
}
},
{
......
......@@ -2,7 +2,7 @@
{{#unless isTranscriptRoute}}
<button id="cardSave"
class="btn btn-success btn-raised saveFirst col-xs-12 col-sm-4" {{disableIfOffline}}
tabindex="13"><i class="fa fa-floppy-o"></i> <i class="fa fa-plus"></i> {{_ "savecard"}}
tabindex="13"><i class="far fa-save"></i> <i class="fa fa-plus"></i> {{_ "savecard"}}
</button>
{{/unless}}
</template>
......@@ -2,6 +2,6 @@
{{#if gotMultipleCards}}
<button id="cardSaveNext"
class="btn btn-default btn-raised saveNext col-xs-12 col-sm-4" {{disableIfOffline}}
tabindex="15"><i class="fa fa-floppy-o"></i> <i class="fa fa-arrow-right"></i> {{_ "savecardNext"}}</button>
tabindex="15"><i class="far fa-save"></i> <i class="fa fa-arrow-right"></i> {{_ "savecardNext"}}</button>
{{/if}}
</template>
......@@ -2,6 +2,6 @@
<button id="cardSaveReturn"
class="btn {{#if
isEditCard}}btn-success{{else}}{{#if isTranscriptRoute}}btn-success{{else}}btn-default{{/if}}{{/if}} btn-raised save col-xs-12 col-sm-4" {{disableIfOffline}}
tabindex="14"><i class="fa fa-floppy-o"></i> <i class="fa fa-sign-out"></i> {{_ "savecardReturn"}}
tabindex="14"><i class="far fa-save"></i> <i class="fa fa-sign-out-alt"></i> {{_ "savecardReturn"}}
</button>
</template>
......@@ -20,7 +20,7 @@
</div>
<div class="panel-footer">
<button id="exportCSV" class="btn btn-success btn-raised"><span class="flex-content"><i class="glyphicon glyphicon-stats"></i>&nbsp;<i
class="fa fa-cloud-download"></i>&nbsp;{{_
class="fa fa-cloud-download-alt"></i>&nbsp;{{_
"box_export"}}</span></button>
</div>
</div>
......
......@@ -4,7 +4,7 @@
<tr>
<td colspan="2">
<a class="col-xs-12 btn btn-raised btn-block btn-success" data-toggle="modal"
data-target="{{#if isProfileCompleted}}#joinBonusModal{{else}}#profileIncompleteModal{{/if}}"><span class="flex-content"><i class="fa fa-sign-in"></i>&nbsp;{{_
data-target="{{#if isProfileCompleted}}#joinBonusModal{{else}}#profileIncompleteModal{{/if}}"><span class="flex-content"><i class="fa fa-sign-in-alt"></i>&nbsp;{{_
"bonus.info.button.join"}}</span></a>
</td>
</tr>
......@@ -13,7 +13,7 @@
<tr>
<td colspan="2">
<a class="col-xs-12 btn btn-raised btn-block btn-danger" data-toggle="modal"
data-target="#leaveBonusModal"><span class="flex-content"><i class="fa fa-sign-out"></i>&nbsp;{{_ "bonus.info.button.leave"}}</span></a>
data-target="#leaveBonusModal"><span class="flex-content"><i class="fa fa-sign-out-alt"></i>&nbsp;{{_ "bonus.info.button.leave"}}</span></a>
</td>
</tr>
{{/if}}
......
......@@ -6,7 +6,7 @@
<button id="selectLicense" class="btn btn-sm btn-raised selectLicenseBtn"
data-toggle="modal"
data-target="#selectLicenseModal" {{disableIfOffline}}>
<span class="flex-content"><i class="fa fa-cc"></i>&nbsp;{{_ "sidebar-nav.license"}}</span>
<span class="flex-content"><i class="far fa-closed-captioning"></i>&nbsp;{{_ "sidebar-nav.license"}}</span>
</button>
</div>
{{/unless}}
......
......@@ -6,7 +6,7 @@
{{#unless gotTranscriptBonus this._id}}
<div class="hidden-xs btn-group">
<button id="exportCardsBtn" class="btn btn-sm btn-raised exportCardsBtn"><span class="flex-content">{{{getCardsetIcons false}}}<i
class="fa fa-cloud-download"></i>&nbsp;{{_ "sidebar-nav.exportcard"}}</span>
class="fa fa-cloud-download-alt"></i>&nbsp;{{_ "sidebar-nav.exportcard"}}</span>
</button>
</div>
{{/unless}}
......
......@@ -7,7 +7,7 @@
<a href="#" id="importCardsBtn" class="btn btn-sm btn-raised importCardBtn"
data-toggle="modal"
data-target="#importModal"><span class="flex-content">{{{getCardsetIcons false}}}<i
class="fa fa-cloud-upload"></i>&nbsp;{{_ "sidebar-nav.importcard"}}</span></a>
class="fa fa-cloud-upload-alt"></i>&nbsp;{{_ "sidebar-nav.importcard"}}</span></a>
</div>
{{/unless}}
{{/unless}}
......
......@@ -4,7 +4,7 @@
<div class="modal-content">
<div class="modal-header">
<span class="modal-icon">
<i class="fa fa-archive"></i> <i class="fa fa-cloud-upload"></i>
<i class="fa fa-archive"></i> <i class="fa fa-cloud-upload-alt"></i>
</span>
{{> mainModalItemCloseIcon}}
<h4 id="importModalTitle" class="modal-title">{{_ "upload-form.upload-title"}}
......@@ -55,7 +55,7 @@
<button id="importCancel" class="btn btn-default btn-raised pull-left" data-dismiss="modal">{{_
"modal-dialog.cancel"}}</button>
{{else}}
<p><i class="fa fa-spin fa-refresh"></i>{{_ "upload-form.wait"}}</p>
<p><i class="fa fa-spin fa-sync"></i>{{_ "upload-form.wait"}}</p>
{{/unless}}
<br>
<br>
......
......@@ -4,7 +4,7 @@
<div class="modal-content modal-content-for-buttons xs-12">
<div class="modal-header">
<span class="modal-icon">
<i class="fa fa-sign-out"></i>
<i class="fa fa-sign-out-alt"></i>
</span>
{{> mainModalItemCloseIcon}}
<h4 id="leaveLearnPhaseTitle" class="modal-title">{{_ "confirm-leave-learnphase.title"}}
......
......@@ -4,7 +4,7 @@
<div class="modal-content modal-content-for-buttons xs-12">
<div class="modal-header">
<span class="modal-icon">
<i class="fa fa-sign-out"></i>
<i class="fa fa-sign-out-alt"></i>
</span>
{{> mainModalItemCloseIcon}}
<h4 id="leaveCardsetTitle" class="modal-title">{{_ "confirm-leave-cardset.title"}}
......
......@@ -5,7 +5,7 @@
{{#unless isIOS}}
<span class="btn-group">
<label class="btn btn-raised btn-import btn-success {{disableIfOffline}}">
<span class="flex-content">{{{getCardsetIcons false}}}<i class="fa fa-cloud-upload"></i>&nbsp;{{_ "import.cardset"}}</span> <input
<span class="flex-content">{{{getCardsetIcons false}}}<i class="fa fa-cloud-upload-alt"></i>&nbsp;{{_ "import.cardset"}}</span> <input
type="{{#if isProfileComplete}}file{{else}}button{{/if}}"
accept=".json" id="{{#if
isProfileComplete}}importCardset{{else}}importCardsetCompleteProfile{{/if}}"
......
......@@ -5,7 +5,7 @@
<div class="modal-content">
<div class="modal-header">
<span class="modal-icon">
<i class="fa fa-sign-out"></i>
<i class="fa fa-sign-out-alt"></i>
</span>
{{> mainModalItemCloseIcon}}
<h4 id="bonusFormModalTitle" class="modal-title">{{_ "confirm-form-learn.title"}}
......
......@@ -12,27 +12,27 @@ Template.filterItemSortResults.helpers({
getSortTopicIcon: function () {
switch (Filter.getActiveFilter().name) {
case 1:
return '<i class="fa fa-sort-alpha-asc cards-filter-element"></i>';
return '<i class="fa fa-sort-alpha-down cards-filter-element"></i>';
case-1:
return '<i class="fa fa-sort-alpha-desc cards-filter-element"></i>';
return '<i class="fa fa-sort-alpha-up-alt cards-filter-element"></i>';
}
},
getSortCreatedDateIcon: function () {
switch (Filter.getActiveFilter().date) {
case 1:
return '<i class="fa fa-sort-numeric-asc cards-filter-element"></i>';
return '<i class="fa fa-sort-numeric-down cards-filter-element"></i>';
case-1:
return '<i class="fa fa-sort-numeric-desc cards-filter-element"></i>';
return '<i class="fa fa-sort-numeric-up-alt cards-filter-element"></i>';
}
},
getSortUpdatedDateIcon: function () {
switch (Filter.getActiveFilter().dateUpdated) {
case 1:
return '<i class="fa fa-sort-numeric-asc cards-filter-element"></i>';
return '<i class="fa fa-sort-numeric-down cards-filter-element"></i>';
case-1:
return '<i class="fa fa-sort-numeric-desc cards-filter-element"></i>';
return '<i class="fa fa-sort-numeric-up-alt cards-filter-element"></i>';
}
}
......
......@@ -141,7 +141,7 @@
<div class="modal-content modal-content-for-buttons xs-12">
<div class="modal-header">
<span class="modal-icon">
<i class="fa fa-sign-in"></i>
<i class="fa fa-sign-in-alt"></i>
</span>
{{> mainModalItemCloseIcon}}
<h4 id="joinBonusTitle" class="modal-title">{{_ "bonus.form-join.title"}}
......@@ -168,7 +168,7 @@
<div class="modal-content modal-content-for-buttons xs-12">
<div class="modal-header">
<span class="modal-icon">
<i class="fa fa-sign-out"></i>
<i class="fa fa-sign-out-alt"></i>
</span>
{{> mainModalItemCloseIcon}}
<h4 id="leaveBonusTitle" class="modal-title">{{_ "bonus.form-leave.title"}}
......
......@@ -10,6 +10,7 @@ import {CardNavigation} from "../../api/cardNavigation";
import {MainNavigation} from "../../api/mainNavigation";
import {ServerStyle} from "../../api/styles.js";
import {AspectRatio} from "../../api/aspectRatio.js";
import "@fortawesome/fontawesome-free/css/all.min.css";
import "../welcome/welcome.js";
import "../wordcloud/wordcloud.js";
import "../impressum/impressum.js";
......
......@@ -2,18 +2,18 @@
<div id="markdeepNavigation">
{{#if gotMarkdeepHelp}}
<div class="btn-group">
<span class="btn fa fa-lightbulb-o card-button markdeep-help"
<span class="btn far fa-lightbulb card-button markdeep-help"
title="{{_ "card.tooltip.markdeepEditor.help"}}">&nbsp;{{_
"markdeep.editor.help"}}</span>
</div>
{{/if}}
<div class="btn-group">
{{#if isEditMode}}
<i class="markdeep-mobile-preview fa fa-mobile card-button {{#if
<i class="markdeep-mobile-preview fa fa-mobile-alt card-button {{#if
isMobilePreviewActive}}pressed{{/if}}"
title="{{_ "card.tooltip.markdeepEditor.mobilePreview"}}"></i>
{{#if isMobilePreviewActive}}
<i class="markdeep-rotate-mobile-preview fa fa-refresh card-button {{#if
<i class="markdeep-rotate-mobile-preview fa fa-sync card-button {{#if
isMobilePreviewRotated}}pressed{{/if}}"
title="{{_ "card.tooltip.markdeepEditor.rotateMobilePreview"}}"></i>
{{/if}}
......
......@@ -16,8 +16,8 @@
}
.markdeep-mobile-preview {
font-size: 28px !important;
padding: 0 10px !important;
font-size: 20px !important;
padding: 4px 10px !important;
}
.markdeep-rotate-mobile-preview {
......
......@@ -115,7 +115,7 @@
<button id="profileSave" type="button"
class="btn btn-success btn-raised pull-right"
{{disableIfOffline}}>
<i class="fa fa-floppy-o"></i> {{_ "profile.save"}}
<i class="far fa-save"></i> {{_ "profile.save"}}
</button>
{{/if}}
</form>
......
......@@ -110,19 +110,19 @@ Template.welcome.helpers({
loginButtons += '<button id="cas" class="btn btn-large btn-raised btn-block" title="' + TAPi18n.__("landingPage.login.tooltip.cas") + '"><span class="flex-content"><i class="fa fa-university" style="font-size:150%"></i>&nbsp;' + TAPi18n.__("landingPage.login.cas") + '</span></button>';
}
if (ServerStyle.isLoginEnabled("guest")) {
loginButtons += '<button id="guest" class="btn btn-large btn-raised btn-block" title="' + TAPi18n.__("landingPage.login.tooltip.guest") + '"><span class="flex-content"><i class="fa fa-smile-o" style="font-size:150%"></i>&nbsp;' + TAPi18n.__("landingPage.login.guest") + '</span></button>';
loginButtons += '<button id="guest" class="btn btn-large btn-raised btn-block" title="' + TAPi18n.__("landingPage.login.tooltip.guest") + '"><span class="flex-content"><i class="far fa-smile" style="font-size:150%"></i>&nbsp;' + TAPi18n.__("landingPage.login.guest") + '</span></button>';
}
if (ServerStyle.isLoginEnabled("pro")) {
loginButtons += '<button id="pro" class="btn btn-large btn-raised btn-block" data-toggle="modal" data-target="#underDevelopmentModal" title="' + TAPi18n.__("landingPage.login.tooltip.pro") + '"><span class="flex-content"><i class="fa fa-paypal" style="font-size:150%"></i>&nbsp;' + TAPi18n.__("landingPage.login.pro") + '</span></button>';
loginButtons += '<button id="pro" class="btn btn-large btn-raised btn-block" data-toggle="modal" data-target="#underDevelopmentModal" title="' + TAPi18n.__("landingPage.login.tooltip.pro") + '"><span class="flex-content"><i class="fab fa-paypal" style="font-size:150%"></i>&nbsp;' + TAPi18n.__("landingPage.login.pro") + '</span></button>';
}
if (ServerStyle.isLoginEnabled("facebook")) {
loginButtons += '<button id="facebook" class="btn btn-large btn-raised btn-block" title="' + TAPi18n.__("landingPage.login.tooltip.facebook") + '"><span class="flex-content"><i class="fa fa-facebook" style="font-size:150%"></i>&nbsp;' + TAPi18n.__("landingPage.login.facebook") + '</span></button>';
loginButtons += '<button id="facebook" class="btn btn-large btn-raised btn-block" title="' + TAPi18n.__("landingPage.login.tooltip.facebook") + '"><span class="flex-content"><i class="fab fa-facebook" style="font-size:150%"></i>&nbsp;' + TAPi18n.__("landingPage.login.facebook") + '</span></button>';
}
if (ServerStyle.isLoginEnabled("twitter")) {
loginButtons += '<button id="twitter" class="btn btn-large btn-raised btn-block" title="' + TAPi18n.__("landingPage.login.tooltip.twitter") + '"><span class="flex-content"><i class="fa fa-twitter" style="font-size:150%"></i>&nbsp;' + TAPi18n.__("landingPage.login.twitter") + '</span></button>';
loginButtons += '<button id="twitter" class="btn btn-large btn-raised btn-block" title="' + TAPi18n.__("landingPage.login.tooltip.twitter") + '"><span class="flex-content"><i class="fab fa-twitter" style="font-size:150%"></i>&nbsp;' + TAPi18n.__("landingPage.login.twitter") + '</span></button>';
}
if (ServerStyle.isLoginEnabled("google")) {
loginButtons += '<button id="google" class="btn btn-large btn-raised btn-block" title="' + TAPi18n.__("landingPage.login.tooltip.google") + '"><span class="flex-content"><i class="fa fa-google" style="font-size:150%"></i>&nbsp;' + TAPi18n.__("landingPage.login.google") + '</span></button>';
loginButtons += '<button id="google" class="btn btn-large btn-raised btn-block" title="' + TAPi18n.__("landingPage.login.tooltip.google") + '"><span class="flex-content"><i class="fab fa-google" style="font-size:150%"></i>&nbsp;' + TAPi18n.__("landingPage.login.google") + '</span></button>';
}
// Backdoor for login in acceptance tests
if (ServerStyle.isLoginEnabled("backdoor")) {
......
......@@ -19,6 +19,11 @@
}
}
},
"@fortawesome/fontawesome-free": {
"version": "5.9.0",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.9.0.tgz",
"integrity": "sha512-g795BBEzM/Hq2SYNPm/NQTIp3IWd4eXSH0ds87Na2jnrAUFX3wkyZAI4Gwj9DOaWMuz2/01i8oWI7P7T/XLkhg=="
},
"JSV": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
......
......@@ -19,7 +19,8 @@
"wordcloud": "^1.1.0",
"wtc-barfystars": "^0.2.2",
"wtc-controller-element": "^1.1.1",
"zingtouch": "^1.0.6"
"zingtouch": "^1.0.6",
"@fortawesome/fontawesome-free": "^5.9.0"
},
"version": "1.0.0",
"main": "index.js",
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment