Commit 4d866d6a authored by Curtis Adam's avatar Curtis Adam

Replace all glyphicons with FontAwesome alternatives in preparation for a Bootstrap 4 upgrade

parent 2c80c3b2
......@@ -953,28 +953,28 @@ $themes: (
border-color: $button_background_hover !important;
}
.material-icons.pressed, .fa.pressed, .glyphicon.pressed, .card-button.pressed, .material-icons.pressed:hover, .glyphicon.pressed:hover, .card-button.pressed:hover,
.material-icons.pressed:focus, .glyphicon.pressed:focus, .card-button.pressed:focus {
.material-icons.pressed, .fa.pressed, .card-button.pressed, .material-icons.pressed:hover, .card-button.pressed:hover,
.material-icons.pressed:focus, .card-button.pressed:focus {
background-color: lighten($thm_gray, 10%);
color: $white;
}
.glyphicon-log-out.pressed, .glyphicon-fullscreen.pressed {
.fa-sign-out-alt.pressed, .toggleFullscreen.pressed {
background-color: $thm_orange;
border-color: $thm_orange;
color: $white;
}
.glyphicon-log-out.pressed:hover, .glyphicon-fullscreen.pressed:hover,
.glyphicon-log-out.pressed:focus, .glyphicon-fullscreen.pressed:focus {
.fa-sign-out-alt.pressed:hover, .toggleFullscreen.pressed:hover,
.fa-sign-out-alt.pressed:focus, .toggleFullscreen.pressed:focus {
background-color: $button_background_hover;
border-color: $button_background_hover;
color: $button_text_hover;
}
#markdeepNavigation {
.material-icons.pressed, .fa.pressed, .glyphicon.pressed, .card-button.pressed, .material-icons.pressed:hover, .glyphicon.pressed:hover, .card-button.pressed:hover,
.material-icons.pressed:focus, .glyphicon.pressed:focus, .card-button.pressed:focus {
.material-icons.pressed, .fa.pressed, .card-button.pressed, .material-icons.pressed:hover,
.material-icons.pressed:focus, .card-button.pressed:focus {
background-color: $thm_orange;
border-color: $thm_orange;
color: $white;
......@@ -1264,7 +1264,7 @@ $themes: (
color: $cardset_footer_navigation_presentation_text_hover !important;
}
.glyphicon-fullscreen {
.toggleFullscreen {
background-color: $cardset_footer_navigation_presentation_background;
color: $cardset_footer_navigation_presentation_text;
}
......@@ -2701,7 +2701,7 @@ $themes: (
color: $storm_dust_approx !important;
}
.glyphicon-plus {
.fa-plus {
color: $white !important;
}
......@@ -3464,7 +3464,7 @@ $themes: (
background-color: $card_navigation_active_background_hover !important
}
.modal-icon, .modal-icon .fa, .modal-icon .glyphicon {
.modal-icon, .modal-icon .fa, .modal-icon {
color: $modal_icon !important;
}
......
......@@ -12,13 +12,13 @@ export let CardsetVisuals = class CardsetVisuals {
static changeCollapseElement (elementId) {
let iconId = elementId + "Icon";
if ($(iconId).hasClass("glyphicon-collapse-down")) {
$(iconId).removeClass("glyphicon-collapse-down");
$(iconId).addClass("glyphicon-collapse-up");
if ($(iconId).hasClass("fa-caret-square-down")) {
$(iconId).removeClass("fa-caret-square-down");
$(iconId).addClass("fa-caret-square-up");
$(elementId).slideDown();
} else {
$(iconId).removeClass("glyphicon-collapse-up");
$(iconId).addClass("glyphicon-collapse-down");
$(iconId).removeClass("fa-caret-square-up");
$(iconId).addClass("fa-caret-square-down");
$(elementId).slideUp();
}
}
......
......@@ -11,7 +11,7 @@ let footerNavigation = {
};
let landingPageNavigation = {
"mobileInfo": "<i class='glyphicon glyphicon-info-sign'></i>",
"mobileInfo": "<i class='fas fa-info-circle'></i>",
"wordcloud": "<i class='fa fa-cloud'></i>"
};
......@@ -63,7 +63,7 @@ let labels = {
let miscNavigation = {
"cardset": "<i class='fa fa-archive'></i>&nbsp;",
"repetitorium": "<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-archive'></i>&nbsp;<i class='fa fa-ellipsis-h'></i>&nbsp;",
"progress": "<i class='glyphicon glyphicon-stats'></i>&nbsp;",
"progress": "<i class='far fa-chart-bar'></i>&nbsp;",
"toggleImpressum": "<i class='fa fa-medkit'></i>&nbsp;"
};
......
......@@ -57,7 +57,7 @@
class="btn btn-info"
data-toggle="collapse" data-target="#thm-top-navigation">
{{_ "notifications.viewAll"}} <i
class="glyphicon glyphicon-circle-arrow-right"></i>
class="fas fa-arrow-alt-circle-right"></i>
</a>
</div>
</ul>
......@@ -69,7 +69,7 @@
{{getUsername}}</a></li>
{{/if}}
<li><a href="#" id="logout_admin"><i
class="glyphicon glyphicon-log-out" style="font-size:150%; color:orange"></i></a>
class="fas fa-sign-out-alt" style="font-size:150%; color:orange"></i></a>
</li>
</ul>
</div>
......@@ -99,7 +99,7 @@
<li>
<a class="{{#if isActiveRoute regex='admin_learningStatistics'}}active{{/if}}"
href="{{pathFor route='admin_learningStatistics'}}">
<i class="glyphicon glyphicon-stats"></i>
<i class="far fa-chart-bar"></i>
<span>{{_ "admin.learningStatistics"}}</span>
</a>
</li>
......
......@@ -52,7 +52,7 @@ Template.admin_apiAccess.helpers({
label: TAPi18n.__('admin.delete'),
sortable: false,
fn: function (value) {
return new Spacebars.SafeString("<a id='" + value + "' class='deleteApiAccessAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.api.delete') + "' data-toggle='modal' data-target='#admin_deleteApiAccessForm'><i class='glyphicon glyphicon-ban-circle'></i></a>");
return new Spacebars.SafeString("<a id='" + value + "' class='deleteApiAccessAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.api.delete') + "' data-toggle='modal' data-target='#admin_deleteApiAccessForm'><i class='fas fa-ban'></i></a>");
}
}
]
......
......@@ -167,7 +167,7 @@ Template.admin_notifications.helpers({
cellClass: 'delete',
sortable: false,
fn: function () {
return new Spacebars.SafeString("<a class='deleteNotificationAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.deletenotification') + "' data-toggle='modal' data-target='#notificationConfirmModalAdmin'><i class='glyphicon glyphicon-ban-circle'></i></a>");
return new Spacebars.SafeString("<a class='deleteNotificationAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.deletenotification') + "' data-toggle='modal' data-target='#notificationConfirmModalAdmin'><i class='fas fa-ban'></i></a>");
}
}
]
......@@ -254,7 +254,7 @@ Template.admin_notifications.helpers({
cellClass: 'delete',
sortable: false,
fn: function () {
return new Spacebars.SafeString("<a class='deleteNotificationAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.deletenotification') + "' data-toggle='modal' data-target='#notificationConfirmModalAdmin'><i class='glyphicon glyphicon-ban-circle'></i></a>");
return new Spacebars.SafeString("<a class='deleteNotificationAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.deletenotification') + "' data-toggle='modal' data-target='#notificationConfirmModalAdmin'><i class='fas fa-ban'></i></a>");
}
}
]
......@@ -373,7 +373,7 @@ Template.admin_notifications.helpers({
cellClass: 'delete',
sortable: false,
fn: function () {
return new Spacebars.SafeString("<a class='deleteNotificationAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.deletenotification') + "' data-toggle='modal' data-target='#notificationConfirmModalAdmin'><i class='glyphicon glyphicon-ban-circle'></i></a>");
return new Spacebars.SafeString("<a class='deleteNotificationAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.deletenotification') + "' data-toggle='modal' data-target='#notificationConfirmModalAdmin'><i class='fas fa-ban'></i></a>");
}
}
]
......@@ -391,7 +391,7 @@ Template.admin_notifications.events({
var cardset = Cardsets.findOne({_id: id});
var user = Meteor.users.findOne({_id: id});
if (event.target.className === "deleteCardsetAdmin btn btn-xs btn-default" || event.target.className === "glyphicon glyphicon-ban-circle") {
if (event.target.className === "deleteCardsetAdmin btn btn-xs btn-default" || event.target.className === "fas fa-ban") {
Session.set('notificationId', notification._id);
}
if (event.target.className == "mailToReceiverAdmin btn btn-xs btn-default" ||
......
......@@ -129,7 +129,7 @@ Template.admin_users.helpers({
cellClass: 'edit',
sortable: false,
fn: function (value) {
return new Spacebars.SafeString("<a id='linkToAdminUser' class='editUserAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.edituser') + "' data-userid='" + value + "'><span class='flex-content'><i class='glyphicon glyphicon-edit'></i></span></a>");
return new Spacebars.SafeString("<a id='linkToAdminUser' class='editUserAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.edituser') + "' data-userid='" + value + "'><span class='flex-content'><i class='fas fa-edit'></i></span></a>");
}
},
{
......@@ -141,7 +141,7 @@ Template.admin_users.helpers({
if ((Meteor.user()._id !== value) &&
(!Roles.userIsInRole(value, 'admin')))
{
return new Spacebars.SafeString("<a class='deleteUserAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.deleteuser') + "' data-toggle='modal' data-target='#userConfirmModalAdmin'><span class='flex-content'><i class='glyphicon glyphicon-ban-circle'></i></span></a>");
return new Spacebars.SafeString("<a class='deleteUserAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.deleteuser') + "' data-toggle='modal' data-target='#userConfirmModalAdmin'><span class='flex-content'><i class='fas fa-ban'></i></span></a>");
}
}
......@@ -156,7 +156,7 @@ Template.admin_users.events({
event.preventDefault();
var user = this;
if (event.target.className === "deleteUserAdmin btn btn-xs btn-default" || event.target.className === "glyphicon glyphicon-ban-circle") {
if (event.target.className === "deleteUserAdmin btn btn-xs btn-default" || event.target.className === "fas fa-ban") {
Session.set('userId', user._id);
}
if (event.target.className === "mailtoUserAdmin btn btn-xs btn-default" || event.target.className === "fa fa-envelope") {
......
......@@ -100,12 +100,12 @@ Template.admin_user.helpers({
sortable: false,
cellClass: 'edit',
fn: function (value) {
return new Spacebars.SafeString("<a id='linkToAdminUserCardset' class='editCardsetAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.editcardset') + "' data-cardsetid='" + value + "'><i class='glyphicon glyphicon-edit'></i></a>");
return new Spacebars.SafeString("<a id='linkToAdminUserCardset' class='editCardsetAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.editcardset') + "' data-cardsetid='" + value + "'><i class='fas fa-edit'></i></a>");
}
},
{
key: 'delete', label: TAPi18n.__('admin.delete'), sortable: false, fn: function () {
return new Spacebars.SafeString("<a class='deleteCardsetAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.deletecardset') + "' data-toggle='modal' data-target='#cardsetConfirmModalUserAdmin'><i class='glyphicon glyphicon-ban-circle'></i></a>");
return new Spacebars.SafeString("<a class='deleteCardsetAdmin btn btn-xs btn-default' title='" + TAPi18n.__('admin.deletecardset') + "' data-toggle='modal' data-target='#cardsetConfirmModalUserAdmin'><i class='fas fa-ban'></i></a>");
}
}
]
......@@ -258,7 +258,7 @@ Template.admin_user.events({
event.preventDefault();
var cardset = this;
if (event.target.className === "deleteCardsetAdmin btn btn-xs btn-default" || event.target.className === "glyphicon glyphicon-ban-circle") {
if (event.target.className === "deleteCardsetAdmin btn btn-xs btn-default" || event.target.className === "fas fa-ban") {
Session.set('cardsetId', cardset._id);
}
},
......
......@@ -4,7 +4,7 @@
<div class="modal-content">
<div class="modal-header">
<span class="modal-icon">
<span class="glyphicon glyphicon-duplicate"></span>
<span class="fas fa-copy"></span>
</span>
{{> mainModalItemCloseIcon}}
<h4 id="showHintTitle" class="modal-title">{{_ "copyCardTitle"}}
......
......@@ -65,11 +65,11 @@
{{#unless cardCountOne}}
<a id="leftCarouselControl" class="left carousel-control" href="#cardCarousel"
data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span>
<span class="fas fa-angle-left"></span>
</a>
<a id="rightCarouselControl" class="right carousel-control" href="#cardCarousel"
data-slide="next">
<span class="glyphicon glyphicon-chevron-right"></span>
<span class="fa fa-angle-right"></span>
</a>
{{/unless}}
{{/if}}
......
<template name="cardSidebarItemBackToCardset">
<span class="glyphicon glyphicon-log-out card-button cardHeaderItem backToCardset pressed"
<span class="fas fa-sign-out-alt card-button cardHeaderItem backToCardset pressed"
data-type="cardNavigation"
title="{{_ "card.tooltip.backToCardset"}}"></span>
</template>
<template name="cardSidebarItemCopy">
{{#if canCopyCard this.cardset_id}}
{{#if isCardNavigationVisible}}
<span class="copyCard glyphicon glyphicon-duplicate card-button cardHeaderItem"
<span class="copyCard fas fa-copy card-button cardHeaderItem"
data-id="{{_id}}"
data-type="cardNavigation"></span>
{{else}}
<span class="copyCard glyphicon glyphicon-duplicate card-button cardHeaderItem"
<span class="copyCard fas fa-copy card-button cardHeaderItem"
data-id="{{_id}}"
data-type="cardNavigation" disabled></span>
{{/if}}
......
......@@ -2,10 +2,10 @@
{{#unless isDemo}}
{{#if canEditCard}}
{{#if isCardNavigationVisible}}
<button class="hidden-xs editCard glyphicon glyphicon-edit card-button cardHeaderItem"
<button class="hidden-xs editCard fas fa-edit card-button cardHeaderItem"
data-type="cardNavigation" title="{{_ "card.tooltip.edit"}}"></button>
{{else}}
<button class="hidden-xs editCard glyphicon glyphicon-edit card-button cardHeaderItem"
<button class="hidden-xs editCard fas fa-edit card-button cardHeaderItem"
data-type="cardNavigation" title="{{_ "card.tooltip.edit"}}" disabled></button>
{{/if}}
{{/if}}
......
<template name="cardSidebarItemEndPresentation">
<span class="glyphicon glyphicon-log-out card-button cardHeaderItem endPresentation pressed"
<span class="fas fa-sign-out-alt card-button cardHeaderItem endPresentation pressed"
data-type="cardNavigation"
title="{{_ "card.tooltip.endPresentation"}}"></span>
</template>
<template name="cardSidebarItemSwapQuestionAnswer">
{{#if gotCardTypesWithSwapAnswerQuestionButton}}
<i class="card-button cardHeaderItem fa swapQuestionAnswer btn fa fa-exchange {{#if
<i class="card-button cardHeaderItem swapQuestionAnswer btn fas fa-exchange-alt {{#if
questionAnswerSwapped}}pressed{{/if}}"
data-type="cardNavigation"
title="{{getTooltip}}"></i>
......
<template name="cardSidebarItemToggleFullscreen">
<span class="toggleFullscreen fullscreen glyphicon glyphicon-fullscreen card-button cardHeaderItem {{#if
<span class="toggleFullscreen fullscreen fas fa-expand-arrows-alt card-button cardHeaderItem {{#if
fullscreenActive}}pressed{{/if}}"
data-type="cardNavigation"
title="{{_ "card.tooltip.fullscreen"}}"></span>
......
......@@ -9,7 +9,7 @@
<a href="#" class="filterCardType cards-filter-element"
data-id="{{this.cardType}}">{{getCardTypeLongName}}
{{#if resultsFilterCardType this.cardType}}
<span class="glyphicon glyphicon-filter cards-filter-element"></span>
<span class="fas fa-filter cards-filter-element"></span>
{{/if}}
</a>
</li>
......
......@@ -306,7 +306,7 @@ $padding-card-list-row: 8px;
}
}
.glyphicon-collapse-down, .glyphicon-collapse-up {
.fa-caret-square-down, .fa-caret-square-up {
font-size: 18px;
}
......@@ -582,7 +582,7 @@ th .field-tip {
cursor: default !important;
}
#exportCSV .glyphicon {
#exportCSV {
margin-top: -6px !important;
}
......
......@@ -19,7 +19,7 @@
</div>
</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
<button id="exportCSV" class="btn btn-success btn-raised"><span class="flex-content"><i class="far fa-chart-bar"></i>&nbsp;<i
class="fa fa-cloud-download-alt"></i>&nbsp;{{_
"box_export"}}</span></button>
</div>
......@@ -79,7 +79,7 @@
</td>
<td>
<a data-id="{{this.user_id}}" class="detailed-stats"><i
class="glyphicon glyphicon glyphicon-stats"
class="far fa-chart-bar"
data-id="{{this.user_id}}"
title="{{_ "leitnerProgress.tooltip.graph"}}"></i></a>
</td>
......
......@@ -41,7 +41,7 @@
data-card-type="{{this.cardType}}">
{{cleanContent getText}}
</div>
<i class="glyphicon glyphicon-menu-right pull-right" data-id="{{this._id}}"
<i class="fas fa-chevron-right pull-right" data-id="{{this._id}}"
data-card-type="{{this.cardType}}"></i>
</td>
</tr>
......
<template name="bonusInfoBox">
<div id="collapseLearningPhaseInfoButton" class="col-xs-12 card card-block collapseButton">
<strong>{{_ "set-list.learnphaseInfo"}}</strong>
<i id="collapseLearningPhaseInfoIcon" class="glyphicon glyphicon-collapse-down pull-right"></i>
<i id="collapseLearningPhaseInfoIcon" class="far fa-caret-square-down pull-right"></i>
</div>
<div class="collapse" id="collapseLearningPhaseInfo">
<div class="card card-block">
......
<template name="bonusTranscriptInfoBox">
<div id="collapseBonusTranscriptInfoButton" class="col-xs-12 card card-block collapseButton">
<strong>{{_ "transcriptForm.info.title"}}</strong>
<i id="collapseBonusTranscriptInfoIcon" class="glyphicon glyphicon-collapse-down pull-right"></i>
<i id="collapseBonusTranscriptInfoIcon" class="far fa-caret-square-down pull-right"></i>
</div>
<div class="collapse" id="collapseBonusTranscriptInfo">
<div class="card card-block">
......
......@@ -3,7 +3,7 @@
class="col-xs-12 card btn-raised {{getColors}} collapseButton collapsed">
<strong>{{#if this.shuffled}}{{_ "set-list.cardsetInfoRepetitorium"}}{{else}}{{_
"set-list.cardsetInfoStatic"}}{{/if}}</strong>
<i id="collapseCardsetInfoIcon" class="glyphicon glyphicon-collapse-down pull-right"></i>
<i id="collapseCardsetInfoIcon" class="far fa-caret-square-down pull-right"></i>
</div>
<div class="collapse" id="collapseCardsetInfo">
<div class="card card-block">
......
......@@ -13,7 +13,7 @@
<ul class="dropdown-menu">
{{#if learningActive}}
<li id="showStats" class="showStatsList">
<i class="glyphicon glyphicon-stats"></i> {{_ "box_stats"}}
<i class="far fa-chart-bar"></i> {{_ "box_stats"}}
</li>
<li id="manageBonus"
class="manageLearn manageLearningList learnBoxActive"
......
......@@ -13,7 +13,7 @@
<li id="learnMemo" class="wozniakList" {{disableIfOffline}}><i class="fa fa-graduation-cap"></i> {{_
"memo"}}</li>
{{#if learningLeitner}}
<li id="leitnerProgress" class="progressList" {{disableIfOffline}}><i class="glyphicon glyphicon-stats"></i> {{_
<li id="leitnerProgress" class="progressList" {{disableIfOffline}}><i class="far fa-chart-bar"></i> {{_
"admin.myProgress"}}</li>
{{/if}}
{{#if learningLeitner}}
......
......@@ -4,7 +4,7 @@
<div class="panel-body">
<span class="nav-header-cardset">{{_ "sidebar-nav.preview"}}<a id="showPreviewHelp" href="#"
class="field-tip">
<i class="glyphicon glyphicon-info-sign"></i>
<i class="fas fa-info-circle"></i>
</a></span>
<form role="form">
<div class="">
......
......@@ -4,7 +4,7 @@
<a class="resultNavigationElement bonusLeitnerProgress" data-id="{{this._id}}"
title="{{_
"admin.myProgress"}}">
<i class="glyphicon glyphicon glyphicon-stats" data-id="{{this._id}}"></i>
<i class="far fa-chart-bar" data-id="{{this._id}}"></i>
</a>
{{/if}}
{{/if}}
......
<template name="filterIndexItemBottomCollapse">
<a class="collapseCardsetInfoButton pull-right" data-id="#collapseCardsetInfo{{this.index}}">
<i class="glyphicon glyphicon-collapse-down pull-right collapseCardsetInfoIcon"
<i class="far fa-caret-square-down pull-right collapseCardsetInfoIcon"
data-id="#collapseCardsetInfo{{this.index}}"></i>
</a>
</template>
......@@ -9,13 +9,13 @@ import {Template} from "meteor/templating";
Template.filterIndexItemBottomCollapse.events({
'click .collapseCardsetInfoButton': function (event) {
if ($(event.target).hasClass('glyphicon-collapse-up')) {
$(event.target).addClass('glyphicon-collapse-down').removeClass('glyphicon-collapse-up');
if ($(event.target).hasClass('fa-caret-square-up')) {
$(event.target).addClass('fa-caret-square-down').removeClass('fa-caret-square-up');
$($(event.target).data('id')).hide('slide', {direction: "up"}, 'slow');
} else {
$("[id^=collapseCardsetInfo]").hide('slide', {direction: "up"}, 'fast');
$(".collapseCardsetInfoIcon").addClass('glyphicon-collapse-down').removeClass('glyphicon-collapse-up');
$(event.target).addClass('glyphicon-collapse-up').removeClass('glyphicon-collapse-down');
$(".collapseCardsetInfoIcon").addClass('fa-caret-square-down').removeClass('fa-caret-square-up');
$(event.target).addClass('fa-caret-square-up').removeClass('fa-caret-square-down');
$($(event.target).data('id')).show('slide', {direction: "up"}, 'slow', function () {
$('body, html').animate({scrollTop: ($(event.target).offset().top - ($('.resultItemHeaderWrapper').height() + $('.thm-header').height() - 25))}, 'slow');
});
......
......@@ -6,7 +6,7 @@
"cardset.tooltip.editCardset"}}{{/if}}' data-id="{{this._id}}"
data-toggle="modal"
data-target="#setCardsetFormModal">
<i class="glyphicon glyphicon-edit" data-id="{{this._id}}"></i>
<i class="fas fa-edit" data-id="{{this._id}}"></i>
</a>
{{#unless isTranscriptRoute}}
{{#if gotBackendAccess}}
......@@ -20,7 +20,7 @@
{{#if isRepetitorienFilterIndex}}
<a class="resultNavigationElement editShuffle"
title='{{_ "set-list.shuffleCardsets"}}' data-id="{{this._id}}">
<i class="glyphicon glyphicon-plus editShuffle" data-id="{{this._id}}"></i>
<i class="fas fa-plus editShuffle" data-id="{{this._id}}"></i>
</a>
{{/if}}
{{/unless}}
......
......@@ -3,7 +3,7 @@
{{#unless isBonusTranscriptsRouteAndDeadlineExpired}}
<a class="resultNavigationElement editCard hidden-xs" {{disableIfOffline}}
title='{{_ "transcriptForm.index.tooltip.edit"}}' data-id="{{this._id}}">
<i class="glyphicon glyphicon-edit" data-id="{{this._id}}"></i>
<i class="fas fa-edit" data-id="{{this._id}}"></i>
</a>
{{/unless}}
{{/unless}}
......
......@@ -2,6 +2,6 @@
<a class="resultNavigationElement deleteLearned" {{disableIfOffline}}
title='{{_ "confirm-form-learn.title"}}' data-toggle="modal" data-target="#bonusFormModal"
data-id="{{this._id}}">
<i class="glyphicon glyphicon-log-out" data-id="{{this._id}}"></i>
<i class="fas fa-sign-out-alt" data-id="{{this._id}}"></i>
</a>
</template>
<template name="filterIndexItemBottomWorkloadProgress">
<a class="resultNavigationElement" href="progress/{{this._id}}/{{currentUser._id}}" title="{{_
"admin.myProgress"}}">
<i class="glyphicon glyphicon glyphicon-stats"></i>
<i class="far fa-chart-bar"></i>
</a>
</template>
......@@ -67,7 +67,7 @@
<a href="#" class="showMoreResultsContainer" title="{{_ "set-list.moreResults"}}">
<div id="showMoreResults" class="showMoreResults col-xs-12 panel panel-default">
<div class="flex-content">
<div class="scrollArrow col-xs-12 infinite-scroll-icon glyphicon glyphicon-chevron-down">
<div class="scrollArrow col-xs-12 infinite-scroll-icon fas fa-angle-down">
<span class="resultCounter"><span class="visible-xs">{{getCurrentResults true}}</span><span class="hidden-xs">{{getCurrentResults false}}</span></span>
</div>
</div>
......
......@@ -258,7 +258,7 @@ body {
text-transform: unset !important;
}
.btn-success, .btn-danger, .btn-warning, .btn-info, .label-bonus, .learnBtn, .bonusBtn, .presentationBtn, .label-private, .label-edu, .label-free, .label-pro, #filter-nav-wrapper .navbar-text, #filter-nav-wrapper .dropdown-toggle, .panel-heading.info-tab, #collapseLearningPhaseInfoButton, #collapseBonusTranscriptInfoButton, .deleteAllCardsBtn, .newCardBtn, .markdeep-help, .markdeep-translate.pressed, .pomodoroTimer h2, #searchResults h4, .footer.icon-container .glyphicon {
.btn-success, .btn-danger, .btn-warning, .btn-info, .label-bonus, .learnBtn, .bonusBtn, .presentationBtn, .label-private, .label-edu, .label-free, .label-pro, #filter-nav-wrapper .navbar-text, #filter-nav-wrapper .dropdown-toggle, .panel-heading.info-tab, #collapseLearningPhaseInfoButton, #collapseBonusTranscriptInfoButton, .deleteAllCardsBtn, .newCardBtn, .markdeep-help, .markdeep-translate.pressed, .pomodoroTimer h2, #searchResults h4 {
text-shadow: $default_text_shadow;
}
......@@ -728,7 +728,7 @@ th {
padding-right: 0;
}
td .fa, .glyphicon {
td .fa {
margin-left: 5px;
}
}
......
......@@ -4,7 +4,7 @@
<div class="modal-content hintContent">
<div class="modal-header">
<span class="modal-icon">
<i class="glyphicon glyphicon-transfer"></i>
<i class="fas fa-exchange-alt"></i>
</span>
{{> mainModalItemCloseIcon}}
<h4 id="connectionStatusTitle" class="modal-title">{{_ "connection.title"
......
......@@ -26,7 +26,7 @@ $navbar_all_border_width: 3px;
bottom: 10px;
left: 10px;
font-size: 32px;
.glyphicon-info-sign:before {
.fa-info-circle:before {
font-size: 50px;
z-index: 1002 !important;
}
......
<template name="mainNavigationTopItemLogout">
<li id="navbar-logout"><a href="#" class="logout logout-main"><span
class="hidden-xs"><i
class="glyphicon glyphicon-log-out" style="font-size:135%; color:orange"></i></span><span
class="fas fa-sign-out-alt" style="font-size:135%; color:orange"></i></span><span
class="visible-xs"><i
class="glyphicon glyphicon-log-out"></i> {{_
class="fas fa-sign-out-alt"></i> {{_
"profile.logout"}}</span>
</a></li>
</template>
<template name="mainNavigationTopItemProfileItemLogout">
<tr class="hidden-xs logout logout-dropdown">
<td><a class="dropdown-item" href="#"><i
class="glyphicon glyphicon-log-out"></i></a></td>
class="fas fa-sign-out-alt"></i></a></td>
<td><a class="dropdown-item" href="#">{{_
"profile.logout"}}</a></td>
</tr>
......
......@@ -26,7 +26,7 @@
</div>
{{#if searchActive}}
<div class="clearSearch cards-search-element">
<i class="glyphicon glyphicon-remove-circle pull-left cards-search-element"></i>
<i class="far fa-times-circle pull-left cards-search-element"></i>
</div>
{{/if}}
</div>
......
......@@ -26,7 +26,7 @@
<i class="card-button fa fa-eraser markdeep-background-style {{#if
isAlternativeBackgroundStyle}}pressed{{/if}}"
title="{{_ "card.tooltip.markdeepEditor.style"}}"></i>
<i class="card-button glyphicon glyphicon-fullscreen markdeep-fullscreen {{#if
<i class="card-button fa-expand-arrows-alt markdeep-fullscreen {{#if
isFullscreenActive}}pressed{{/if}}" title="{{_ "card.tooltip.markdeepEditor.fullscreen"}}"></i>
{{/if}}
</div>
......
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