Skip to content

Commit 9f4f198

Browse files
authored
Merge branch 'master' into niliev/bottom
2 parents 9475521 + 57d122b commit 9f4f198

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

app/ng-ui-category/icon-fonts/basics/basic.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<StackLayout class="m-16" horizontalAlignment="center">
33
<Label text="Icon Fonts demonstration" fontSize="18"></Label>
44

5-
<!-- >> icon-font-xml-def -->
5+
<!-- >> icon-font-html-def -->
66
<!-- Using fa-regular-400.ttf -->
77
<Label text="&#xf019;" class="far"></Label>
88

@@ -18,5 +18,5 @@
1818

1919
<!-- Using IcoMoon-Free.ttf -->
2020
<Label text="&#xe904;" class="ico"></Label>
21-
<!-- << icon-font-xml-def -->
21+
<!-- << icon-font-html-def -->
2222
</StackLayout>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Extended example, desmostrating how to use ActivityIndicator during HTTP request
1+
Extended example, demonstrating how to use ActivityIndicator during HTTP request
22

33
Setting an activity indicator in the HTML:
44
<snippet id='activity-indicator-setting-busy-html'/>
55

66
Setting an activity indicator’s `busy` property value:
7-
<snippet id='activity-indicator-setting-busy-code'/>
7+
<snippet id='activity-indicator-setting-busy-code'/>

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
"@angular/platform-browser": "8.0.0",
3838
"@angular/platform-browser-dynamic": "8.0.0",
3939
"@angular/router": "8.0.0",
40-
"nativescript-angular": "next",
41-
"nativescript-camera": "^4.4.0",
42-
"nativescript-geolocation": "^5.0.0",
40+
"nativescript-angular": "8.0.1",
41+
"nativescript-camera": "^4.5.0",
42+
"nativescript-geolocation": "^5.1.0",
4343
"nativescript-intl": "~3.0.0",
44-
"nativescript-theme-core": "^1.0.4",
44+
"nativescript-theme-core": "^1.0.6",
4545
"reflect-metadata": "~0.1.12",
4646
"rxjs": "^6.3.3",
4747
"tns-core-modules": "rc",

0 commit comments

Comments
 (0)