Commit 47eb079c by Nabil Sadki

Merge branch 'v1.1.0.0' into v1.1.5.0

parents 212d63d0 1c366bdd
v1.1.0.0 v1.1.0.0
- Add login form - Add login form
- Optimise launch time - Optimise launch time
- Fix presentation slider skip transition
v1.0.8.3 v1.0.8.3
- Show main slide - Show main slide
......
<ion-content> <ion-content color="primary">
<ion-slides #mainSlider pager="true"> <ion-slides #mainSlider [options]="slideOpts" pager="true" [hidden]="hideSlider">
<ion-slide color="primary" padding> <ion-slide padding>
<ion-item lines="none" color="primary" class="skip"> <ion-item lines="none" color="primary" class="skip">
<ion-button fill="outline" color="light" (click)="skipPresentation($event)"> <ion-button fill="outline" color="light" (click)="skipPresentation($event)">
Passer <ion-icon name="arrow-dropright-circle" slot="end"></ion-icon> Passer <ion-icon name="arrow-dropright-circle" slot="end"></ion-icon>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<ion-grid> <ion-grid>
<ion-row> <ion-row>
<ion-col> <ion-col>
<ion-img src="assets/img/mainslider/0.png"></ion-img> <img src="assets/img/mainslider/0.png" />
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row> <ion-row>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<ion-grid> <ion-grid>
<ion-row> <ion-row>
<ion-col> <ion-col>
<ion-img src="assets/img/mainslider/1.png"></ion-img> <img src="assets/img/mainslider/1.png" />
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row> <ion-row>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<ion-grid> <ion-grid>
<ion-row> <ion-row>
<ion-col> <ion-col>
<ion-img src="assets/img/mainslider/2.png"></ion-img> <img src="assets/img/mainslider/2.png" />
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row> <ion-row>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<ion-grid> <ion-grid>
<ion-row> <ion-row>
<ion-col> <ion-col>
<ion-img src="assets/img/mainslider/3.png"></ion-img> <img src="assets/img/mainslider/3.png" />
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row> <ion-row>
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
<ion-grid> <ion-grid>
<ion-row> <ion-row>
<ion-col> <ion-col>
<ion-img src="assets/img/mainslider/4.png"></ion-img> <img src="assets/img/mainslider/4.png" />
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row> <ion-row>
......
...@@ -24,6 +24,7 @@ export class MainsliderPage implements OnInit { ...@@ -24,6 +24,7 @@ export class MainsliderPage implements OnInit {
} }
}; };
public prmMainslider: boolean; public prmMainslider: boolean;
public hideSlider = false;
constructor( constructor(
public platform: Platform, public platform: Platform,
...@@ -72,7 +73,9 @@ export class MainsliderPage implements OnInit { ...@@ -72,7 +73,9 @@ export class MainsliderPage implements OnInit {
skipPresentation($event) { skipPresentation($event) {
this.mainSlider.getActiveIndex().then(index => { this.mainSlider.getActiveIndex().then(index => {
this.mainSlider.slideTo(4); this.hideSlider = true;
this.mainSlider.slideTo(4, 1000);
this.hideSlider = false;
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment