diff --git a/NOTICE b/NOTICE
index bcd67df98..2b4c8eb62 100644
--- a/NOTICE
+++ b/NOTICE
@@ -65,9 +65,9 @@ files and utilities for further information:
Apache 2.0
https://fonts.google.com/icons?selected=Material+Icons
- Noto Sans (app/webroot/css/fonts/notosans_*)
- SIL Open Font License
- https://fonts.google.com/noto/specimen/Noto+Sans
+ Open Sans (app/webroot/css/fonts/opensans)
+ Apache 2.0
+ https://fonts.google.com/specimen/Open+Sans
noty (app/webroot/js/jquery/noty)
MIT License
diff --git a/app/templates/element/badgeList.php b/app/templates/element/badgeList.php
index 972b3eaf6..6da069714 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 = '' . $badge["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/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 4efa932f6..8c6b8f862 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -25,11 +25,11 @@
*/
/* HTML, BODY, HEADINGS, ANCHORS, FONTS */
-@import url("fonts/notosans_regular/stylesheet.css");
+@import url("fonts/opensans/stylesheet.css");
@import url("fonts/material-icons/material-icons.css");
html * {
- font-family: 'Noto Sans','Trebuchet MS',Arial,Helvetica,sans-serif;
+ font-family: 'open_sansregular','Trebuchet MS',Arial,Helvetica,sans-serif;
}
body {
color: var(--cmg-color-gray-001);
diff --git a/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.eot b/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.eot
deleted file mode 100644
index 70508ebab..000000000
Binary files a/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.eot and /dev/null differ
diff --git a/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.ttf b/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.ttf
deleted file mode 100644
index 453b3e4cb..000000000
Binary files a/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.ttf and /dev/null differ
diff --git a/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.woff b/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.woff
deleted file mode 100644
index 1d4ab090f..000000000
Binary files a/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.woff and /dev/null differ
diff --git a/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.woff2 b/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.woff2
deleted file mode 100644
index 071c249e8..000000000
Binary files a/app/webroot/css/fonts/material-icons/MaterialIcons-Regular.woff2 and /dev/null differ
diff --git a/app/webroot/css/fonts/material-icons/material-icons.css b/app/webroot/css/fonts/material-icons/material-icons.css
index 2270c09d0..3cd7aab97 100644
--- a/app/webroot/css/fonts/material-icons/material-icons.css
+++ b/app/webroot/css/fonts/material-icons/material-icons.css
@@ -1,36 +1,124 @@
@font-face {
- font-family: 'Material Icons';
+ font-family: "Material Icons";
font-style: normal;
font-weight: 400;
- src: url(MaterialIcons-Regular.eot); /* For IE6-8 */
- src: local('Material Icons'),
- local('MaterialIcons-Regular'),
- url(MaterialIcons-Regular.woff2) format('woff2'),
- url(MaterialIcons-Regular.woff) format('woff'),
- url(MaterialIcons-Regular.ttf) format('truetype');
+ font-display: block;
+ src: url("./material-icons.woff2") format("woff2"), url("./material-icons.woff") format("woff");
}
-
.material-icons {
- font-family: 'Material Icons';
+ font-family: "Material Icons";
font-weight: normal;
font-style: normal;
- font-size: 24px; /* Preferred icon size */
- display: inline-block;
+ font-size: 24px;
line-height: 1;
- text-transform: none;
letter-spacing: normal;
+ text-transform: none;
+ display: inline-block;
+ white-space: nowrap;
word-wrap: normal;
+ direction: ltr;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ text-rendering: optimizeLegibility;
+ font-feature-settings: "liga";
+}
+
+@font-face {
+ font-family: "Material Icons Outlined";
+ font-style: normal;
+ font-weight: 400;
+ font-display: block;
+ src: url("./material-icons-outlined.woff2") format("woff2"), url("./material-icons-outlined.woff") format("woff");
+}
+.material-icons-outlined {
+ font-family: "Material Icons Outlined";
+ font-weight: normal;
+ font-style: normal;
+ font-size: 24px;
+ line-height: 1;
+ letter-spacing: normal;
+ text-transform: none;
+ display: inline-block;
white-space: nowrap;
+ word-wrap: normal;
direction: ltr;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ text-rendering: optimizeLegibility;
+ font-feature-settings: "liga";
+}
- /* Support for all WebKit browsers. */
+@font-face {
+ font-family: "Material Icons Round";
+ font-style: normal;
+ font-weight: 400;
+ font-display: block;
+ src: url("./material-icons-round.woff2") format("woff2"), url("./material-icons-round.woff") format("woff");
+}
+.material-icons-round {
+ font-family: "Material Icons Round";
+ font-weight: normal;
+ font-style: normal;
+ font-size: 24px;
+ line-height: 1;
+ letter-spacing: normal;
+ text-transform: none;
+ display: inline-block;
+ white-space: nowrap;
+ word-wrap: normal;
+ direction: ltr;
-webkit-font-smoothing: antialiased;
- /* Support for Safari and Chrome. */
+ -moz-osx-font-smoothing: grayscale;
text-rendering: optimizeLegibility;
+ font-feature-settings: "liga";
+}
- /* Support for Firefox. */
+@font-face {
+ font-family: "Material Icons Sharp";
+ font-style: normal;
+ font-weight: 400;
+ font-display: block;
+ src: url("./material-icons-sharp.woff2") format("woff2"), url("./material-icons-sharp.woff") format("woff");
+}
+.material-icons-sharp {
+ font-family: "Material Icons Sharp";
+ font-weight: normal;
+ font-style: normal;
+ font-size: 24px;
+ line-height: 1;
+ letter-spacing: normal;
+ text-transform: none;
+ display: inline-block;
+ white-space: nowrap;
+ word-wrap: normal;
+ direction: ltr;
+ -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
+ text-rendering: optimizeLegibility;
+ font-feature-settings: "liga";
+}
- /* Support for IE. */
- font-feature-settings: 'liga';
+@font-face {
+ font-family: "Material Icons Two Tone";
+ font-style: normal;
+ font-weight: 400;
+ font-display: block;
+ src: url("./material-icons-two-tone.woff2") format("woff2"), url("./material-icons-two-tone.woff") format("woff");
+}
+.material-icons-two-tone {
+ font-family: "Material Icons Two Tone";
+ font-weight: normal;
+ font-style: normal;
+ font-size: 24px;
+ line-height: 1;
+ letter-spacing: normal;
+ text-transform: none;
+ display: inline-block;
+ white-space: nowrap;
+ word-wrap: normal;
+ direction: ltr;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ text-rendering: optimizeLegibility;
+ font-feature-settings: "liga";
}
diff --git a/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.eot b/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.eot
deleted file mode 100644
index 9bf761ce1..000000000
Binary files a/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.eot and /dev/null differ
diff --git a/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.svg b/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.svg
deleted file mode 100644
index ed809fc31..000000000
--- a/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.svg
+++ /dev/null
@@ -1,21104 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.ttf b/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.ttf
deleted file mode 100644
index dc4bddc4e..000000000
Binary files a/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.ttf and /dev/null differ
diff --git a/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.woff b/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.woff
deleted file mode 100644
index 35f1df7dd..000000000
Binary files a/app/webroot/css/fonts/notosans_bold/NotoSans-Bold-webfont.woff and /dev/null differ
diff --git a/app/webroot/css/fonts/notosans_bold/stylesheet.css b/app/webroot/css/fonts/notosans_bold/stylesheet.css
deleted file mode 100644
index 397e899ec..000000000
--- a/app/webroot/css/fonts/notosans_bold/stylesheet.css
+++ /dev/null
@@ -1,12 +0,0 @@
-@font-face {
- font-family: 'Noto Sans Bold';
- src: url('NotoSans-Bold-webfont.eot');
- src: url('NotoSans-Bold-webfont.eot?#iefix') format('embedded-opentype'),
- url('NotoSans-Bold-webfont.woff') format('woff'),
- url('NotoSans-Bold-webfont.ttf') format('truetype'),
- url('NotoSans-Bold-webfont.svg#noto_sansbold') format('svg');
- font-weight: normal;
- font-style: normal;
-
-}
-
diff --git a/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.eot b/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.eot
deleted file mode 100644
index 7f2da14a4..000000000
Binary files a/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.eot and /dev/null differ
diff --git a/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.svg b/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.svg
deleted file mode 100644
index 1e194aa19..000000000
--- a/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.svg
+++ /dev/null
@@ -1,21104 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.ttf b/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.ttf
deleted file mode 100644
index d8fe19372..000000000
Binary files a/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.ttf and /dev/null differ
diff --git a/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.woff b/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.woff
deleted file mode 100644
index c2d318773..000000000
Binary files a/app/webroot/css/fonts/notosans_regular/NotoSans-Regular-webfont.woff and /dev/null differ
diff --git a/app/webroot/css/fonts/notosans_regular/stylesheet.css b/app/webroot/css/fonts/notosans_regular/stylesheet.css
deleted file mode 100644
index e242f87f5..000000000
--- a/app/webroot/css/fonts/notosans_regular/stylesheet.css
+++ /dev/null
@@ -1,11 +0,0 @@
-@font-face {
- font-family: 'Noto Sans';
- src: url('NotoSans-Regular-webfont.eot');
- src: url('NotoSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
- url('NotoSans-Regular-webfont.woff') format('woff'),
- url('NotoSans-Regular-webfont.ttf') format('truetype'),
- url('NotoSans-Regular-webfont.svg#noto_sansregular') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-