Merge pull request #2323 from HealthCatalyst/dev

Cashmere 17.1.2
HealthCatalyst · Jun 17, 2024 · a651e1a · a651e1a
2 parents 9194347 + f547372
commit a651e1a
Show file tree

Hide file tree

Showing 7 changed files with 861 additions and 56 deletions.
diff --git a/guides/content/trademarks.md b/guides/content/trademarks.md
@@ -30,6 +30,7 @@ Unregistered Marks (currently in use, examples) – **Apply ™** symbol:
 _The ™ symbol can be applied to any unregistered trademark_
 
 - ARMUS by Health Catalyst
+- Carevive by Health Catalyst
 - CRStar by Health Catalyst
 - DOS
 - DOS Mart and DOS Marts

diff --git a/package-lock.json b/package-lock.json
diff --git a/projects/cashmere-examples/src/project-template/package.json b/projects/cashmere-examples/src/project-template/package.json
@@ -19,7 +19,7 @@
     "@angular/forms": "^17.3.8",
     "@angular/platform-browser": "^17.3.8",
     "@angular/platform-browser-dynamic": "^17.3.8",
-    "@angular/platform-server": "17.3.9",
+    "@angular/platform-server": "17.3.10",
     "@angular/router": "^17.3.8",
     "@ng-select/ng-select": "^12.0.7",
     "ngx-slider-v2": "^17.0.0",

diff --git a/src/app/foundations/foundations-routes.module.ts b/src/app/foundations/foundations-routes.module.ts
@@ -56,7 +56,7 @@ const routes: Routes = [
             {
                 path: 'logo',
                 component: LogoDemoComponent,
-                data: {title: 'Logo', category: 'Brand'}
+                data: {title: 'Logos', category: 'Brand'}
             },
             {
                 path: 'products',

diff --git a/src/app/foundations/logo/logo-demo.component.html b/src/app/foundations/logo/logo-demo.component.html
@@ -1,6 +1,6 @@
 <div class="demo-content">
-    <h1>Health Catalyst Logo</h1>
-    <h6>Last updated Jan 27, 2021</h6>
+    <h1>Health Catalyst Logos</h1>
+    <h6>Last updated Jun 17, 2024</h6>
 
     <hc-tile>
         <h5 id="overview">Overview</h5>
@@ -205,5 +205,19 @@ <h5 id="ers-by-health-catalyst">ERS CRStar by Health Catalyst</h5>
         </a>
     </hc-tile>
 
+    <hc-tile>
+        <h5 id="ers-by-health-catalyst">Carevive by Health Catalyst</h5>
+
+        <p><em>The Carevive logo set linked below includes full-color, grayscale, and white versions.</em></p>
+        <a href="./assets/logos/Carevive_by_Health_Catalyst.zip">
+            <img src="./assets/logos/Carevive_by_Health_Catalyst.svg" class="logo-img-lg" />
+        </a>
+        <br>
+        <a hc-button buttonStyle="primary-alt" download href="./assets/logos/Carevive_by_Health_Catalyst.zip" title="Download logo zip file">
+            <hc-icon fontSet="fa" fontIcon="fa-file-archive-o" class="icon-left"></hc-icon>
+            Download logo zip file
+        </a>
+    </hc-tile>
+
     <hc-feedback-form></hc-feedback-form>
 </div>