From 8736bc848f771b64d6302f39c5fdcd9f878bf738 Mon Sep 17 00:00:00 2001 From: Jamson Chan <86592497+JamsonChan@users.noreply.github.com> Date: Fri, 15 Sep 2023 10:54:34 +0800 Subject: [PATCH] Change font-family from FA6's back to 'FontAwesome' since we have re-merged the FA6's font families into 'FontAwesome', and apply 'ZK85Icons' to other themes (originally only on iceblue) --- breeze/src/main/resources/web/breeze/zul/less/_zkmixins.less | 2 +- .../src/main/resources/web/sapphire/zul/less/_zkmixins.less | 2 +- .../src/main/resources/web/silvertail/zul/less/_zkmixins.less | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/breeze/src/main/resources/web/breeze/zul/less/_zkmixins.less b/breeze/src/main/resources/web/breeze/zul/less/_zkmixins.less index 2bb8ce41..df719950 100644 --- a/breeze/src/main/resources/web/breeze/zul/less/_zkmixins.less +++ b/breeze/src/main/resources/web/breeze/zul/less/_zkmixins.less @@ -280,7 +280,7 @@ // icon font utility .baseIconFont() { display: inline-block; - font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands"; + font-family: ZK85Icons, FontAwesome; font-style: normal; font-weight: normal; font-size: inherit; diff --git a/sapphire/src/main/resources/web/sapphire/zul/less/_zkmixins.less b/sapphire/src/main/resources/web/sapphire/zul/less/_zkmixins.less index 2b880743..91150c7a 100644 --- a/sapphire/src/main/resources/web/sapphire/zul/less/_zkmixins.less +++ b/sapphire/src/main/resources/web/sapphire/zul/less/_zkmixins.less @@ -280,7 +280,7 @@ // icon font utility .baseIconFont() { display: inline-block; - font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands"; + font-family: ZK85Icons, FontAwesome; font-style: normal; font-weight: normal; font-size: inherit; diff --git a/silvertail/src/main/resources/web/silvertail/zul/less/_zkmixins.less b/silvertail/src/main/resources/web/silvertail/zul/less/_zkmixins.less index 2b880743..91150c7a 100644 --- a/silvertail/src/main/resources/web/silvertail/zul/less/_zkmixins.less +++ b/silvertail/src/main/resources/web/silvertail/zul/less/_zkmixins.less @@ -280,7 +280,7 @@ // icon font utility .baseIconFont() { display: inline-block; - font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands"; + font-family: ZK85Icons, FontAwesome; font-style: normal; font-weight: normal; font-size: inherit;