Skip to content

Commit a3a829c

Browse files
upgrade to ionic 2.1.0
1 parent 1910fec commit a3a829c

File tree

13 files changed

+9099
-5218
lines changed

13 files changed

+9099
-5218
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
"@angular/platform-browser": "2.2.1",
2323
"@angular/platform-browser-dynamic": "2.2.1",
2424
"@angular/platform-server": "2.2.1",
25-
"@ionic/storage": "1.1.7",
26-
"ionic-angular": "2.0.1",
27-
"ionic-native": "2.4.1",
25+
"@ionic/storage": "1.1.9",
26+
"ionic-angular": "2.1.0",
27+
"ionic-native": "2.5.1",
2828
"ionicons": "3.0.0",
2929
"rxjs": "5.0.0-beta.12",
3030
"sw-toolbox": "3.4.0",
31-
"zone.js": "0.6.26"
31+
"zone.js": "~0.6.26"
3232
},
3333
"devDependencies": {
34-
"@ionic/app-scripts": "1.0.0",
34+
"@ionic/app-scripts": "1.1.4",
3535
"typescript": "2.0.9"
3636
},
3737
"cordovaPlugins": [
207 KB
Binary file not shown.
208 KB
Binary file not shown.

www/assets/fonts/noto-sans.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ $noto-sans-font-path: $font-path !default;
99
font-family: "Noto Sans";
1010
font-style: normal;
1111
font-weight: 300;
12-
src: local("Noto Sans"), local("Noto-Sans-Regular"), url("#{$noto-sans-font-path}/noto-sans-regular.ttf") format("truetype");
12+
src: local("Noto Sans"), local("Noto-Sans-Regular"), url("#{$noto-sans-font-path}/noto-sans-regular.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-regular.ttf") format("truetype");
1313
}
1414

1515
@font-face {
1616
font-family: "Noto Sans";
1717
font-style: normal;
1818
font-weight: 400;
19-
src: local("Noto Sans"), local("Noto-Sans-Regular"), url("#{$noto-sans-font-path}/noto-sans-regular.ttf") format("truetype");
19+
src: local("Noto Sans"), local("Noto-Sans-Regular"), url("#{$noto-sans-font-path}/noto-sans-regular.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-regular.ttf") format("truetype");
2020
}
2121

2222
@font-face {
2323
font-family: "Noto Sans";
2424
font-style: normal;
2525
font-weight: 500;
26-
src: local("Noto Sans Bold"), local("Noto-Sans-Bold"), url("#{$noto-sans-font-path}/noto-sans-bold.ttf") format("truetype");
26+
src: local("Noto Sans Bold"), local("Noto-Sans-Bold"), url("#{$noto-sans-font-path}/noto-sans-bold.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-bold.ttf") format("truetype");
2727
}
2828

2929
@font-face {
3030
font-family: "Noto Sans";
3131
font-style: normal;
3232
font-weight: 700;
33-
src: local("Noto Sans Bold"), local("Noto-Sans-Bold"), url("#{$noto-sans-font-path}/noto-sans-bold.ttf") format("truetype");
33+
src: local("Noto Sans Bold"), local("Noto-Sans-Bold"), url("#{$noto-sans-font-path}/noto-sans-bold.woff") format("woff"), url("#{$noto-sans-font-path}/noto-sans-bold.ttf") format("truetype");
3434
}

www/assets/fonts/roboto-bold.woff2

9.97 KB
Binary file not shown.
9.98 KB
Binary file not shown.
9.95 KB
Binary file not shown.
9.96 KB
Binary file not shown.

www/assets/fonts/roboto.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ $roboto-font-path: $font-path !default;
99
font-family: "Roboto";
1010
font-style: normal;
1111
font-weight: 300;
12-
src: local("Roboto Light"), local("Roboto-Light"), url("#{$roboto-font-path}/roboto-light.ttf") format("truetype"), url("#{$roboto-font-path}/roboto-light.woff") format("woff");
12+
src: local("Roboto Light"), local("Roboto-Light"), url("#{$roboto-font-path}/roboto-light.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-light.woff") format("woff"), url("#{$roboto-font-path}/roboto-light.ttf") format("truetype");
1313
}
1414

1515
@font-face {
1616
font-family: "Roboto";
1717
font-style: normal;
1818
font-weight: 400;
19-
src: local("Roboto"), local("Roboto-Regular"), url("#{$roboto-font-path}/roboto-regular.ttf") format("truetype"), url("#{$roboto-font-path}/roboto-regular.woff") format("woff");
19+
src: local("Roboto"), local("Roboto-Regular"), url("#{$roboto-font-path}/roboto-regular.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-regular.woff") format("woff"), url("#{$roboto-font-path}/roboto-regular.ttf") format("truetype");
2020
}
2121

2222
@font-face {
2323
font-family: "Roboto";
2424
font-style: normal;
2525
font-weight: 500;
26-
src: local("Roboto Medium"), local("Roboto-Medium"), url("#{$roboto-font-path}/roboto-medium.ttf") format("truetype"), url("#{$roboto-font-path}/roboto-medium.woff") format("woff");
26+
src: local("Roboto Medium"), local("Roboto-Medium"), url("#{$roboto-font-path}/roboto-medium.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-medium.woff") format("woff"), url("#{$roboto-font-path}/roboto-medium.ttf") format("truetype");
2727
}
2828

2929
@font-face {
3030
font-family: "Roboto";
3131
font-style: normal;
3232
font-weight: 700;
33-
src: local("Roboto Bold"), local("Roboto-Bold"), url("#{$roboto-font-path}/roboto-bold.ttf") format("truetype"), url("#{$roboto-font-path}/roboto-bold.woff") format("woff");
33+
src: local("Roboto Bold"), local("Roboto-Bold"), url("#{$roboto-font-path}/roboto-bold.woff2") format("woff2"), url("#{$roboto-font-path}/roboto-bold.woff") format("woff"), url("#{$roboto-font-path}/roboto-bold.ttf") format("truetype");
3434
}

0 commit comments

Comments
 (0)