From e7acbd7ba0b1c41a073ab1f2e209a79b35fbd35a Mon Sep 17 00:00:00 2001
From: bdarey <bdarey@gmail.com>
Date: Mon, 25 Feb 2019 21:53:57 -0800
Subject: [PATCH 1/4] Changed card buttons/links

---
 src/pages/dashboard/dashboard.html | 35 +++++++++++++++++++++---------
 src/pages/dashboard/dashboard.scss | 26 ++++++++++++++++------
 src/theme/variables.scss           |  3 +++
 3 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/pages/dashboard/dashboard.html b/src/pages/dashboard/dashboard.html
index af64dc37..9775ac32 100644
--- a/src/pages/dashboard/dashboard.html
+++ b/src/pages/dashboard/dashboard.html
@@ -70,10 +70,13 @@ <h2 class="action-item-title">Current Action Item:</h2>
                 <img class="image" src="assets/imgs/transitionHealth.png" alt="">
               </ion-col>
             </ion-row>
+            
+            <ion-item>
+              <button item-end clear (click)="toTimeline()" class="dashboardLinks">See what's next
+                <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
+            </button>
+          </ion-item>
 
-            <a (click)="toTimeline()" class="dashboardLinks" id="separationLink">See what's next
-              <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
-            </a>
           </ion-card-content>
         </ion-card>
       </ion-col>
@@ -85,10 +88,13 @@ <h2 class="action-item-title">Current Action Item:</h2>
           </ion-card-header>
           <ion-card-content id="separationContent">
             <news-widget></news-widget>
-            <a id="separationLink" class="dashboardLinks" (click)="toNews()">More news
-
+            <ion-item>
+             <button item-end clear class="dashboardLinks" (click)="toNews()">More news
               <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
-            </a>
+             </button> 
+            </ion-item>
+
+              
           </ion-card-content>
         </ion-card>
 
@@ -105,9 +111,12 @@ <h2 class="action-item-title">Current Action Item:</h2>
 
             <h4 class="actionItemText">Please complete a Self Assessment</h4>
 
-            <a (click)="toSelfAssessment()" id="separationLink">Complete an assessment
+            <ion-item>
+            <button item-end (click)="toSelfAssessment()">Complete an assessment
               <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
-            </a>
+            </button>
+            </ion-item>
+  
           </ion-card-content>
           <ion-card-content *ngIf="prevAssess">
             <chart></chart>
@@ -138,9 +147,15 @@ <h4 class="actionItemText">Please complete a Self Assessment</h4>
               a 2.</p>
 
             <br>
-            <a class="dashboardLinks" id="networkingLink">Learn More
+
+          <ion-item>
+            <button item-end id="networkingLink">Learn More
               <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
-            </a>
+            </button>
+          </ion-item>
+
+         
+
           </ion-card-content>
         </ion-card>
       </ion-col>
diff --git a/src/pages/dashboard/dashboard.scss b/src/pages/dashboard/dashboard.scss
index 1abd046f..91e04138 100644
--- a/src/pages/dashboard/dashboard.scss
+++ b/src/pages/dashboard/dashboard.scss
@@ -46,8 +46,11 @@ page-dashboard {
     #separationLink {
         float: right; 
         float: end;
-        padding-bottom: 8px;
+        padding-bottom: 10px;
+        // padding-right: 20px;
         font-size: 20px;
+        cursor: pointer;
+        background-color: transparent;
     }
     #newsLink {
         float: right;
@@ -59,12 +62,14 @@ page-dashboard {
         position: relative; 
         top: 10px; 
         padding-left: 5px
-    }
 
-    .row2 {
-        min-height: 40vh;
     }
 
