From a16690b80e7e4e1865be8820c5f8e99463ed8deb Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Fri, 3 Jun 2022 12:36:34 -0400 Subject: [PATCH] Change font to Open Sans, remove Font Awesome, update NOTICE (CFM-175) --- NOTICE | 22 +- app/templates/element/badgeList.php | 10 +- app/templates/element/menuTop.php | 4 +- app/webroot/css/co-base.css | 19 +- .../Font-Awesome-4.6.3/css/font-awesome.css | 2203 -- .../css/font-awesome.css.map | 7 - .../css/font-awesome.min.css | 4 - .../Font-Awesome-4.6.3/fonts/FontAwesome.otf | Bin 124988 -> 0 bytes .../fonts/fontawesome-webfont.eot | Bin 76518 -> 0 bytes .../fonts/fontawesome-webfont.svg | 685 - .../fonts/fontawesome-webfont.ttf | Bin 152796 -> 0 bytes .../fonts/fontawesome-webfont.woff | Bin 90412 -> 0 bytes .../fonts/fontawesome-webfont.woff2 | Bin 71896 -> 0 bytes app/webroot/css/fonts/inter/Inter-Black.woff | Bin 138764 -> 0 bytes app/webroot/css/fonts/inter/Inter-Black.woff2 | Bin 102868 -> 0 bytes .../css/fonts/inter/Inter-BlackItalic.woff | Bin 146824 -> 0 bytes .../css/fonts/inter/Inter-BlackItalic.woff2 | Bin 108752 -> 0 bytes app/webroot/css/fonts/inter/Inter-Bold.woff | Bin 143208 -> 0 bytes app/webroot/css/fonts/inter/Inter-Bold.woff2 | Bin 106140 -> 0 bytes .../css/fonts/inter/Inter-BoldItalic.woff | Bin 151052 -> 0 bytes .../css/fonts/inter/Inter-BoldItalic.woff2 | Bin 111808 -> 0 bytes .../css/fonts/inter/Inter-ExtraBold.woff | Bin 142920 -> 0 bytes .../css/fonts/inter/Inter-ExtraBold.woff2 | Bin 106108 -> 0 bytes .../fonts/inter/Inter-ExtraBoldItalic.woff | Bin 150628 -> 0 bytes .../fonts/inter/Inter-ExtraBoldItalic.woff2 | Bin 111708 -> 0 bytes .../css/fonts/inter/Inter-ExtraLight.woff | Bin 140724 -> 0 bytes .../css/fonts/inter/Inter-ExtraLight.woff2 | Bin 104232 -> 0 bytes .../fonts/inter/Inter-ExtraLightItalic.woff | Bin 149996 -> 0 bytes .../fonts/inter/Inter-ExtraLightItalic.woff2 | Bin 111392 -> 0 bytes app/webroot/css/fonts/inter/Inter-Italic.woff | Bin 144372 -> 0 bytes .../css/fonts/inter/Inter-Italic.woff2 | Bin 106876 -> 0 bytes app/webroot/css/fonts/inter/Inter-Light.woff | Bin 140632 -> 0 bytes app/webroot/css/fonts/inter/Inter-Light.woff2 | Bin 104332 -> 0 bytes .../css/fonts/inter/Inter-LightItalic.woff | Bin 150092 -> 0 bytes .../css/fonts/inter/Inter-LightItalic.woff2 | Bin 111332 -> 0 bytes app/webroot/css/fonts/inter/Inter-Medium.woff | Bin 142552 -> 0 bytes .../css/fonts/inter/Inter-Medium.woff2 | Bin 105924 -> 0 bytes .../css/fonts/inter/Inter-MediumItalic.woff | Bin 150988 -> 0 bytes .../css/fonts/inter/Inter-MediumItalic.woff2 | Bin 112184 -> 0 bytes .../css/fonts/inter/Inter-Regular.woff | Bin 133844 -> 0 bytes .../css/fonts/inter/Inter-Regular.woff2 | Bin 98868 -> 0 bytes .../css/fonts/inter/Inter-SemiBold.woff | Bin 142932 -> 0 bytes .../css/fonts/inter/Inter-SemiBold.woff2 | Bin 105804 -> 0 bytes .../css/fonts/inter/Inter-SemiBoldItalic.woff | Bin 151180 -> 0 bytes .../fonts/inter/Inter-SemiBoldItalic.woff2 | Bin 112048 -> 0 bytes app/webroot/css/fonts/inter/Inter-Thin.woff | Bin 135920 -> 0 bytes app/webroot/css/fonts/inter/Inter-Thin.woff2 | Bin 99632 -> 0 bytes .../css/fonts/inter/Inter-ThinItalic.woff | Bin 145480 -> 0 bytes .../css/fonts/inter/Inter-ThinItalic.woff2 | Bin 106496 -> 0 bytes .../css/fonts/inter/Inter-italic.var.woff2 | Bin 245036 -> 0 bytes .../css/fonts/inter/Inter-roman.var.woff2 | Bin 227180 -> 0 bytes app/webroot/css/fonts/inter/Inter.var.woff2 | Bin 324864 -> 0 bytes app/webroot/css/fonts/inter/inter.css | 200 - .../notosans_bold/NotoSans-Bold-webfont.eot | Bin 160752 -> 0 bytes .../notosans_bold/NotoSans-Bold-webfont.svg | 21104 ---------------- .../notosans_bold/NotoSans-Bold-webfont.ttf | Bin 479772 -> 0 bytes .../notosans_bold/NotoSans-Bold-webfont.woff | Bin 210896 -> 0 bytes .../css/fonts/notosans_bold/stylesheet.css | 12 - .../NotoSans-Regular-webfont.eot | Bin 160807 -> 0 bytes .../NotoSans-Regular-webfont.svg | 21104 ---------------- .../NotoSans-Regular-webfont.ttf | Bin 476480 -> 0 bytes .../NotoSans-Regular-webfont.woff | Bin 210300 -> 0 bytes .../css/fonts/notosans_regular/stylesheet.css | 11 - .../opensans/OpenSans-Regular-webfont.eot | Bin 0 -> 118646 bytes .../opensans/OpenSans-Regular-webfont.svg | 19648 ++++++++++++++ .../opensans/OpenSans-Regular-webfont.ttf | Bin 0 -> 118472 bytes .../opensans/OpenSans-Regular-webfont.woff | Bin 0 -> 68220 bytes app/webroot/css/fonts/opensans/stylesheet.css | 10 + 68 files changed, 19693 insertions(+), 45350 deletions(-) delete mode 100644 app/webroot/css/fonts/Font-Awesome-4.6.3/css/font-awesome.css delete mode 100644 app/webroot/css/fonts/Font-Awesome-4.6.3/css/font-awesome.css.map delete mode 100644 app/webroot/css/fonts/Font-Awesome-4.6.3/css/font-awesome.min.css delete mode 100644 app/webroot/css/fonts/Font-Awesome-4.6.3/fonts/FontAwesome.otf delete mode 100644 app/webroot/css/fonts/Font-Awesome-4.6.3/fonts/fontawesome-webfont.eot delete mode 100644 app/webroot/css/fonts/Font-Awesome-4.6.3/fonts/fontawesome-webfont.svg delete mode 100644 app/webroot/css/fonts/Font-Awesome-4.6.3/fonts/fontawesome-webfont.ttf delete mode 100644 app/webroot/css/fonts/Font-Awesome-4.6.3/fonts/fontawesome-webfont.woff delete mode 100644 app/webroot/css/fonts/Font-Awesome-4.6.3/fonts/fontawesome-webfont.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-Black.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-Black.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-BlackItalic.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-BlackItalic.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-Bold.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-Bold.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-BoldItalic.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-BoldItalic.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-ExtraBold.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-ExtraBold.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-ExtraBoldItalic.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-ExtraBoldItalic.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-ExtraLight.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-ExtraLight.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-ExtraLightItalic.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-ExtraLightItalic.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-Italic.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-Italic.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-Light.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-Light.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-LightItalic.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-LightItalic.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-Medium.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-Medium.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-MediumItalic.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-MediumItalic.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-Regular.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-Regular.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-SemiBold.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-SemiBold.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-SemiBoldItalic.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-SemiBoldItalic.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-Thin.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-Thin.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-ThinItalic.woff delete mode 100644 app/webroot/css/fonts/inter/Inter-ThinItalic.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-italic.var.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter-roman.var.woff2 delete mode 100644 app/webroot/css/fonts/inter/Inter.var.woff2 delete mode 100644 app/webroot/css/fonts/inter/inter.css delete mode 100644 app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.eot delete mode 100644 app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.svg delete mode 100644 app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.ttf delete mode 100644 app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.woff delete mode 100644 app/webroot/css/fonts/notosans_bold/stylesheet.css delete mode 100644 app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.eot delete mode 100644 app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.svg delete mode 100644 app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.ttf delete mode 100644 app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.woff delete mode 100644 app/webroot/css/fonts/notosans_regular/stylesheet.css create mode 100644 app/webroot/css/fonts/opensans/OpenSans-Regular-webfont.eot create mode 100644 app/webroot/css/fonts/opensans/OpenSans-Regular-webfont.svg create mode 100644 app/webroot/css/fonts/opensans/OpenSans-Regular-webfont.ttf create mode 100644 app/webroot/css/fonts/opensans/OpenSans-Regular-webfont.woff create mode 100644 app/webroot/css/fonts/opensans/stylesheet.css diff --git a/NOTICE b/NOTICE index 024a3bbcc..71dfcfa87 100644 --- a/NOTICE +++ b/NOTICE @@ -56,6 +56,10 @@ files and utilities for further information: MIT License https://getbootstrap.com/ + Duet Date Picker (app/webroot/js/duet-datepicker) + MIT License + https://github.com/duetds/date-picker + Guzzle (app/AvailablePlugin/GithubProvisioner/Vendor/guzzle) MIT License https://github.com/guzzle/guzzle @@ -68,16 +72,28 @@ files and utilities for further information: MIT License https://bitbucket.org/pellepim/jstimezonedetect - noty (app/webroot/js/jquery/noty) - MIT License - http://ned.im/noty + Material Icons (app/webroot/css/fonts/material-icons) + Apache 2.0 + https://fonts.google.com/icons?selected=Material+Icons + + Open Sans (app/webroot/css/fonts/opensans) + Apache 2.0 + https://fonts.google.com/specimen/Open+Sans PHP GitHub API 2.0 (app/AvailablePlugin/GithubProvisioner/Vendor/guzzle/guzzle) MIT License https://github.com/KnpLabs/php-github-api + Select 2 + MIT License + https://select2.org/ + Shibboleth Embedded Discovery Service (app/webroot/js/eds) Apache 2.0 https://shibboleth.net/products/embedded-discovery-service.html + + vuejs + MIT License + https://vuejs.org/ --------------------------------------------------------------------------- diff --git a/app/templates/element/badgeList.php b/app/templates/element/badgeList.php index 8c27a8991..4c4b3f66b 100644 --- a/app/templates/element/badgeList.php +++ b/app/templates/element/badgeList.php @@ -27,7 +27,7 @@ * 'color' => BadgeColorModeEnum::Blue, * 'outline' => false, * 'pill' => true, - * 'fa_class' => 'fa-key', + * 'icon' => 'material-icons-key', * ), * ); * @@ -48,13 +48,13 @@ foreach($vv_badge_list as $badge) { $badge_classes = []; - $fa_element = ""; + $icon = ""; if(isset($badge['pill']) && $badge['pill']) { $badge_classes[] = "rounded-pill"; } - if(!empty($badge['fa_class'])) { - $fa_element = ''; + if(!empty($badge['icon'])) { + $icon = ''; } if(isset($badge['outline']) && $badge['outline']) { $badge_classes[] = "bg-outline-" . $badge['color']; @@ -69,7 +69,7 @@ // Print the Badge print $this->Html->tag( 'span', - $fa_element . $badge['text'], + $icon . $badge['text'], [ 'class' => 'mr-1 badge ' . implode(' ', $badge_classes), 'escape' => false, diff --git a/app/templates/element/menuTop.php b/app/templates/element/menuTop.php index fefd059ad..382d38f4e 100644 --- a/app/templates/element/menuTop.php +++ b/app/templates/element/menuTop.php @@ -38,7 +38,7 @@