Merge pull request #923 from HealthCatalyst/dev

Merge dev -> master
HealthCatalyst · Jul 10, 2019 · a1607d2 · a1607d2
2 parents ec28c02 + d7e0e84
commit a1607d2
Show file tree

Hide file tree

Showing 133 changed files with 12,588 additions and 6,239 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,32 +1,20 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Report a bug or unexpected behavior
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+**Summary**
 
-**To Reproduce**
-Reproduce it on stackblitz fork
-https://stackblitz.com/edit/cashmere-demo?file=app%2Fhome%2Fhome.component.ts
-_OR_
-Steps to reproduce the behavior:
+_Let us know what went wrong. The rest of this form is optional._
 
-1.  Go to '...'
-2.  Click on '....'
-3.  Scroll down to '....'
-4.  See error
+**Reproduction**
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+Steps to reproduce:
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+1.
 
-**Browser:**
-
--   Browser [e.g. chrome, safari]
--   Version [e.g. 22]
+Stackblitz reproduction (click the "Edit on Stackblitz" link on a component example and fork the template):
 
 **Additional context**
-Add any other context about the problem here.
+
+_You can share screenshots, library versions, your web browser and version, or anything else that might be relevant._
diff --git a/.github/ISSUE_TEMPLATE/doc_request.md b/.github/ISSUE_TEMPLATE/doc_request.md
@@ -0,0 +1,12 @@
+---
+name: Documentation/example request
+about: Ask us to clarify or improve a piece of documentation
+---
+
+**Where does our documentation fall short?**
+
+_Tell us which Cashmere documentation page this request is about and what's missing or unclear. The rest of this form is optional._
+
+**What would you add or change?**
+
+_If you were able to figure things out on your own, tell us what you did. You can also share ideas for code snippets, examples, better wording, and so on._
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,21 +1,16 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest an idea for Cashmere
 ---
 
-**Describe the problem this feature request is solving**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+**Describe your idea**
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+_Tell us what you wish Cashmere could do. The rest of this form is optional._
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+**What problem are you trying to solve?**
 
-** If any, which components will have to change, and how **
-
--   Components changed?
--   Are these breaking changes to public interfaces?
+_Ex. I'm always frustrated when ..._
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+
+_You can share screenshots, alternative solutions or ideas you've considered, which components would need to change, whether or not this would be a breaking change, or anything else that may be relevant._
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ stages:
   - name: Publish
     if: (NOT type IN (pull_request)) AND (branch = master)
   - name: PublishDev
-    if: branch = dev
+    if: (NOT type IN (pull_request)) AND (branch = dev)
 
 jobs:
   include:

diff --git a/guides/contribution-guide.md b/guides/contribution-guide.md
@@ -29,7 +29,8 @@ We would love for you to contribute to Cashmere and be part of the community mak
 
 ### While Developing
 
-1.  Just run `npm start`. This will fire up the user guide website, and rebuild/reload when changes are made to the user guide site or the Cashmere library.
+1.  You may need to run `npm run build` before you start, especially if it's your first time running Cashmere.
+2.  Run `npm start`. This will fire up the user guide website, and rebuild/reload when changes are made to the user guide site or the Cashmere library.
 
 ### PR's
 

diff --git a/guides/styles/about-modal.md b/guides/styles/about-modal.md
@@ -1,15 +1,16 @@
 # App "About" Modal
 
-###### Last updated August 15, 2018
+###### Last updated June 28, 2019
 
 :::
 
 ##### Overview
 
 An "About" modal should be included with every application as place to store important statistical information. It is typically triggered from an item in the [help menu](https://cashmere.healthcatalyst.net/components/navbar/usage). This is often used in troubleshooting when a user needs to identify specifics about their app instance. At a minimum, the About modal should contain:
 
--   **App Name** - usually an SVG and usually paired with a logo
--   **Version Number** - the primary element of the modal, should be easy to find
+-   **App Name** - using the same SVG as is being used in the navbar
+-   **App Icon** - SVGs may be downloaded from the [product icons page](https://cashmere.healthcatalyst.net/styles/products); may be omitted if an icon does not exist for the app
+-   **Version Number** - paired with the app name in the modal header
 -   **Copyright** - usually included in the footer
 -   **Terms and Conditions** - part of the footer and links to our [website terms page](https://www.healthcatalyst.com/terms-conditions/)
 -   **Privacy Policy** - paired with Terms in the footer and links to our [website privacy page](https://www.healthcatalyst.com/privacy-policy/)
@@ -26,10 +27,17 @@ The following code snippet leverages styles in the `about-modal.scss` stylesheet
 ```html
 <div class="about-modal-content">
     <div class="about-header">
-        <div class="about-triflame"></div>
-        <div>
-            <img src="./assets/Cashmere_About.svg" class="about-app-title" alt="" />
-            <div class="about-version">Version 5.0.0.0</div>
+        <img src="./assets/HealthCatalyst_Horizontal.svg" class="about-logo" alt="" />
+        <div class="about-app">
+            <div class="about-icon">
+                <img src="./assets/CashmereIcon.svg" alt="" />
+            </div>
+            <div class="about-name">
+                <img src="./assets/CashmereAppLogo.svg" alt="" />
+                <div class="about-version">
+                    Version 5.3.0.0
+                </div>
+            </div>
         </div>
     </div>
     <div class="about-reference">
@@ -56,16 +64,12 @@ The following code snippet leverages styles in the `about-modal.scss` stylesheet
         </div>
     </div>
     <div class="about-footer">
-        Copyright 2018
-        <a href="https://www.healthcatalyst.com/">Health Catalyst</a>
-        . All rights reserved
-        <br />
-        <a href="https://www.healthcatalyst.com/terms-conditions/">Terms and Conditions</a>
-        |
-        <a href="https://www.healthcatalyst.com/privacy-policy/">Privacy Policy</a>
+        Copyright 2019 <a href="https://www.healthcatalyst.com/">Health Catalyst</a>. All rights reserved
+        <br>
+        <a href="https://www.healthcatalyst.com/terms-conditions/">Terms and Conditions</a>  |  <a href="https://www.healthcatalyst.com/privacy-policy/">Privacy Policy</a>
     </div>
 </div>
-<hr />
+<hr>
 <div class="about-close-container"><button hc-button class="about-close">Close</button></div>
 ```
 

diff --git a/guides/styles/login-page.md b/guides/styles/login-page.md
@@ -6,15 +6,15 @@
 
 The login styles provide a unified experience when a user first enters an application. The following examples can be customized for each applications needs. The component is mobile friendly and will adapt for smaller screen sizes.
 
-The library does not ship with image assets, so the following images will need to be downloaded: [Logo](https://raw.githubusercontent.com/HealthCatalyst/Fabric.Cashmere/master/docs/assets/HC_logo.svg) and [Background](https://raw.githubusercontent.com/HealthCatalyst/Fabric.Cashmere/master/docs/assets/login_bg.jpg)
+The library does not ship with image assets, so the following images will need to be downloaded: [Logo](https://cashmere.healthcatalyst.net/assets/HealthCatalyst_Horizontal.svg) and [Background](https://cashmere.healthcatalyst.net/assets/login_bg.jpg)
 
 :::
 <br>
 
 <div class="hc-login-container" style="height:650px; background-image: url(../assets/login_bg.jpg)">
   <div class="hc-login">
     <div class="logo">
-      <img src="../assets/HC_logo.svg" alt="Health Catalyst Logo">
+      <img src="../assets/HealthCatalyst_Horizontal.svg" alt="Health Catalyst Logo">
     </div>
     <form>
       <label for="email">Email</label>
@@ -26,8 +26,8 @@ The library does not ship with image assets, so the following images will need t
     </form>
     <div class="privacy">By signing in you agree to our
       <br>
-      <a href="#">Terms of Use</a> and
-      <a href="#">Privacy Statement</a>
+       <a target="_blank" href="https://www.healthcatalyst.com/terms-conditions/">Terms of Use</a> and
+       <a target="_blank" href="https://www.healthcatalyst.com/privacy-policy/">Privacy Statement</a>
     </div>
     <div class="new-to-catalyst">
       <span>New to Health Catalyst?</span>
@@ -37,13 +37,13 @@ The library does not ship with image assets, so the following images will need t
   <div class="hc-login-footer">
     <ul>
       <li>
-        <a href="https://www.healthcatalyst.com/terms-conditions/"> Terms of Use </a>
+        <a target="_blank" href="https://www.healthcatalyst.com/terms-conditions/"> Terms of Use </a>
       </li>
       <li>
-        <a href="https://www.healthcatalyst.com/privacy-policy/">Privacy</a>
+        <a target="_blank" href="https://www.healthcatalyst.com/privacy-policy/">Privacy</a>
       </li>
       <li>
-        <a href="https://www.healthcatalyst.com">HealthCatalyst.com</a>
+        <a target="_blank" href="https://www.healthcatalyst.com">HealthCatalyst.com</a>
       </li>
     </ul>
   </div>
@@ -72,7 +72,7 @@ The following example does not use angular but a post css Preprocesser is needed
 ```html
 <div class="hc-login-container" style="background-image: url(../assets/login_bg.jpg)">
     <div class="hc-login">
-        <div class="logo"><img src="../assets/HC_logo.svg" alt="Health Catalyst Logo" /></div>
+        <div class="logo"><img src="../assets/HealthCatalyst_Horizontal.svg" alt="Health Catalyst Logo" /></div>
         <form>
             <label for="email">Email</label>
             <input class="login-input" required name="email" type="text" placeholder="Enter Full Email" />
@@ -84,18 +84,18 @@ The following example does not use angular but a post css Preprocesser is needed
         <div class="privacy">
             By signing in you agree to our
             <br />
-            <a href="#">Terms of Use</a>
+            <a target="_blank" href="https://www.healthcatalyst.com/terms-conditions/">Terms of Use</a>
             and
-            <a href="#">Privacy Statement</a>
+            <a target="_blank" href="https://www.healthcatalyst.com/privacy-policy/">Privacy Statement</a>
         </div>
         <div class="new-to-catalyst"><span>New to Health Catalyst?</span></div>
         <a href="#" class="new-account">Create a new acount</a>
     </div>
     <div class="hc-login-footer">
         <ul>
-            <li><a href="https://www.healthcatalyst.com/terms-conditions/">Terms of Use</a></li>
-            <li><a href="https://www.healthcatalyst.com/privacy-policy/">Privacy</a></li>
-            <li><a href="https://www.healthcatalyst.com">HealthCatalyst.com</a></li>
+            <li><a target="_blank" href="https://www.healthcatalyst.com/terms-conditions/">Terms of Use</a></li>
+            <li><a target="_blank" href="https://www.healthcatalyst.com/privacy-policy/">Privacy</a></li>
+            <li><a target="_blank" href="https://www.healthcatalyst.com">HealthCatalyst.com</a></li>
         </ul>
     </div>
 </div>
@@ -108,7 +108,7 @@ The following example uses angular and cashmere and is the preffered method. It
 ```html
 <div class="hc-login-container" style="background-image: url(../assets/login_bg.jpg)">
     <div class="hc-login">
-        <div class="logo"><img src="../assets/HC_logo.svg" alt="Health Catalyst Logo" /></div>
+        <div class="logo"><img src="../assets/HealthCatalyst_Horizontal.svg" alt="Health Catalyst Logo" /></div>
         <div>
             <hc-form-field>
                 <hc-label>Email</hc-label>
@@ -124,18 +124,18 @@ The following example uses angular and cashmere and is the preffered method. It
         <div class="privacy">
             By signing in you agree to our
             <br />
-            <a href="#">Terms of Use</a>
+            <a target="_blank" href="https://www.healthcatalyst.com/terms-conditions/">Terms of Use</a>
             and
-            <a href="#">Privacy Statement</a>
+            <a target="_blank" href="https://www.healthcatalyst.com/privacy-policy/">Privacy Statement</a>
         </div>
         <div class="new-to-catalyst"><span>New to Health Catalyst?</span></div>
         <a href="#" class="new-account">Create a new acount</a>
     </div>
     <div class="hc-login-footer">
         <ul>
-            <li><a href="https://www.healthcatalyst.com/terms-conditions/">Terms of Use</a></li>
-            <li><a href="https://www.healthcatalyst.com/privacy-policy/">Privacy</a></li>
-            <li><a href="https://www.healthcatalyst.com">HealthCatalyst.com</a></li>
+            <li><a target="_blank" href="https://www.healthcatalyst.com/terms-conditions/">Terms of Use</a></li>
+            <li><a target="_blank" href="https://www.healthcatalyst.com/privacy-policy/">Privacy</a></li>
+            <li><a target="_blank" href="https://www.healthcatalyst.com">HealthCatalyst.com</a></li>
         </ul>
     </div>
 </div>