Skip to content

Commit ce2e7d9

Browse files
kshetlinekshetline
committed
Updated to Font Awesome 5. Fixed confirmation dialog for Save dialog.
1 parent c1750c0 commit ce2e7d9

22 files changed

Lines changed: 95 additions & 76 deletions

‎angular.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"styles": [
2929
"src/styles.scss",
3030
"node_modules/primeng/resources/themes/omega/theme.css",
31-
"node_modules/font-awesome/css/font-awesome.min.css",
31+
"node_modules/@fortawesome/fontawesome-free/css/all.min.css",
3232
"node_modules/primeng/resources/primeng.min.css",
3333
"node_modules/primeicons/primeicons.css",
3434
"node_modules/ng-busy/src/style/busy.css"

‎package-lock.json‎

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
"private": true,
1515
"dependencies": {
1616
"@angular/animations": "6.0.5",
17-
"@angular/cdk": "^6.4.1",
17+
"@angular/cdk": "^6.4.2",
1818
"@angular/common": "6.0.5",
1919
"@angular/compiler": "6.0.5",
2020
"@angular/core": "6.0.5",
21-
"@angular/flex-layout": "^6.0.0-beta.16",
21+
"@angular/flex-layout": "^6.0.0-beta.17",
2222
"@angular/forms": "6.0.5",
2323
"@angular/http": "6.0.5",
2424
"@angular/platform-browser": "6.0.5",
2525
"@angular/platform-browser-dynamic": "6.0.5",
2626
"@angular/router": "6.0.5",
27+
"@fortawesome/fontawesome-free": "^5.2.0",
2728
"array-buffer-reader": "^1.0.1",
2829
"core-js": "^2.5.7",
2930
"detect-resize": "^0.1.5",
30-
"font-awesome": "^4.7.0",
3131
"ks-astronomy": "^1.0.1",
3232
"ks-date-time-zone": "^1.4.0",
3333
"ks-math": "^1.1.1",
@@ -47,8 +47,8 @@
4747
"@types/googlemaps": "^3.30.11",
4848
"@types/jasmine": "^2.8.8",
4949
"@types/jasminewd2": "~2.0.2",
50-
"@types/lodash": "^4.14.113",
51-
"@types/node": "^6.0.114",
50+
"@types/lodash": "^4.14.116",
51+
"@types/node": "^6.0.115",
5252
"codelyzer": "^4.4.2",
5353
"jasmine-core": "~2.8.0",
5454
"jasmine-spec-reporter": "~4.2.1",

‎src/app/app.component.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ <h2>Sky View Café NP</h2>
1111
<div class="flex-container" fxLayout="column" fxLayoutAlign="start stretch" fxLayoutGap="4px" fxFlex="1 0 auto">
1212
<div fxLayout="row" fxLayoutAlign="center stretch" fxFlex="0 0 auto" class="banner-backdrop">
1313
<div class="banner" fxFlex="0 0 auto">
14-
<div><a href="/assets/help/" target="_blank"><i class="fa fa-question-circle"></i><br>help</a></div>
15-
<div><a href="/assets/about.html" target="_blank"><i class="fa fa-info-circle"></i><br>about</a></div>
16-
<div><a href="https://www.facebook.com/groups/152276391475378/" target="_blank"><i class="fa fa-facebook-official"></i><br>discuss</a></div>
17-
<div><a href="https://github.com/kshetline/sky-view-cafe-astronomy/" target="_blank"><i class="fa fa-code"></i><br>code</a></div>
18-
<div><a href="/assets/donate.html" target="_blank"><i class="fa fa-money"></i><br>donate</a></div>
14+
<div><a href="/assets/help/" target="_blank"><i class="fas fa-question-circle"></i><br>help</a></div>
15+
<div><a href="/assets/about.html" target="_blank"><i class="fas fa-info-circle"></i><br>about</a></div>
16+
<div><a href="https://www.facebook.com/groups/152276391475378/" target="_blank"><i class="fab fa-facebook"></i><br>discuss</a></div>
17+
<div><a href="https://github.com/kshetline/sky-view-cafe-astronomy/" target="_blank"><i class="fas fa-code"></i><br>code</a></div>
18+
<div><a href="/assets/donate.html" target="_blank"><i class="fas fa-money-check-alt"></i><br>donate</a></div>
1919
</div>
2020
</div>
2121
<div class="flex-container" fxLayout="row" fxLayoutAlign="space-between stretch" fxFlex="0 0 auto">
@@ -32,7 +32,7 @@ <h2>Sky View Café NP</h2>
3232
<ks-calendar [(ngModel)]="date" [timeZone]="timeZone" [gregorianChangeDate]="gcDate" [showDst]="true" [minYear]="-6000" [maxYear]="9999"
3333
(dayClick)="calendarPopup.hide()"></ks-calendar>
3434
</p-overlayPanel>
35-
<ks-icon-button [disabled]="trackTime" icon="fa fa-calendar" (click)="calendarPopup.toggle($event)"></ks-icon-button>&nbsp;
35+
<ks-icon-button [disabled]="trackTime" icon="far fa-calendar-alt" (click)="calendarPopup.toggle($event)"></ks-icon-button>&nbsp;
3636
</div>
3737
<div class="time-panel-item">
3838
<p-checkbox [(ngModel)]="trackTime" binary="true" label="Track current time"></p-checkbox>
@@ -53,7 +53,7 @@ <h2>Sky View Café NP</h2>
5353
</div>
5454
<div fxFlex="0 0 auto">
5555
<p-menu #moremenu popup="popup" [model]="moreItems"></p-menu>
56-
<button type="button" pButton icon="fa fa-list" label="More..." (click)="moremenu.toggle($event)"></button>
56+
<button type="button" pButton icon="fas fa-list" label="More..." (click)="moremenu.toggle($event)"></button>
5757
</div>
5858
</div>
5959
<div class="lower-panel flex-container" fxFlex="100%" fxLayout="row" fxLayoutAlign="start stretch" fxLayoutWrap="none" fxLayoutGap="4px">

‎src/app/app.component.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ export class AppComponent implements AfterViewInit, OnDestroy {
4949

5050
messages: Message[] = [];
5151
moreItems: MenuItem[] = [
52-
{ label: 'Preferences', icon: 'fa fa-cog', command: () => this.displayPreferences = true },
53-
{ label: 'Help', icon: 'fa fa-question-circle', command: () => this.openHelp() },
54-
{ label: 'Toggle full screen', icon: 'fa fa-arrows-alt', command: () => this.toggleFullScreen() },
55-
{ label: 'About Sky View Café', icon: 'fa fa-info-circle', command: () => this.displayAbout = true }
52+
{ label: 'Preferences', icon: 'fas fa-cog', command: () => this.displayPreferences = true },
53+
{ label: 'Help', icon: 'fas fa-question-circle', command: () => this.openHelp() },
54+
{ label: 'Toggle full screen', icon: 'fas fa-arrows-alt', command: () => this.toggleFullScreen() },
55+
{ label: 'About Sky View Café', icon: 'fas fa-info-circle', command: () => this.displayAbout = true }
5656
];
5757

5858
displayAbout = false;

‎src/app/svc/svc-atlas-dialog/svc-atlas-dialog.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<p-dialog header="Find Latitude, Longitude, and Time Zone" modal="modal" [(visible)]="visible" width="795" height="500"
1+
<p-dialog header="Find Latitude, Longitude, and Time Zone" [modal]="true" [(visible)]="visible" width="795" height="500"
22
(keyup)="onKey($event)">
33
<p-growl [value]="messages" sticky="true"></p-growl>
44
<div style="position: relative">
@@ -11,7 +11,7 @@
1111
<input #searchField type="text" pInputText class="city-field" [(ngModel)]="city" [disabled]="searching"
1212
(focus)="searchFocus(true)" (blur)="searchFocus(false)"/>
1313
<ks-dropdown [(ngModel)]="state" [options]="states" [editable]="true" [style]="{width: '19em'}"></ks-dropdown>
14-
<button type="button" pButton icon="fa fa-search" (click)="search()" label="Search" [disabled]="searching || becomingVisible"
14+
<button type="button" pButton icon="fas fa-search" (click)="search()" label="Search" [disabled]="searching || becomingVisible"
1515
(focus)="searchFocus(true)" (blur)="searchFocus(false)"></button>
1616
</div>
1717
<div class="bottom-caption-row">
@@ -60,8 +60,8 @@
6060
</div>
6161
<p-footer>
6262
<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix">
63-
<button type="button" pButton icon="fa fa-close" (click)="visible=false" label="Cancel"></button>
64-
<button type="button" pButton icon="fa fa-check" (click)="setLocation()" label="OK" [disabled]="searching || !selection"></button>
63+
<button type="button" pButton icon="far fa-window-close" (click)="visible=false" label="Cancel"></button>
64+
<button type="button" pButton icon="fas fa-check" (click)="setLocation()" label="OK" [disabled]="searching || !selection"></button>
6565
</div>
6666
</p-footer>
6767
</p-dialog>

‎src/app/svc/svc-calendar-view/svc-calendar-view-options.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<div class="flex-container" fxLayout="column" fxLayoutAlign="start stretch" fxLayoutGap="4px">
22
<div fxFlex="0 0 auto" fxFlexAlign="center" class="inc-dec-panel">
33
<div class="inc-dec-pair">
4-
<button pButton type="button" icon="fa fa-chevron-left" (click)="changeMonth(-1)"
4+
<button pButton type="button" icon="fas fa-chevron-left" (click)="changeMonth(-1)"
55
(touchstart)="onTouchStart($event, -1)" (touchend)="stopClickTimer()"
66
(mousedown)="onMouseDown(-1)" (mouseup)="stopClickTimer()" (mouseleave)="stopClickTimer()"></button>
77
<span>Month</span>
8-
<button pButton type="button" icon="fa fa-chevron-right" (click)="changeMonth(1)"
8+
<button pButton type="button" icon="fas fa-chevron-right" (click)="changeMonth(1)"
99
(touchstart)="onTouchStart($event, 1)" (touchend)="stopClickTimer()"
1010
(mousedown)="onMouseDown(1)" (mouseup)="stopClickTimer()" (mouseleave)="stopClickTimer()"></button>
1111
</div>
1212
<div class="inc-dec-pair">
13-
<button pButton type="button" icon="fa fa-chevron-left" (click)="changeMonth(-12)"
13+
<button pButton type="button" icon="fas fa-chevron-left" (click)="changeMonth(-12)"
1414
(touchstart)="onTouchStart($event, -12)" (touchend)="stopClickTimer()"
1515
(mousedown)="onMouseDown(-12)" (mouseup)="stopClickTimer()" (mouseleave)="stopClickTimer()"></button>
1616
<span>Year</span>
17-
<button pButton type="button" icon="fa fa-chevron-right" (click)="changeMonth(12)"
17+
<button pButton type="button" icon="fas fa-chevron-right" (click)="changeMonth(12)"
1818
(touchstart)="onTouchStart($event, 12)" (touchend)="stopClickTimer()"
1919
(mousedown)="onMouseDown(12)" (mouseup)="stopClickTimer()" (mouseleave)="stopClickTimer()"></button>
2020
</div>

‎src/app/svc/svc-change-location-dialog/svc-change-location-dialog.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<p-dialog header="Change Location" modal="modal" [(visible)]="visible" width="425" height="220"
1+
<p-dialog header="Change Location" [modal]="true" [(visible)]="visible" width="425" height="220"
22
(keyup)="onKey($event)">
33
<div class="zone-choices">
44
Change location to {{formattedLatitude}}, {{formattedLongitude}} and:<br>
@@ -18,8 +18,8 @@
1818
</div>
1919
<p-footer>
2020
<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix">
21-
<button type="button" pButton icon="fa fa-close" (click)="visible=false" label="Cancel"></button>
22-
<button type="button" pButton icon="fa fa-check" (click)="goToLocation()" label="OK"></button>
21+
<button type="button" pButton icon="far fa-window-close" (click)="visible=false" label="Cancel"></button>
22+
<button type="button" pButton icon="fas fa-check" (click)="goToLocation()" label="OK"></button>
2323
</div>
2424
</p-footer>
2525
</p-dialog>

‎src/app/svc/svc-ecliptic-view/svc-ecliptic-view-options.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<ks-checkbox fxFlex="0 0 auto" [(ngModel)]="showConstellations" binary="true" label="Constellations"></ks-checkbox>
99
<ks-checkbox fxFlex="0 0 auto" [(ngModel)]="localHorizon" binary="true" label="Local horizon"></ks-checkbox>
1010
<div fxFlex="0 0 auto">
11-
<ks-checkbox [(ngModel)]="showStars" binary="true" label="Stars"></ks-checkbox>
11+
<ks-checkbox [(ngModel)]="showStars" binary="true" label="Stars"></ks-checkbox>&nbsp;&nbsp;
1212
<ks-checkbox [(ngModel)]="brightenStars" binary="true" [disabled]="!showStars" label="Brighten stars"></ks-checkbox>
1313
</div>
1414
<ks-checkbox fxFlex="0 0 auto" [(ngModel)]="topocentricMoon" binary="true" label="Topocentric Moon"></ks-checkbox>
1515
<ks-checkbox fxFlex="0 0 auto" [(ngModel)]="enlargeSunMoon" binary="true" label="Enlarge Sun/Moon"></ks-checkbox>
1616
</div>
1717
<p-menu #menu popup="popup" [model]="namesCategories"></p-menu>
1818
<br>
19-
<button type="button" pButton icon="fa fa-list" label="Show Names..." (click)="menu.toggle($event)"></button>
19+
<button type="button" pButton icon="fas fa-list" label="Show Names..." (click)="menu.toggle($event)"></button>

‎src/app/svc/svc-ecliptic-view/svc-ecliptic-view-options.component.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import { NO_DEEP_SKY, ALL_DEEP_SKY } from '../generic-sky-view';
3131
import * as _ from 'lodash';
3232
import { SvcGenericOptionsComponent } from '../svc-generic-options.component';
3333

34-
const CHECKED = 'fa fa-check-square-o';
35-
const UNCHECKED = 'fa fa-square-o';
34+
const CHECKED = 'far fa-check-square';
35+
const UNCHECKED = 'far fa-square';
3636
const EM_DASH = '\u2014';
3737

3838
interface MenuItemPlus extends MenuItem {
@@ -76,7 +76,7 @@ export class SvcEclipticViewOptionsComponent extends SvcGenericOptionsComponent
7676
namesCategories: MenuItemPlus[] = [
7777
{label: 'None', icon: UNCHECKED, property: null,
7878
command: (event) => { this.toggleLabels(event); }},
79-
{label: EM_DASH, icon: 'fa fa-fw'},
79+
{label: EM_DASH, icon: 'fas fa-fw'},
8080
{label: 'Planets', icon: CHECKED, property: PROPERTY_LABEL_PLANETS,
8181
command: (event) => { this.toggleLabels(event); }},
8282
{label: 'Bright Stars', icon: UNCHECKED, property: PROPERTY_LABEL_BRIGHT_STARS,
@@ -85,7 +85,7 @@ export class SvcEclipticViewOptionsComponent extends SvcGenericOptionsComponent
8585
command: (event) => { this.toggleLabels(event); }},
8686
{label: 'Constellations', icon: UNCHECKED, property: PROPERTY_LABEL_CONSTELLATIONS,
8787
command: (event) => { this.toggleLabels(event); }, disabled: true},
88-
{label: EM_DASH, icon: 'fa fa-fw'},
88+
{label: EM_DASH, icon: 'fas fa-fw'},
8989
{label: 'No Deep Sky Objects', icon: CHECKED, property: PROPERTY_LABEL_DSOS,
9090
command: (event) => { this.toggleLabels(event); }, value: NO_DEEP_SKY},
9191
{label: 'DSOs 4.0 and Brighter', icon: UNCHECKED, property: PROPERTY_LABEL_DSOS,

0 commit comments

Comments
 (0)