Skip to content

Commit

Permalink
Upgrade font awesome library #2585
Browse files Browse the repository at this point in the history
  • Loading branch information
@anton-abushkevich
anton-abushkevich committed Sep 29, 2021
1 parent 55e1826 commit 3e2abf8
Show file tree
Hide file tree
Showing 47 changed files with 9,590 additions and 2,708 deletions.
2 changes: 1 addition & 1 deletion js/components/checks/warnings-badge.html
View file
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>
4 changes: 2 additions & 2 deletions js/components/userbar/user-bar.html
View file
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
14 changes: 7 additions & 7 deletions js/config/app.js
View file
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
View file
Binary file not shown.
Binary file removed js/fonts/fontawesome-webfont.eot
View file
Binary file not shown.
2,671 changes: 0 additions & 2,671 deletions js/fonts/fontawesome-webfont.svg
View file

This file was deleted.

Binary file removed js/fonts/fontawesome-webfont.ttf
View file
Binary file not shown.
Binary file removed js/fonts/fontawesome-webfont.woff
View file
Binary file not shown.
Binary file removed js/fonts/fontawesome-webfont.woff2
View file
Binary file not shown.
Binary file removed js/fonts/glyphicons-halflings-regular.woff2
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions js/pages/characterizations/components/characterizations/characterization-view-edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<!-- ko if: !!design() && !loading() -->
<div data-bind="css: classes()">
<heading-title params="name: characterizationCaption(), description: isEditPermitted() ? '' : ko.i18n('common.readOnly', '(Read only)'), icon: 'shopping-cart', theme: 'dark', tags: design().tags"></heading-title>
<heading-title params="name: characterizationCaption(), description: isEditPermitted() ? '' : ko.i18n('common.readOnly', '(Read only)'), icon: 'chart-line', theme: 'dark', tags: design().tags"></heading-title>
<!-- ko if: !!design() && !!design().id -->
<!-- ko component: {name: 'authorship', params: getAuthorship()} --> <!-- /ko -->
<!-- /ko -->
Expand All @@ -23,7 +23,7 @@
<button class="btn btn-primary" data-bind="visible: isOwner() && !previewVersion(), click: () => isAccessModalShown(!isAccessModalShown()), title: ko.i18n('common.configureAccess', 'Configure access')">
<i class="fa fa-lock"></i>
</button>
<button type="button" class="btn btn-danger" data-bind="visible: !previewVersion(), click: deleteCc, css: {disabled: !$component.isDeletePermitted() || isProcessing() }"><i class="fa fa-trash-o"></i></button>
<button type="button" class="btn btn-danger" data-bind="visible: !previewVersion(), click: deleteCc, css: {disabled: !$component.isDeletePermitted() || isProcessing() }"><i class="fa fa-trash-alt"></i></button>
<!-- /ko -->
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...ions/components/characterizations/characterization-view-edit/characterization-design.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h2 data-bind="css: classes('strata-title'),text: ko.i18n('cc.viewEdit.design.su
<input type="text" data-bind="css: $component.classes({element: 'strata-name', extra: 'form-control' + (($data.name() == '' || $component.isStrataDuplicated($data.name())) ? ' emptyInput' : '')}),
textInput: $data.name, event: {'keyup': $component.checkStrataNames}, attr: {placeholder: ko.i18n('cc.viewEdit.design.subgroups.namePlaceholder', 'Strata name')}">
<button type="button" data-bind="css: $component.classes({ element: 'strata-delete', extra: 'btn btn-sm btn-danger' }), click: () => $component.removeStrata($index())"
><i class="fa fa-trash-o"></i></button>
><i class="fa fa-trash-alt"></i></button>
</div>
<div data-bind="visible: $data.name() === '', css: { 'empty-name-error': !$data.name() }">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i>
Expand Down
2 changes: 1 addition & 1 deletion ...rizations/components/characterizations/characterization-view-edit/explore-prevalence.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div><span data-bind="text: ko.i18n('cc.viewEdit.executions.prevalenceStatConverter.cohort', 'Cohort:')"></span> <span data-bind="text: cohortName"></span></div>
<div data-bind="visible: exploring() && !loading()">
<div data-bind="css: classes('exploring-pane')">
<i title="Reset exploring hierarchy" data-bind="click: resetExploring, css: classes({element: 'reset', extra: 'fa fa-close'})"></i>
<i title="Reset exploring hierarchy" data-bind="click: resetExploring, css: classes({element: 'reset', extra: 'fa fa-times'})"></i>
<span data-bind="text: exploringTitle, css: classes('exploring-title')"></span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions js/pages/characterizations/components/feature-analyses/fa-view-edit/fa-design.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
<button
type="button"
data-bind="css: $component.classes({ element: 'criteria-delete', extra: 'btn btn-sm btn-danger' }), click: () => $component.removeCriteria($index())"
><i class="fa fa-trash-o"></i></button>
><i class="fa fa-trash-alt"></i></button>
</div>
<!-- Aggregate -->
<div data-bind="if: $parent.data().statType() === 'DISTRIBUTION' && $data.criteriaType !== 'DemographicCriteria'">
Expand All @@ -140,7 +140,7 @@
<span data-bind="text: ko.i18n('cc.fa.copySqlToClipboard', 'Copy Analysis SQL Template To Clipboard')"></span>
</button>&nbsp;&nbsp;
<span id="copyAnalysisSQLTemplateMessage" style="display:none" class="alert alert-success" role="alert">
<i class="fa fa-check-square-o" aria-hidden="true"></i>
<i class="fa fa-check-square" aria-hidden="true"></i>
<strong data-bind="text: ko.i18n('cc.fa.copiedToClipboard', 'Copied To Clipboard!')"></strong>
</span>
<span data-bind="css: classes('criteria-sql')">SELECT covariate_id, covariate_name, concept_id, sum_value, average_value FROM (</span>
Expand Down
2 changes: 1 addition & 1 deletion js/pages/characterizations/components/feature-analyses/feature-analysis-view-edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<button class="btn btn-primary" data-bind="visible: isOwner, enable: !isProcessing(), click: () => isAccessModalShown(!isAccessModalShown()), title: ko.i18n('common.configureAccess', 'Configure access')">
<i class="fa fa-lock"></i>
</button>
<button class="btn btn-danger" data-bind="click: deleteFeature, enable: canDelete() && !isProcessing(), title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-o"></i></button>
<button class="btn btn-danger" data-bind="click: deleteFeature, enable: canDelete() && !isProcessing(), title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-alt"></i></button>
<!-- /ko -->
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion js/pages/characterizations/components/tabbed-grid.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<heading-title params="name: ko.i18n('cc.title', 'Cohort Characterizations'), icon: 'line-chart', theme: 'dark'"></heading-title>
<heading-title params="name: ko.i18n('cc.title', 'Cohort Characterizations'), icon: 'chart-line', theme: 'dark'"></heading-title>


<div data-bind="css: classes({ element: 'toolbar' })">
Expand Down
2 changes: 1 addition & 1 deletion js/pages/characterizations/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ define(
return {
title: ko.i18n('navigation.characterizations', constants.pageTitle()),
buildRoutes,
icon: 'line-chart',
icon: 'chart-line',
statusCss,
navUrl,
};
Expand Down
2 changes: 1 addition & 1 deletion js/pages/cohort-definitions/cohort-definition-manager.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<!-- ko if: !isRunning() -->
<button class="btn btn-danger"
data-bind="visible: !previewVersion(), title: ko.i18n('common.delete', 'Delete'), click: $component.delete, enable: canDelete() && !isProcessing()"><i
class="fa fa-trash-o"></i></button>
class="fa fa-trash-alt"></i></button>
<!-- /ko -->
<!-- /ko -->
</div>
Expand Down
4 changes: 2 additions & 2 deletions js/pages/cohort-definitions/components/reporting/cost-utilization/report-manager.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- ko if:$component.showSelectionArea -->
<div class="wrapperTitle">
<span data-bind="if:!$component.loadingReport()"><i class="fa fa-area-chart"></i></span>
<span data-bind="if:!$component.loadingReport()"><i class="fa fa-chart-area"></i></span>
<span data-bind="if:$component.loadingReport()"><i class="fa fa-circle-o-notch fa-spin"></i></span>
<span data-bind="text: ko.i18n('cohortDefinitions.costUtilization.reportManager.reportManagerText_1', 'Cohort Reporting')"></span>
</div>
Expand Down Expand Up @@ -52,7 +52,7 @@

<div id="reportDataCompleteness" data-bind="if: $component.currentReport() == 'Data Completeness' && !$component.loadingReport()">
<div class="pad-10 report">
<div class="reportHeading"><i class="fa fa-area-chart"></i>
<div class="reportHeading"><i class="fa fa-chart-area"></i>
<span data-bind="text: ko.i18n('cohortDefinitions.costUtilization.reportManager.reportManagerText_3', 'Data Completeness')"></span>
(<span data-bind="text:$component.reportSourceKey()"></span>)</div>
<faceted-datatable params="{columns: $component.dataCompletColumns, reference:$component.dataCompleteReference, options:$component.dataCompleteOptions, rowClick:$component.dataCompleteRowClick }"></faceted-datatable>
Expand Down
2 changes: 1 addition & 1 deletion js/pages/concept-sets/conceptset-manager.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<button class="btn btn-primary" data-bind="visible: !previewVersion() && isOwner(), click: () => isAccessModalShown(!isAccessModalShown()), title: ko.i18n('common.configureAccess', 'Configure access')">
<i class="fa fa-lock"></i>
</button>
<button type="button" class="btn btn-danger" data-bind="visible: !previewVersion(), click: $component.delete, css: { disabled: !canDelete() || isProcessing() }, title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-o"></i></button>
<button type="button" class="btn btn-danger" data-bind="visible: !previewVersion(), click: $component.delete, css: { disabled: !canDelete() || isProcessing() }, title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-alt"></i></button>
<!-- /ko -->
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion js/pages/configuration/roles/role-details.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<button type="button" class="btn btn-primary" data-bind="click:$component.copy, css: { disabled: !canCreate()}, title: ko.i18n('common.createACopy', 'Create a copy')"><i class="fa fa-copy"></i></button>
<button type="button" class="btn btn-primary" data-bind="click:$component.close, title: ko.i18n('common.close', 'Close')"><i class="fa fa-times"></i></button>
<button type="button" class="btn btn-primary" data-bind="click: $component.export, title: ko.i18n('common.export', 'Export')"><i class="fa fa-download"></i></button>
<button type="button" class="btn btn-danger" data-bind="click: $component.delete, css: { disabled: !canDelete()}, title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-o"></i></button>
<button type="button" class="btn btn-danger" data-bind="click: $component.delete, css: { disabled: !canDelete()}, title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-alt"></i></button>
</div>
</div>
<div data-bind="visible: !$component.roleName()" class="empty-name-error">
Expand Down
2 changes: 1 addition & 1 deletion js/pages/configuration/sources/source-manager.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
class="fa fa-times"></i></button>
<button class="btn btn-danger"
data-bind="click: $component.delete, enable: canDelete(),
title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-o"></i></button>
title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-alt"></i></button>
</div>
</div>
<div data-bind="visible: !isNameCorrect()" class="empty-name-error">
Expand Down
2 changes: 1 addition & 1 deletion js/pages/configuration/users-import/job-view-edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div data-bind="css: classes({ element: 'button-group', extra: 'input-group-btn' })">
<button type="button" class="btn btn-success" data-bind="click: $component.saveJob, css: {disabled:!$component.isSavePermitted()}"><i class="fa fa-save"></i></button>
<button type="button" class="btn btn-primary" data-bind="click: $component.closeJob"><i class="fa fa-times"></i></button>
<button type="button" class="btn btn-danger" data-bind="click: $component.deleteJob, css: {disabled: !$component.isDeletePermitted()}"><i class="fa fa-trash-o"></i></button>
<button type="button" class="btn btn-danger" data-bind="click: $component.deleteJob, css: {disabled: !$component.isDeletePermitted()}"><i class="fa fa-trash-alt"></i></button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion js/pages/data-sources/components/reports/treemap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</div>
<atlas-modal params="{
showModal: context.loadingReportDrilldown,
iconClass: 'fa fa-chart',
iconClass: 'fa fa-chart-area',
title: ko.i18n('dataSources.loadingDrilldownReport', 'Loading Drilldown Report'),
backdropClosable: false,
fade: ko.observable(false)
Expand Down
2 changes: 1 addition & 1 deletion js/pages/data-sources/data-sources.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<heading-title params="name: ko.i18n('dataSources.headingTitle', 'Data Sources'), icon: 'area-chart', theme: 'dark'"></heading-title>
<heading-title params="name: ko.i18n('dataSources.headingTitle', 'Data Sources'), icon: 'chart-area', theme: 'dark'"></heading-title>

<access-denied params="isAuthenticated: $component.isAuthenticated, isPermitted: canViewCdmResults"></access-denied>

Expand Down
2 changes: 1 addition & 1 deletion js/pages/estimation/cca-manager.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<button class="btn btn-primary" title="Configure access" data-bind="visible: isOwner, click: () => isAccessModalShown(!isAccessModalShown()), title: ko.i18n('common.configureAccess', 'Configure access')">
<i class="fa fa-lock"></i>
</button>
<button class="btn btn-danger" title="Delete" data-bind="click: $component.delete, enable: canDelete() && !isProcessing(), title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-o"></i></button>
<button class="btn btn-danger" title="Delete" data-bind="click: $component.delete, enable: canDelete() && !isProcessing(), title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-alt"></i></button>
<!-- /ko -->
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion js/pages/incidence-rates/ir-manager.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<i class="fa fa-lock"></i>
</button>
<!-- ko ifnot: isRunning -->
<button class="btn btn-danger" data-bind="visible: !previewVersion(), click: $component.delete, enable: isDeletable, css: { 'disabled': !isDeletable() || isProcessing() }, title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-o"></i></button>
<button class="btn btn-danger" data-bind="visible: !previewVersion(), click: $component.delete, enable: isDeletable, css: { 'disabled': !isDeletable() || isProcessing() }, title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-alt"></i></button>
<!-- /ko -->
<!-- /ko -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion js/pages/pathways/components/manager.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<button type="button" class="btn btn-primary" data-bind="click: () => isTagsModalShown(!isTagsModalShown()), visible: canEdit() && !previewVersion(), css: { disabled: isProcessing() }, title: ko.i18n('common.tags', 'Tags')"><i class="fa fa-tags"></i></button>
<button type="button" class="btn btn-primary" data-bind="visible: !previewVersion(), click: copyPathway, css: {disabled: !$component.canCopy() || isProcessing()}, title: ko.i18n('common.createACopy', 'Create a copy')"><i class="fa fa-copy"></i></button>
<button class="btn btn-primary" data-bind="visible: isOwner() && !previewVersion(), click: () => isAccessModalShown(!isAccessModalShown()), title: ko.i18n('common.configureAccess', 'Configure access')"><i class="fa fa-lock"></i></button>
<button type="button" class="btn btn-danger" data-bind="visible: !previewVersion(), click: $component.del, css: {disabled: !canDelete() || isProcessing()}, title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-o"></i></button>
<button type="button" class="btn btn-danger" data-bind="visible: !previewVersion(), click: $component.del, css: {disabled: !canDelete() || isProcessing()}, title: ko.i18n('common.delete', 'Delete')"><i class="fa fa-trash-alt"></i></button>
<!-- /ko -->
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion js/pages/prediction/prediction-manager.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</button>
<button class="btn btn-danger"
data-bind="title: ko.i18n('common.delete', 'Delete'), click: $component.delete, enable: canDelete() && !isProcessing()"><i
class="fa fa-trash-o"></i></button>
class="fa fa-trash-alt"></i></button>
<!-- /ko -->
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion js/pages/profiles/profile-manager.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<input type="text" class="form-control" data-bind="enable: sourceKey(),value: personId, placeholder: ko.i18n('profiles.personId', 'Person Id')">
<div class="input-group-btn">
<div class="btn btn-primary" data-bind="css:{active:$component.showSection.profileChart},click:$component.dispToggle, value:'profileChart', title: ko.i18n('profiles.toggleChartTooltip', 'toggle chart display')">
<i class="fa fa-line-chart" data-bind="value:'profileChart'" />
<i class="fa fa-chart-line" data-bind="value:'profileChart'" />
</div>
<div class="btn btn-primary" data-bind="css:{active:$component.showSection.datatable},click:$component.dispToggle, value:'datatable', title: ko.i18n('profiles.toggleTableTooltip', 'toggle table display')">
<i class="fa fa-table" data-bind="value:'datatable'" />
Expand Down
2 changes: 1 addition & 1 deletion js/styles/atlas.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ input.btn.btn-default:disabled {
/* border: solid 1px #ddd; */
}

.reportHeading .fa-area-chart {
.reportHeading .fa-chart-area {
font-size: 2em;
margin-right: 5px;
}
Expand Down
7 changes: 4 additions & 3 deletions js/styles/font-awesome.min.css
View file

Large diffs are not rendered by default.

Binary file added js/webfonts/fa-brands-400.eot
View file
Binary file not shown.
Loading

0 comments on commit 3e2abf8

Please sign in to comment.