From 6031306fc8c5bbbb55809828cbe5240322b2dbbf Mon Sep 17 00:00:00 2001
From: Lucas Li <35748253+yzlucas@users.noreply.github.com>
Date: Wed, 6 Nov 2024 23:38:28 -0800
Subject: [PATCH] Detail page button icon align (#2137)

* wip

* more share style update
---
 .../area-restrictions-full-details.component.html        | 5 +++--
 .../bans-full-details/bans-full-details.component.html   | 4 ++--
 .../danger-rating-full-details.component.html            | 4 ++--
 .../evac-alert-full-details.component.html               | 4 ++--
 .../evac-order-full-details.component.html               | 4 ++--
 .../components/full-details/full-details.component.scss  | 5 +++++
 .../area-restriction-header.component.html               | 2 +-
 .../ban-header/ban-header.component.html                 | 2 +-
 .../danger-rating-header.component.html                  | 2 +-
 .../incident-header-panel.component.html                 | 6 +++---
 .../incident-header-panel.component.scss                 | 7 -------
 .../angular/src/assets/images/svg-icons/bookmark.svg     | 4 +++-
 .../main/angular/src/assets/images/svg-icons/share.svg   | 9 +++++----
 13 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/client/wfnews-war/src/main/angular/src/app/components/full-details/area-restrictions-full-details/area-restrictions-full-details.component.html b/client/wfnews-war/src/main/angular/src/app/components/full-details/area-restrictions-full-details/area-restrictions-full-details.component.html
index 98962eca90..5189ce3181 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/full-details/area-restrictions-full-details/area-restrictions-full-details.component.html
+++ b/client/wfnews-war/src/main/angular/src/app/components/full-details/area-restrictions-full-details/area-restrictions-full-details.component.html
@@ -3,9 +3,10 @@
   <p class="info">An Area Restriction is a legal order that prohibits access to certain areas in order to limit the risk of fire,
     address a public safety concern or avoid interference with fire control.</p>
   <div class="button-row">
-    <button (click)="navToMap()" mat-button class="map-button"><img height="20" width="20" class="tertiary-icon"
+    <button (click)="navToMap()" mat-button class="map-button"><img height="20" width="20" class="tertiary-icon map-icon"
         src="/assets/images/svg-icons/map.svg" alt="Map" />View on Map</button>
-    <button (click)="shareMobile()" mat-button class="map-button"><img class="tertiary-icon" src="/assets/images/svg-icons/share.svg"
+    <button (click)="shareMobile()" mat-button class="map-button"><img class="tertiary-icon" height="20" width="20"
+      src="/assets/images/svg-icons/share.svg"
       alt="Share" />Share</button>
   </div>
 </div>
diff --git a/client/wfnews-war/src/main/angular/src/app/components/full-details/bans-full-details/bans-full-details.component.html b/client/wfnews-war/src/main/angular/src/app/components/full-details/bans-full-details/bans-full-details.component.html
index db878db311..42fdb99bc8 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/full-details/bans-full-details/bans-full-details.component.html
+++ b/client/wfnews-war/src/main/angular/src/app/components/full-details/bans-full-details/bans-full-details.component.html
@@ -3,10 +3,10 @@
     <div class="full-details-title">Fire Ban on {{banData.description}} Open Fires</div>
     <p class="info">Decisions on when and where to implement fire bans and restrictions are made by B.C.’s regional fire centres depending on local fire hazards or dangers, forecasted weather conditions and the type and level of fire activity occurring.</p>
     <div class="button-row">
-      <button (click)="navToMap()" mat-button class="map-button"><img height="20" width="20" class="tertiary-icon" src="/assets/images/svg-icons/map.svg" 
+      <button (click)="navToMap()" mat-button class="map-button"><img height="20" width="20" class="tertiary-icon map-icon" src="/assets/images/svg-icons/map.svg" 
         alt="Map" />View on Map
       </button>
-      <button (click)="shareMobile()" mat-button class="map-button"><img class="tertiary-icon" src="/assets/images/svg-icons/share.svg"
+      <button (click)="shareMobile()" mat-button class="map-button"><img height="20" width="20" class="tertiary-icon" src="/assets/images/svg-icons/share.svg"
         alt="Share" />Share
       </button>
     </div>
diff --git a/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.html b/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.html
index 7fc818da93..4344d027c9 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.html
+++ b/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.html
@@ -2,9 +2,9 @@
   <div class="full-details-title">{{rating}} Danger Rating</div>
   <p class="info">{{dangerDescription()}}</p>
   <div class="button-row">
-    <button (click)="navToMap()" mat-button class="map-button"><img height="20" width="20" class="tertiary-icon"
+    <button (click)="navToMap()" mat-button class="map-button"><img height="20" width="20" class="tertiary-icon map-icon"
       src="/assets/images/svg-icons/map.svg" alt="Map" />View on Map</button>
-    <button (click)="shareMobile()" mat-button class="map-button"><img class="tertiary-icon" src="/assets/images/svg-icons/share.svg"
+    <button (click)="shareMobile()" mat-button class="map-button"><img height="20" width="20" class="tertiary-icon" src="/assets/images/svg-icons/share.svg"
         alt="Share" />Share</button>
   </div>
 </div>
diff --git a/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-alert-full-details/evac-alert-full-details.component.html b/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-alert-full-details/evac-alert-full-details.component.html
index 64bd9015a5..473ec17ebf 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-alert-full-details/evac-alert-full-details.component.html
+++ b/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-alert-full-details/evac-alert-full-details.component.html
@@ -5,9 +5,9 @@
         alt="evacuation_alert" />Alert</div>
     <p class="info">An evacuation alert is a warning about a potential threat to life and/or property. It is intended to give you time to be ready for a possible evacuation. Follow instructions from your local government or First Nation.</p>
     <div class="button-row">
-      <button (click)="navToMap()" mat-button class="map-button"><img class="tertiary-icon" src="/assets/images/svg-icons/map.svg"
+      <button (click)="navToMap()" mat-button class="map-button"><img height="20" width="20" class="tertiary-icon map-icon" src="/assets/images/svg-icons/map.svg"
         alt="Map" />View on Map</button>
-    <button (click)="shareMobile('Alert')" mat-button class="map-button"><img class="tertiary-icon" src="/assets/images/svg-icons/share.svg"
+    <button (click)="shareMobile('Alert')" mat-button class="map-button"><img height="20" width="20" class="tertiary-icon" src="/assets/images/svg-icons/share.svg"
       alt="Share" />Share</button>
     </div>
   </div>
diff --git a/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-order-full-details/evac-order-full-details.component.html b/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-order-full-details/evac-order-full-details.component.html
index bd210273b5..1586529602 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-order-full-details/evac-order-full-details.component.html
+++ b/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-order-full-details/evac-order-full-details.component.html
@@ -6,9 +6,9 @@
         <p class="info">People in this area are at risk and should leave the area immediately. Follow instructions from your
             local government or First Nation.</p>
         <div class="button-row">
-            <button (click)="navToMap()" mat-button class="map-button"><img class="tertiary-icon"
+            <button (click)="navToMap()" mat-button class="map-button"><img class="tertiary-icon map-icon"
                 src="/assets/images/svg-icons/map.svg" alt="Map" />View on Map</button>
-            <button (click)="shareMobile('Order')" mat-button class="map-button"><img class="tertiary-icon" src="/assets/images/svg-icons/share.svg"
+            <button (click)="shareMobile('Order')" mat-button class="map-button"><img height="20" width="20" class="tertiary-icon" src="/assets/images/svg-icons/share.svg"
                 alt="Share" />Share</button>
         </div>
     </div>
diff --git a/client/wfnews-war/src/main/angular/src/app/components/full-details/full-details.component.scss b/client/wfnews-war/src/main/angular/src/app/components/full-details/full-details.component.scss
index 5a2b41a655..aeef1636a1 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/full-details/full-details.component.scss
+++ b/client/wfnews-war/src/main/angular/src/app/components/full-details/full-details.component.scss
@@ -384,6 +384,11 @@ hr {
   top: 5px;
 }
 
+.map-icon{
+  height: 20px;
+  width: 20px;
+}
+
 .bulletin {
   display: flex;
   width: 85 dvw;
diff --git a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/area-restriction-header/area-restriction-header.component.html b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/area-restriction-header/area-restriction-header.component.html
index ff202975b8..5b8e5ca646 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/area-restriction-header/area-restriction-header.component.html
+++ b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/area-restriction-header/area-restriction-header.component.html
@@ -26,7 +26,7 @@
             View on Map
           </button>
           <button mat-button class="single-button" (click)="openShareWindow()">
-            <img class="single-button-icon" src="/assets/images/svg-icons/share.svg" height="20" width="20" alt="Map" />
+            <img class="single-button-icon" src="/assets/images/svg-icons/share.svg" height="24" width="24" alt="Map" />
             Share
           </button>
       </div>
diff --git a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/ban-header/ban-header.component.html b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/ban-header/ban-header.component.html
index 95d62437dc..92a6e23512 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/ban-header/ban-header.component.html
+++ b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/ban-header/ban-header.component.html
@@ -27,7 +27,7 @@
             View on Map
           </button>
           <button mat-button class="single-button" (click)="openShareWindow()">
-            <img class="single-button-icon" src="/assets/images/svg-icons/share.svg" height="20" width="20" alt="Map" />
+            <img class="single-button-icon" src="/assets/images/svg-icons/share.svg" height="24" width="24" alt="Map" />
             Share
           </button>
       </div>
diff --git a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/danger-rating-header/danger-rating-header.component.html b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/danger-rating-header/danger-rating-header.component.html
index 1dcfd4a259..33d4e47b93 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/danger-rating-header/danger-rating-header.component.html
+++ b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/danger-rating-header/danger-rating-header.component.html
@@ -16,7 +16,7 @@
             View on Map
           </button>
           <button mat-button class="single-button" (click)="openShareWindow()">
-            <img class="single-button-icon" src="/assets/images/svg-icons/share.svg" height="20" width="20" alt="Map" />
+            <img class="single-button-icon" src="/assets/images/svg-icons/share.svg" height="24" width="24" alt="Map" />
             Share
           </button>
       </div>
diff --git a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.html b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.html
index 61cb5ba604..09980f169a 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.html
+++ b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.html
@@ -87,7 +87,7 @@
                   Print
                 </button>
                 <button mat-button class="desktop-buttons" (click)="openShareWindow()">
-                  <img class="icon-share" src="/assets/images/svg-icons/share.svg" alt="print" />
+                  <img class="icon-contact" src="/assets/images/svg-icons/share.svg" alt="print" />
                   Share
                 </button>
             </div>
@@ -107,7 +107,7 @@
                 Contact Us
             </button>
             <button mat-button class="mobile-buttons" (click)="shareMobile()">
-              <img class="icon-share" src="/assets/images/svg-icons/share.svg"
+              <img class="icon-contact" src="/assets/images/svg-icons/share.svg"
                 alt="share" />
               Share  
             </button>
@@ -156,7 +156,7 @@
                 View on Map
               </button>
               <button mat-button class="single-button" (click)="openShareWindow('evac')">
-                <img class="single-button-icon" src="/assets/images/svg-icons/share.svg" height="20" width="20" alt="Map" />
+                <img class="single-button-icon" src="/assets/images/svg-icons/share.svg" height="24" width="24" alt="Share" />
                 Share
               </button>
           </div>
diff --git a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.scss b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.scss
index 4cb8f29043..e386cd443d 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.scss
+++ b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.scss
@@ -293,13 +293,6 @@
   width: 17px;
 }
 
-.icon-share {
-  position: relative;
-  top: 2px;
-  height: 17px;
-  width: 17px;
-}
-
 .contact-buttons {
   padding-top: 8px;
   display: flex;
diff --git a/client/wfnews-war/src/main/angular/src/assets/images/svg-icons/bookmark.svg b/client/wfnews-war/src/main/angular/src/assets/images/svg-icons/bookmark.svg
index b3b62cb278..9ec4cab985 100644
--- a/client/wfnews-war/src/main/angular/src/assets/images/svg-icons/bookmark.svg
+++ b/client/wfnews-war/src/main/angular/src/assets/images/svg-icons/bookmark.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M336 0H48C21.49 0 0 21.49 0 48v464l192-112 192 112V48c0-26.51-21.49-48-48-48zm0 428.43l-144-84-144 84V54a6 6 0 0 1 6-6h276c3.314 0 6 2.683 6 5.996V428.43z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="17" height="18" viewBox="0 0 17 18" fill="none">
+    <path d="M12.75 2.625V14.7109L8.97812 12.8038L8.5 12.5647L8.02188 12.8038L4.25 14.7109V2.625H12.75ZM12.75 1.5625H4.25C3.96821 1.5625 3.69796 1.67444 3.4987 1.8737C3.29944 2.07296 3.1875 2.34321 3.1875 2.625V16.4375L8.5 13.7812L13.8125 16.4375V2.625C13.8125 2.34321 13.7006 2.07296 13.5013 1.8737C13.302 1.67444 13.0318 1.5625 12.75 1.5625Z" fill="black"/>
+    </svg>
\ No newline at end of file
diff --git a/client/wfnews-war/src/main/angular/src/assets/images/svg-icons/share.svg b/client/wfnews-war/src/main/angular/src/assets/images/svg-icons/share.svg
index d24dd3b661..6e7bcec7c6 100644
--- a/client/wfnews-war/src/main/angular/src/assets/images/svg-icons/share.svg
+++ b/client/wfnews-war/src/main/angular/src/assets/images/svg-icons/share.svg
@@ -1,5 +1,6 @@
 <svg width="17" height="18" viewBox="0 0 17 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="ion:share-outline">
-<path id="Vector" d="M11.1562 6.875H12.4844C12.8366 6.875 13.1744 7.01493 13.4235 7.264C13.6726 7.51307 13.8125 7.85088 13.8125 8.20312V14.5781C13.8125 14.9304 13.6726 15.2682 13.4235 15.5173C13.1744 15.7663 12.8366 15.9062 12.4844 15.9062H4.51562C4.16338 15.9063 3.82557 15.7663 3.5765 15.5173C3.32743 15.2682 3.1875 14.9304 3.1875 14.5781V8.20312C3.1875 7.85088 3.32743 7.51307 3.5765 7.264C3.82557 7.01493 4.16338 6.875 4.51562 6.875H5.84375M11.1562 4.75L8.5 2.09375M8.5 2.09375L5.84375 4.75M8.5 2.09375V11.1582" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-</svg>
+    <g id="ion:share-outline">
+    <path id="Vector" d="M11.1562 6.875H12.4844C12.8366 6.875 13.1744 7.01493 13.4235 7.264C13.6726 7.51307 13.8125 7.85088 13.8125 8.20312V14.5781C13.8125 14.9304 13.6726 15.2682 13.4235 15.5173C13.1744 15.7663 12.8366 15.9062 12.4844 15.9062H4.51562C4.16338 15.9063 3.82557 15.7663 3.5765 15.5173C3.32743 15.2682 3.1875 14.9304 3.1875 14.5781V8.20312C3.1875 7.85088 3.32743 7.51307 3.5765 7.264C3.82557 7.01493 4.16338 6.875 4.51562 6.875H5.84375M11.1562 4.75L8.5 2.09375M8.5 2.09375L5.84375 4.75M8.5 2.09375V11.1582" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>
+    </g>
+    </svg>
+    
\ No newline at end of file