Change font to Open Sans, remove Font Awesome, update NOTICE (CFM-175)

COmanage · Jun 23, 2022 · a16690b · a16690b
1 parent 8b99b1b
commit a16690b
Show file tree

Hide file tree

Showing 68 changed files with 19,693 additions and 45,350 deletions.
diff --git 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
@@ -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 = '<i class="mr-1 fa ' . $badge["fa_class"] .'"></i>';
+  if(!empty($badge['icon'])) {
+    $icon = '<i class="mr-1 material-icons" aria-hidden="true">' . $badge["icon"] .'</i>';
   }
   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
@@ -38,7 +38,7 @@
       <!-- Account Dropdown -->
       <div id="user-panel"  class="dropdown-menu <?= (count($vv_available_cos) > 1) ? ' with-co-switcher' : ''; ?>" aria-labelledby="user-panel-toggle">
         <div id="logout-in-panel">
-          <?= $this->Html->link(__d('operation','logout') . ' <span class="fa fa-sign-out"></span>',
+          <?= $this->Html->link(__d('operation','logout') . ' <em class="material-icons" aria-hidden="true">logout</em>',
             '/auth/logout/logout.php',
             ['escape'     => false,
              'id'         => 'logout-in-panel-link',
@@ -68,7 +68,7 @@
 <?php if(!isset($noLoginLogout) || !$noLoginLogout) : ?>
   <?php
     if(empty($vv_user)) {
-      print $this->Html->link(__d('operation', 'login') . ' <span class="fa fa-sign-in"></span>',
+      print $this->Html->link(__d('operation', 'login') . ' <em class="material-icons" aria-hidden="true">login</em>',
                               ['controller' => 'cos',
                                'action'     => 'select',
                                'plugin'     => false],

diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
@@ -25,12 +25,11 @@
  */
 
 /* HTML, BODY, HEADINGS, ANCHORS, FONTS */
-@import url("fonts/inter/inter.css");
-@import url("fonts/notosans_regular/stylesheet.css");
+@import url("fonts/opensans/stylesheet.css");
 @import url("fonts/material-icons/material-icons.css");
 
 html * {
-  font-family: 'Inter','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);
@@ -50,7 +49,6 @@ h1.loginMsg {
   text-align: center;
 }
 h1.firstPrompt {
-  font-family: 'Noto Sans','Trebuchet MS',Arial,Helvetica,sans-serif;
   font-size: 1.2em;
   font-weight: normal;
 }
@@ -258,7 +256,6 @@ body.logged-in #top-menu {
   font-size: 1.1em;
   font-weight: normal;
   margin: 1em 0 0 1em;
-  font-family: 'Noto Sans','Trebuchet MS',Arial,Helvetica,sans-serif;
 }
 #user-panel #panel-orgid-container {
   margin-top: 2em;
@@ -300,11 +297,7 @@ body.logged-in #top-menu {
   display: inline-block;
   padding: 0.25em 1em;
   text-decoration: none;
-  font-size: 1em;
-}
-a#login:hover,
-a#login:active {
-  color: white;
+  font-size: 1rem;
 }
 #welcome-login {
   text-align: center;
@@ -314,6 +307,12 @@ a#login:active {
   margin: 4px 0 -8px;
   text-align: right;
 }
+#login .material-icons,
+#logout-in-panel .material-icons {
+  font-size: 1rem;
+  vertical-align: top;
+  margin-top: 0.25rem;
+}
 
 /* GLOBAL SEARCH */
 #search-bar {