From 2bc9c7351d2e7aadeccbe47aea42063bd2d9dd7d Mon Sep 17 00:00:00 2001 From: Lenz Grimmer Date: Tue, 10 Apr 2018 14:59:46 +0200 Subject: [PATCH] mgr/dashboard: Replace font-awesome with fork-awesome Replaces the dependency on Font Awesome with Fork Awesome (https://forkawesome.github.io/), which is a plug-in replacement for font-awesome 4.7.0 and adds a few more icons (see https://forkawesome.github.io/Fork-Awesome/whats-new/ for background information about this fork). It is licensed under the following licenses - see https://forkawesome.github.io/Fork-Awesome/license/ for details: Fonts: SIL OFL 1.1 Code: MIT License Documentation: CC BY 3.0 Signed-off-by: Lenz Grimmer --- src/pybind/mgr/dashboard/frontend/.angular-cli.json | 2 +- src/pybind/mgr/dashboard/frontend/package.json | 2 +- .../src/app/shared/datatable/table/table.component.scss | 2 +- src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/.angular-cli.json b/src/pybind/mgr/dashboard/frontend/.angular-cli.json index 6ffd7b7d6e8fe..f268010bdde80 100644 --- a/src/pybind/mgr/dashboard/frontend/.angular-cli.json +++ b/src/pybind/mgr/dashboard/frontend/.angular-cli.json @@ -21,7 +21,7 @@ "styles": [ "../node_modules/bootstrap/dist/css/bootstrap.css", "../node_modules/ng2-toastr/bundles/ng2-toastr.min.css", - "../node_modules/font-awesome/css/font-awesome.css", + "../node_modules/fork-awesome/css/fork-awesome.css", "../node_modules/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css", "styles.scss" ], diff --git a/src/pybind/mgr/dashboard/frontend/package.json b/src/pybind/mgr/dashboard/frontend/package.json index 1a4936edf6fdb..14eef2b248451 100644 --- a/src/pybind/mgr/dashboard/frontend/package.json +++ b/src/pybind/mgr/dashboard/frontend/package.json @@ -27,7 +27,7 @@ "bootstrap": "^3.3.7", "chart.js": "^2.7.1", "core-js": "^2.4.1", - "font-awesome": "4.7.0", + "fork-awesome": "1.0.11", "lodash": "^4.17.4", "moment": "2.20.1", "ng2-charts": "^1.6.0", diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss index db9c4eb977724..9baaf951b634d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss @@ -133,7 +133,7 @@ font-weight: bold; .datatable-header-cell-label { &:after { - font-family: FontAwesome; + font-family: ForkAwesome; font-weight: 400; height: 9px; left: 10px; diff --git a/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss b/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss index d4eee695ac8eb..fb03cc27aee42 100755 --- a/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss +++ b/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss @@ -32,8 +32,8 @@ @import 'defaults'; -$fa-font-path: "../node_modules/font-awesome/fonts"; -@import "../node_modules/font-awesome/scss/font-awesome"; +$fa-font-path: "../node_modules/fork-awesome/fonts"; +@import "../node_modules/fork-awesome/scss/fork-awesome"; /* Basics */ html { @@ -141,7 +141,7 @@ option { .breadcrumb>li+li:before { padding: 0 5px 0 7px; color: #474544; - font-family: "FontAwesome"; + font-family: "ForkAwesome"; content: "\f101"; } .breadcrumb>li>span { -- 2.39.5