Skip to content

Commit

Permalink
Upgrade font awesome library #2585 (#2621)
Browse files Browse the repository at this point in the history
* Upgrade font awesome library #2585
  • Loading branch information
anton-abushkevich committed Mar 1, 2022
1 parent 160f039 commit 6844781
Show file tree
Hide file tree
Showing 51 changed files with 9,595 additions and 2,713 deletions.
2 changes: 1 addition & 1 deletion js/components/checks/const.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ define(['knockout'], function(ko){

const WarningSeverityIcon = {
INFO: 'fa-info',
WARNING: 'fa-warning',
WARNING: 'fa-exclamation-triangle',
CRITICAL: 'fa-times-circle',
};

Expand Down
2 changes: 1 addition & 1 deletion js/components/checks/warnings-badge.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<span class="badge" data-bind="visible: isDiagnosticsRunning()"><i class="fa fa-circle-o-notch fa-spin"></i></span>
<span class="badge" data-bind="visible: isDiagnosticsRunning()"><i class="fa fa-circle-notch fa-spin"></i></span>
<div data-bind="css: classes(), visible: !isDiagnosticsRunning() && warningsTotal() > 0">
<span data-bind="attr: { class: warningClass }, text: warningsTotal"></span>
</div>
2 changes: 1 addition & 1 deletion js/components/checks/warnings.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
color: #0022ee;
}

.fa-warning {
.fa-exclamation-triangle {
color: #dd9900;
}

Expand Down
2 changes: 1 addition & 1 deletion js/components/conceptsetmodal/conceptSetSaveModal.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
data: $component
}">
<div class="concept-set-dialog modal-body">
<span class="help-block" data-bind="hidden: isNameUnique"><i class="fa fa-warning"></i> <span data-bind="text: ko.i18n('components.conceptSetSaveModal.conceptSetAlreadyExists', 'Concept Set already exists')"></span></span>
<span class="help-block" data-bind="hidden: isNameUnique"><i class="fa fa-exclamation-triangle"></i> <span data-bind="text: ko.i18n('components.conceptSetSaveModal.conceptSetAlreadyExists', 'Concept Set already exists')"></span></span>
<div class="concept-set-form">
<label data-bind="text: ko.i18n('components.conceptSetSaveModal.conceptSetNameLabel', 'Concept Set Name:')"></label>
<input type="text" data-bind="textInput: conceptSetName, placeholder: ko.i18n('components.conceptSetSaveModal.conceptSetNamePlaceholder', 'Concept Set Name')" />
Expand Down
4 changes: 2 additions & 2 deletions js/components/userbar/user-bar.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!-- /ko -->
<div data-bind="if:appConfig.userAuthenticationEnabled===true" style="display: inline-block;">
<div data-bind="title: ko.i18n('components.userBar.signin', 'Sign In'), if: !isLoggedIn() || tokenExpired()">
<span class="pipe">|</span><a data-bind="click: function () { $component.signInOpened(true) }"><i class="fa fa-sign-in"></i><span data-bind="text: ko.i18n('components.userBar.signin', 'Sign In')"></span></a>
<span class="pipe">|</span><a data-bind="click: function () { $component.signInOpened(true) }"><i class="fa fa-sign-in-alt"></i><span data-bind="text: ko.i18n('components.userBar.signin', 'Sign In')"></span></a>
</div>
<div data-bind="title: ko.i18n('components.userBar.signout', 'Sign Out'), if: isLoggedIn() && !tokenExpired()">
<span class="pipe">|</span><a data-bind="click: function () { $component.signInOpened(true) }"><strong data-bind="text: fullName"></strong><i class="fa fa-user-circle fa-lg" aria-hidden="true"></i></a>
Expand All @@ -31,7 +31,7 @@
if:appConfig.userAuthenticationEnabled === true,
showModal: signInOpened,
modifiers: ['sm'],
iconClass: 'fa fa-sign-in',
iconClass: 'fa fa-sign-in-alt',
title: ko.i18n('components.userBar.signin', 'Sign In'),
}">
<welcome></welcome>
Expand Down
2 changes: 1 addition & 1 deletion js/components/versions/versions.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function (

d.editComment = () => this.editComment(d);
return comment ?
`${comment} <a data-bind="css: '${this.classes('action-link')}', click: editComment"><i class="fa fa-pencil"></i></a>` :
`${comment} <a data-bind="css: '${this.classes('action-link')}', click: editComment"><i class="fa fa-pencil-alt"></i></a>` :
`<a data-bind="css: '${this.classes('action-link')}', click: editComment, text: ko.i18n('components.versions.addComment', 'Add comment')"></a>`;
}
},
Expand Down
14 changes: 7 additions & 7 deletions js/config/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,37 +22,37 @@ define(function () {
"name": "Windows",
"url": "user/login/windows",
"ajax": true,
"icon": "fa fa-windows"
"icon": "fab fa-windows"
},
{
"name": "Kerberos",
"url": "user/login/kerberos",
"ajax": true,
"icon": "fa fa-windows"
"icon": "fab fa-windows"
},
{
"name": "OpenID",
"url": "user/login/openid",
"ajax": false,
"icon": "fa fa-openid"
"icon": "fab fa-openid"
},
{
"name": "Google",
"url": "user/oauth/google",
"ajax": false,
"icon": "fa fa-google"
"icon": "fab fa-google"
},
{
"name": "Facebook",
"url": "user/oauth/facebook",
"ajax": false,
"icon": "fa fa-facebook"
"icon": "fab fa-facebook-f"
},
{
"name": "Github",
"url": "user/oauth/github",
"ajax": false,
"icon": "fa fa-github"
"icon": "fab fa-github"
},
{
"name": "DB",
Expand All @@ -72,7 +72,7 @@ define(function () {
"name": "SAML",
"url": "user/login/saml",
"ajax": false,
"icon": "fa fa-openid"
"icon": "fab fa-openid"
},
{
"name": "Active Directory LDAP",
Expand Down
Binary file removed js/fonts/FontAwesome.otf
Binary file not shown.
Binary file removed js/fonts/fontawesome-webfont.eot
Binary file not shown.

0 comments on commit 6844781

Please sign in to comment.