Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detail page button icon align #2137

Merged
merged 3 commits into from
Nov 7, 2024
Merged

Detail page button icon align #2137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d71f543
wip
yzlucas Nov 6, 2024
5ed3b4d
Merge branch 'bcgov:branch-2.4.0' into detail-page-button-icon-align
yzlucas Nov 7, 2024
c9fab2a
more share style update
yzlucas Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...full-details/area-restrictions-full-details/area-restrictions-full-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...ngular/src/app/components/full-details/bans-full-details/bans-full-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...ponents/full-details/danger-rating-full-details/danger-rating-full-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...pp/components/full-details/evac-alert-full-details/evac-alert-full-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...pp/components/full-details/evac-order-full-details/evac-order-full-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions ...t/wfnews-war/src/main/angular/src/app/components/full-details/full-details.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,11 @@ hr {
top: 5px;
}

.map-icon{
height: 20px;
width: 20px;
}

.bulletin {
display: flex;
width: 85 dvw;
Expand Down
2 changes: 1 addition & 1 deletion ...-page/incident-info-header/area-restriction-header/area-restriction-header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...components/public-incident-page/incident-info-header/ban-header/ban-header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...cident-page/incident-info-header/danger-rating-header/danger-rating-header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions ...components/public-incident-page/incident-info-header/incident-header-panel.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions ...components/public-incident-page/incident-info-header/incident-header-panel.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,6 @@
width: 17px;
}

.icon-share {
position: relative;
top: 2px;
height: 17px;
width: 17px;
}

.contact-buttons {
padding-top: 8px;
display: flex;
Expand Down
4 changes: 3 additions & 1 deletion client/wfnews-war/src/main/angular/src/assets/images/svg-icons/bookmark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions client/wfnews-war/src/main/angular/src/assets/images/svg-icons/share.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading