From d71f5435d615bcb6e066f91e0e4923dfa3a3308b Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Wed, 6 Nov 2024 14:04:54 -0800 Subject: [PATCH 1/2] wip --- .../area-restrictions-full-details.component.html | 3 ++- .../bans-full-details/bans-full-details.component.html | 2 +- .../danger-rating-full-details.component.html | 2 +- .../evac-alert-full-details.component.html | 4 ++-- .../evac-order-full-details.component.html | 4 ++-- .../incident-header-panel.component.html | 4 ++-- .../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 +++++---- 9 files changed, 18 insertions(+), 21 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..af025227b1 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 @@ -5,7 +5,8 @@
-
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..bc840ebc71 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 @@ -6,7 +6,7 @@ - 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..4babec2342 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 @@ -4,7 +4,7 @@
-
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..50cde26862 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

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.

- -
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..d14c5d4e07 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 @@

People in this area are at risk and should leave the area immediately. Follow instructions from your local government or First Nation.

- -
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..359ad9e5cc 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 @@ -107,7 +107,7 @@ Contact Us 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 @@ - + + + \ 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 @@ - - - - + + + + + \ No newline at end of file From c9fab2a2631a7e2d92581e39a44a0c0a768f99c9 Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Wed, 6 Nov 2024 23:37:51 -0800 Subject: [PATCH 2/2] more share style update --- .../area-restrictions-full-details.component.html | 2 +- .../bans-full-details/bans-full-details.component.html | 2 +- .../danger-rating-full-details.component.html | 2 +- .../evac-alert-full-details.component.html | 2 +- .../evac-order-full-details.component.html | 2 +- .../app/components/full-details/full-details.component.scss | 5 +++++ .../area-restriction-header.component.html | 2 +- .../ban-header/ban-header.component.html | 2 +- .../danger-rating-header/danger-rating-header.component.html | 2 +- .../incident-header-panel.component.html | 2 +- 10 files changed, 14 insertions(+), 9 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 af025227b1..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,7 +3,7 @@

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.

-

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.

-

{{dangerDescription()}}

- 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 50cde26862..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,7 +5,7 @@ alt="evacuation_alert" />Alert

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.

- 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 d14c5d4e07..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,7 +6,7 @@

People in this area are at risk and should leave the area immediately. Follow instructions from your local government or First Nation.

- 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
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
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 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 359ad9e5cc..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 @@ -156,7 +156,7 @@ View on Map