Skip to content

Commit 24f0a92

Browse files
update to ionic 2.2.0
Upgrade the app to the latest ionic version to provide an up to date example project.
1 parent a3a829c commit 24f0a92

File tree

5 files changed

+62811
-29341
lines changed

5 files changed

+62811
-29341
lines changed

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@
1313
"run:before": "build"
1414
},
1515
"dependencies": {
16-
"@angular/common": "2.2.1",
17-
"@angular/compiler": "2.2.1",
18-
"@angular/compiler-cli": "2.2.1",
19-
"@angular/core": "2.2.1",
20-
"@angular/forms": "2.2.1",
21-
"@angular/http": "2.2.1",
22-
"@angular/platform-browser": "2.2.1",
23-
"@angular/platform-browser-dynamic": "2.2.1",
24-
"@angular/platform-server": "2.2.1",
25-
"@ionic/storage": "1.1.9",
26-
"ionic-angular": "2.1.0",
27-
"ionic-native": "2.5.1",
16+
"@angular/common": "2.4.8",
17+
"@angular/compiler": "2.4.8",
18+
"@angular/compiler-cli": "2.4.8",
19+
"@angular/core": "2.4.8",
20+
"@angular/forms": "2.4.8",
21+
"@angular/http": "2.4.8",
22+
"@angular/platform-browser": "2.4.8",
23+
"@angular/platform-browser-dynamic": "2.4.8",
24+
"@angular/platform-server": "2.4.8",
25+
"@ionic/storage": "2.0.0",
26+
"ionic-angular": "2.2.0",
27+
"ionic-native": "2.4.1",
2828
"ionicons": "3.0.0",
29-
"rxjs": "5.0.0-beta.12",
29+
"rxjs": "5.0.1",
3030
"sw-toolbox": "3.4.0",
31-
"zone.js": "~0.6.26"
31+
"zone.js": "0.7.2"
3232
},
3333
"devDependencies": {
3434
"@ionic/app-scripts": "1.1.4",

www/build/main.css

Lines changed: 115 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4720,10 +4720,6 @@ textarea::-webkit-input-placeholder {
47204720
padding-left: 2px;
47214721
}
47224722

4723-
textarea::-moz-placeholder {
4724-
padding-left: 2px;
4725-
}
4726-
47274723
textarea:-ms-input-placeholder {
47284724
padding-left: 2px;
47294725
}
@@ -5103,6 +5099,10 @@ ion-footer {
51035099
white-space: nowrap;
51045100
}
51055101

5102+
[text-wrap] {
5103+
white-space: normal;
5104+
}
5105+
51065106
[text-uppercase] {
51075107
text-transform: uppercase;
51085108
}
@@ -12852,6 +12852,18 @@ ion-infinite-scroll-content {
1285212852
color: #666;
1285312853
}
1285412854

12855+
.infinite-loading-spinner .spinner-ios line,
12856+
.infinite-loading-spinner .spinner-ios-small line,
12857+
.infinite-loading-spinner .spinner-crescent circle {
12858+
stroke: #666;
12859+
}
12860+
12861+
.infinite-loading-spinner .spinner-bubbles circle,
12862+
.infinite-loading-spinner .spinner-circles circle,
12863+
.infinite-loading-spinner .spinner-dots circle {
12864+
fill: #666;
12865+
}
12866+
1285512867
ion-infinite-scroll-content[state=loading] .infinite-loading {
1285612868
display: block;
1285712869
}
@@ -17048,6 +17060,18 @@ ion-refresher-content {
1704817060
color: #000;
1704917061
}
1705017062

17063+
.refresher-refreshing .spinner-ios line,
17064+
.refresher-refreshing .spinner-ios-small line,
17065+
.refresher-refreshing .spinner-crescent circle {
17066+
stroke: #000;
17067+
}
17068+
17069+
.refresher-refreshing .spinner-bubbles circle,
17070+
.refresher-refreshing .spinner-circles circle,
17071+
.refresher-refreshing .spinner-dots circle {
17072+
fill: #000;
17073+
}
17074+
1705117075
ion-refresher-content[state=pulling] .refresher-pulling {
1705217076
display: block;
1705317077
}
@@ -19384,6 +19408,93 @@ ion-spinner.spinner-paused svg {
1938419408
fill: #69BB7B;
1938519409
}
1938619410

19411+
ion-split-pane {
19412+
position: absolute;
19413+
top: 0;
19414+
right: 0;
19415+
bottom: 0;
19416+
left: 0;
19417+
display: -webkit-flex;
19418+
display: -ms-flexbox;
19419+
display: flex;
19420+
-webkit-flex-wrap: nowrap;
19421+
-ms-flex-wrap: nowrap;
19422+
flex-wrap: nowrap;
19423+
contain: strict;
19424+
}
19425+
19426+
.split-pane-side:not(ion-menu) {
19427+
display: none;
19428+
}
19429+
19430+
.split-pane-visible > .split-pane-side,
19431+
.split-pane-visible > .split-pane-main {
19432+
position: relative;
19433+
top: 0;
19434+
right: 0;
19435+
bottom: 0;
19436+
left: 0;
19437+
z-index: 0;
19438+
-webkit-flex: 1;
19439+
-ms-flex: 1;
19440+
flex: 1;
19441+
box-shadow: none !important;
19442+
}
19443+
19444+
.split-pane-visible > .split-pane-side {
19445+
-webkit-flex-shrink: 0;
19446+
-ms-flex-negative: 0;
19447+
flex-shrink: 0;
19448+
-webkit-order: -1;
19449+
-ms-flex-order: -1;
19450+
order: -1;
19451+
}
19452+
19453+
.split-pane-visible > .split-pane-main,
19454+
.split-pane-visible > ion-nav.split-pane-side,
19455+
.split-pane-visible > ion-tabs.split-pane-side,
19456+
.split-pane-visible > ion-menu.menu-enabled {
19457+
display: block;
19458+
}
19459+
19460+
.split-pane-visible > ion-split-pane.split-pane-side,
19461+
.split-pane-visible > ion-split-pane.split-pane-main {
19462+
display: -webkit-flex;
19463+
display: -ms-flexbox;
19464+
display: flex;
19465+
}
19466+
19467+
.split-pane-visible > ion-menu.menu-enabled > .menu-inner {
19468+
right: 0;
19469+
left: 0;
19470+
width: auto;
19471+
box-shadow: none !important;
19472+
-webkit-transform: none !important;
19473+
transform: none !important;
19474+
}
19475+
19476+
.split-pane-visible > ion-menu.menu-enabled > .ion-backdrop {
19477+
display: hidden !important;
19478+
}
19479+
19480+
.split-pane-ios.split-pane-visible > .split-pane-side {
19481+
min-width: 270px;
19482+
max-width: 28%;
19483+
border-right: 0.55px solid #c8c7cc;
19484+
}
19485+
19486+
.split-pane-md.split-pane-visible > .split-pane-side {
19487+
min-width: 270px;
19488+
max-width: 28%;
19489+
border-right: 1px solid #dedede;
19490+
}
19491+
19492+
.split-pane-wp.split-pane-visible > .split-pane-side {
19493+
min-width: 270px;
19494+
max-width: 28%;
19495+
border-right: 1px solid transparent;
19496+
}
19497+
1938719498
.tabbar {
1938819499
position: absolute;
1938919500
bottom: 0;

0 commit comments

Comments
 (0)