+    // row2 causes card height issues
+    // .row2 {
+    //     min-height: 40vh;
+    // }
+
     .dashboardLinks {
         position:absolute;
         bottom:0;
@@ -114,8 +119,15 @@ page-dashboard {
     .action-item-title{
         font-weight: bold;
     }
+
+    .input-wrapper {
+        background-color: transparent;
+    }
+
+    button {
+        background-color: transparent;
+        color: #488aff;
+    }
+    
 }
 
-// .toaster{
-//     text-align: center;
-// }
\ No newline at end of file
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index c62ad533..7ea8cf85 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -31,6 +31,9 @@ $range-ios-slider-height: 100px;
 
 @import "ionic.globals";
 
+.card-content .item {
+  background-color: transparent;
+}
 
 // Shared Variables
 // --------------------------------------------------

From e9dc04462449f5a71b8b48dd3b0525459ce244f9 Mon Sep 17 00:00:00 2001
From: bdarey <bdarey@gmail.com>
Date: Wed, 27 Feb 2019 19:35:09 -0800
Subject: [PATCH 2/4] Assigned new class to buttons and icons giving

---
 src/pages/dashboard/dashboard.html |  8 ++++++--
 src/pages/dashboard/dashboard.scss | 23 ++++++++++++++---------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/pages/dashboard/dashboard.html b/src/pages/dashboard/dashboard.html
index 9775ac32..bd56ee91 100644
--- a/src/pages/dashboard/dashboard.html
+++ b/src/pages/dashboard/dashboard.html
@@ -72,11 +72,15 @@ <h2 class="action-item-title">Current Action Item:</h2>
             </ion-row>
             
             <ion-item>
-              <button item-end clear (click)="toTimeline()" class="dashboardLinks">See what's next
+              <button class="cardLinks" item-end clear no-margin (click)="toTimeline()">
+                <span>See what's next</span>
                 <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
             </button>
           </ion-item>
 
+          <!-- class="linkIcons" -->
+          <!-- class="dashboardLinks" -->
+
           </ion-card-content>
         </ion-card>
       </ion-col>
@@ -149,7 +153,7 @@ <h4 class="actionItemText">Please complete a Self Assessment</h4>
             <br>
 
           <ion-item>
-            <button item-end id="networkingLink">Learn More
+            <button item-end id="networkingLink">Learn more
               <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
             </button>
           </ion-item>
diff --git a/src/pages/dashboard/dashboard.scss b/src/pages/dashboard/dashboard.scss
index 91e04138..9cd37af9 100644
--- a/src/pages/dashboard/dashboard.scss
+++ b/src/pages/dashboard/dashboard.scss
@@ -56,14 +56,6 @@ page-dashboard {
         float: right;
     }
 
-    .linkIcons {
-        font-weight: bold; 
-        font-size: 40px; 
-        position: relative; 
-        top: 10px; 
-        padding-left: 5px
-
-    }
 
     // row2 causes card height issues
     // .row2 {
@@ -71,11 +63,24 @@ page-dashboard {
     // }
 
     .dashboardLinks {
-        position:absolute;
+        // position:absolute;
         bottom:0;
         right: 1vw;
     }
 
+    .cardLinks {
+        display: flex;
+        flex-flow: row-nowrap;
+        justify-content: center;
+        align-items: center;
+    }
+    
+    .linkIcons {
+        font-size: 40px; 
+        margin: 10px;
+
+    }
+
     #networkingContent {
         padding: 0px 16px; 
         display: flex; 

From 57b7397cce4702e8546019af0c155d541acd7f69 Mon Sep 17 00:00:00 2001
From: bdarey <bdarey@gmail.com>
Date: Wed, 27 Feb 2019 20:07:19 -0800
Subject: [PATCH 3/4] links on bottom adjusted. Might need a little more
 styling (font, color, etc)

---
 src/pages/dashboard/dashboard.html | 41 ++++++++++++++++--------------
 src/pages/dashboard/dashboard.scss | 16 ++++++++----
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/pages/dashboard/dashboard.html b/src/pages/dashboard/dashboard.html
index bd56ee91..a6aa9016 100644
--- a/src/pages/dashboard/dashboard.html
+++ b/src/pages/dashboard/dashboard.html
@@ -70,16 +70,16 @@ <h2 class="action-item-title">Current Action Item:</h2>
                 <img class="image" src="assets/imgs/transitionHealth.png" alt="">
               </ion-col>
             </ion-row>
-            
+
             <ion-item>
               <button class="cardLinks" item-end clear no-margin (click)="toTimeline()">
                 <span>See what's next</span>
                 <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
-            </button>
-          </ion-item>
+              </button>
+            </ion-item>
 
-          <!-- class="linkIcons" -->
-          <!-- class="dashboardLinks" -->
+            <!-- class="linkIcons" -->
+            <!-- class="dashboardLinks" -->
 
           </ion-card-content>
         </ion-card>
@@ -93,12 +93,13 @@ <h2 class="action-item-title">Current Action Item:</h2>
           <ion-card-content id="separationContent">
             <news-widget></news-widget>
             <ion-item>
-             <button item-end clear class="dashboardLinks" (click)="toNews()">More news
-              <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
-             </button> 
+              <button class="cardLinks" item-end clear no-margin (click)="toNews()">
+                <span>More news</span>
+                <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
+              </button>
             </ion-item>
 
-              
+
           </ion-card-content>
         </ion-card>
 
@@ -116,11 +117,12 @@ <h2 class="action-item-title">Current Action Item:</h2>
             <h4 class="actionItemText">Please complete a Self Assessment</h4>
 
             <ion-item>
-            <button item-end (click)="toSelfAssessment()">Complete an assessment
-              <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
-            </button>
+              <button class="cardLinks" item-end no-margin (click)="toSelfAssessment()">
+                <span>Complete an assessment</span>
+                <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
+              </button>
             </ion-item>
-  
+
           </ion-card-content>
           <ion-card-content *ngIf="prevAssess">
             <chart></chart>
@@ -152,13 +154,14 @@ <h4 class="actionItemText">Please complete a Self Assessment</h4>
 
             <br>
 
-          <ion-item>
-            <button item-end id="networkingLink">Learn more
-              <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
-            </button>
-          </ion-item>
+            <ion-item>
+              <button class="cardLinks" item-end no-margin>
+                <span>Learn more</span>
+                <ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
+              </button>
+            </ion-item>
+
 
-         
 
           </ion-card-content>
         </ion-card>
diff --git a/src/pages/dashboard/dashboard.scss b/src/pages/dashboard/dashboard.scss
index 9cd37af9..02c58b70 100644
--- a/src/pages/dashboard/dashboard.scss
+++ b/src/pages/dashboard/dashboard.scss
@@ -74,7 +74,7 @@ page-dashboard {
         justify-content: center;
         align-items: center;
     }
-    
+
     .linkIcons {
         font-size: 40px; 
         margin: 10px;
@@ -110,10 +110,10 @@ page-dashboard {
     }    
 
      #networkingLink {
-       padding-top: 0px; 
-       position: relative; 
-       top: -7px;
-       font-size: 20px;
+    //    padding-top: 0px; 
+    //    position: relative; 
+    //    top: -7px;
+    //    font-size: 20px;
     }
 
     .image {
@@ -133,6 +133,12 @@ page-dashboard {
         background-color: transparent;
         color: #488aff;
     }
+
+    button:hover {
+        color: #8eafe8;
+    }
+    
+   
     
 }
 

From ad1075e1d0fbc15ac3a31c4b2bec05243ef1edde Mon Sep 17 00:00:00 2001
From: bdarey <bdarey@gmail.com>
Date: Mon, 4 Mar 2019 18:20:29 -0800
Subject: [PATCH 4/4] fixed spacing issue

---
 src/pages/assessment/assessment.spec.ts | 1 +
 src/pages/dashboard/dashboard.scss      | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/assessment/assessment.spec.ts b/src/pages/assessment/assessment.spec.ts
index 8a119a29..17cf5384 100644
--- a/src/pages/assessment/assessment.spec.ts
+++ b/src/pages/assessment/assessment.spec.ts
@@ -21,6 +21,7 @@ beforeEach(() => {
  * test suite
  *
  */
+
 describe("Dates", () => {
 
   /**
diff --git a/src/pages/dashboard/dashboard.scss b/src/pages/dashboard/dashboard.scss
index 02c58b70..ac154c92 100644
--- a/src/pages/dashboard/dashboard.scss
+++ b/src/pages/dashboard/dashboard.scss
@@ -139,6 +139,8 @@ page-dashboard {
     }
     
    
-    
+    .card-content ion-item.item-block {
+        min-height: 2rem;
+    }
 }