Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
allo-app
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nabil Sadki
allo-app
Commits
47eb079c
Commit
47eb079c
authored
Sep 07, 2019
by
Nabil Sadki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v1.1.0.0' into v1.1.5.0
parents
212d63d0
1c366bdd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
9 deletions
+13
-9
CHANGELOG.md
CHANGELOG.md
+1
-0
mainslider.page.html
src/app/pages/mainslider/mainslider.page.html
+8
-8
mainslider.page.ts
src/app/pages/mainslider/mainslider.page.ts
+4
-1
No files found.
CHANGELOG.md
View file @
47eb079c
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
...
...
src/app/pages/mainslider/mainslider.page.html
View file @
47eb079c
<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>
<i
on-img
src=
"assets/img/mainslider/0.png"
></ion-img
>
<i
mg
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>
<i
on-img
src=
"assets/img/mainslider/1.png"
></ion-img
>
<i
mg
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>
<i
on-img
src=
"assets/img/mainslider/2.png"
></ion-img
>
<i
mg
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>
<i
on-img
src=
"assets/img/mainslider/3.png"
></ion-img
>
<i
mg
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>
<i
on-img
src=
"assets/img/mainslider/4.png"
></ion-img
>
<i
mg
src=
"assets/img/mainslider/4.png"
/
>
</ion-col>
</ion-col>
</ion-row>
</ion-row>
<ion-row>
<ion-row>
...
...
src/app/pages/mainslider/mainslider.page.ts
View file @
47eb079c
...
@@ -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
;
});
});
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment