Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
party-build-cloud
Project
Project
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
wangqinghua
party-build-cloud
Commits
aff0710f
Commit
aff0710f
authored
May 08, 2019
by
wangqinghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
样式调整
parent
aaa64f3e
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
31 additions
and
15 deletions
+31
-15
app.scss
src/app/app.scss
+13
-5
slide.scss
src/components/slide/slide.scss
+1
-0
discover.html
src/pages/tabs/discover/discover.html
+4
-1
discover.scss
src/pages/tabs/discover/discover.scss
+1
-0
discover.ts
src/pages/tabs/discover/discover.ts
+4
-1
home.html
src/pages/tabs/home/home.html
+4
-2
home.scss
src/pages/tabs/home/home.scss
+3
-5
icon.scss
src/theme/icon.scss
+1
-1
No files found.
src/app/app.scss
View file @
aff0710f
...
@@ -175,20 +175,28 @@ p {
...
@@ -175,20 +175,28 @@ p {
width
:
100%
;
width
:
100%
;
.tabs-parent
{
.tabs-parent
{
position
:
relative
;
position
:
relative
;
background-color
:
#fff
;
margin-bottom
:
.5rem
;
margin-bottom
:
.5rem
;
font-size
:
1
.7rem
;
font-size
:
1
.7rem
;
white-space
:
nowrap
;
white-space
:
nowrap
;
background-color
:
#fff1f0
;
}
}
.
tabs-parent
:
:-
webkit-scrollbar
{
.
tabs-parent
:
:-
webkit-scrollbar
{
display
:
none
;
display
:
none
;
}
}
.selectTab
{
color
:
#e42417
;
padding
:
6px
2px
;
-webkit-transition
:
background-color
500ms
;
-moz-transition
:
background-color
500ms
;
-ms-transition
:
background-color
500ms
;
-o-transition
:
background-color
500ms
;
transition
:
background-color
500ms
;
}
.tabs-children
{
.tabs-children
{
text-align
:
center
;
text-align
:
center
;
cursor
:
pointer
;
cursor
:
pointer
;
height
:
4
rem
;
height
:
3
rem
;
line-height
:
4
rem
;
line-height
:
3
rem
;
width
:
calc
(
100%
/
4
);
width
:
calc
(
100%
/
4
);
display
:
inline-block
;
display
:
inline-block
;
color
:
#747378
;
color
:
#747378
;
...
@@ -201,7 +209,7 @@ p {
...
@@ -201,7 +209,7 @@ p {
#tips
,
.tips
{
#tips
,
.tips
{
position
:
absolute
;
position
:
absolute
;
bottom
:
5
px
;
bottom
:
0
px
;
height
:
2px
;
height
:
2px
;
width
:
3rem
;
width
:
3rem
;
background-color
:
#e12724
;
background-color
:
#e12724
;
...
...
src/components/slide/slide.scss
View file @
aff0710f
...
@@ -27,6 +27,7 @@ slide {
...
@@ -27,6 +27,7 @@ slide {
}
}
.slides-title
{
.slides-title
{
margin-top
:
5px
;
color
:
#4c4c4c
;
color
:
#4c4c4c
;
width
:
100%
;
width
:
100%
;
text-align
:
left
;
text-align
:
left
;
...
...
src/pages/tabs/discover/discover.html
View file @
aff0710f
...
@@ -41,6 +41,7 @@
...
@@ -41,6 +41,7 @@
</div>
</div>
</div>
</div>
</ion-header>
</ion-header>
<ion-content>
<ion-content>
<ion-refresher
(
ionRefresh
)="
doRefresh
($
event
)"
>
<ion-refresher
(
ionRefresh
)="
doRefresh
($
event
)"
>
<ion-refresher-content
pullingText=
"下拉刷新"
<ion-refresher-content
pullingText=
"下拉刷新"
...
@@ -101,6 +102,8 @@
...
@@ -101,6 +102,8 @@
</ion-slides>
</ion-slides>
<ion-infinite-scroll
(
ionInfinite
)="
doInfinite
($
event
)"
>
<ion-infinite-scroll
(
ionInfinite
)="
doInfinite
($
event
)"
>
<ion-infinite-scroll-content></ion-infinite-scroll-content>
<ion-infinite-scroll-content
loadingSpinner=
"bubbles"
threshold=
"10%"
loadingText=
"加载更多..."
></ion-infinite-scroll-content>
</ion-infinite-scroll>
</ion-infinite-scroll>
</ion-content>
</ion-content>
src/pages/tabs/discover/discover.scss
View file @
aff0710f
...
@@ -147,6 +147,7 @@ page-discover {
...
@@ -147,6 +147,7 @@ page-discover {
align-items
:
baseline
;
align-items
:
baseline
;
font-size
:
1
.4rem
;
font-size
:
1
.4rem
;
overflow-y
:
auto
;
overflow-y
:
auto
;
padding-bottom
:
1rem
;
}
}
.slide-zoom
{
.slide-zoom
{
text-align
:
left
;
text-align
:
left
;
...
...
src/pages/tabs/discover/discover.ts
View file @
aff0710f
...
@@ -274,7 +274,10 @@ export class DiscoverPage {
...
@@ -274,7 +274,10 @@ export class DiscoverPage {
}
}
doInfinite
(
e
)
{
doInfinite
(
e
)
{
e
.
complete
();
console
.
log
(
'infinite'
)
setTimeout
(()
=>
{
e
.
complete
();
},
1000
)
}
}
slideChange
(
e
)
{
slideChange
(
e
)
{
...
...
src/pages/tabs/home/home.html
View file @
aff0710f
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
<div
[
hidden
]="
isScroll
"
class=
"news-content"
>
<div
[
hidden
]="
isScroll
"
class=
"news-content"
>
<div
class=
"tabs-parent"
>
<div
class=
"tabs-parent"
>
<div
*
ngFor=
"let item of tabsList;let i = index"
(
click
)="
change
(
item
)"
class=
"tabs-children"
>
<div
*
ngFor=
"let item of tabsList;let i = index"
(
click
)="
change
(
item
)"
class=
"tabs-children"
>
<span
#
tabSpan
[
style
.
color
]="
index =
=
i
?
'#
e12724
'
:
''
"
>
{{item.name}}
</span>
<span
#
tabSpan
[
ngClass
]="{'
selectTab
'
:index =
=
i
}
"
>
{{item.name}}
</span>
</div>
</div>
<span
#
tips
class=
"tips"
></span>
<span
#
tips
class=
"tips"
></span>
</div>
</div>
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
<div
[
hidden
]="!
isScroll
"
ion-fixed
class=
"news-content ion-fixed"
>
<div
[
hidden
]="!
isScroll
"
ion-fixed
class=
"news-content ion-fixed"
>
<div
class=
"tabs-parent"
>
<div
class=
"tabs-parent"
>
<div
*
ngFor=
"let item of tabsList;let i = index"
(
click
)="
change
(
item
)"
class=
"tabs-children"
>
<div
*
ngFor=
"let item of tabsList;let i = index"
(
click
)="
change
(
item
)"
class=
"tabs-children"
>
<span
#
tabSpan1
[
style
.
color
]="
index =
=
i
?
'#
e12724
'
:
''
"
>
{{item.name}}
</span>
<span
#
tabSpan1
[
ngClass
]="{'
selectTab
'
:index =
=
i
}
"
>
{{item.name}}
</span>
</div>
</div>
<span
#
tips1
class=
"tips"
></span>
<span
#
tips1
class=
"tips"
></span>
</div>
</div>
...
@@ -100,6 +100,8 @@
...
@@ -100,6 +100,8 @@
</div>
</div>
</ion-slide>
</ion-slide>
</ion-slides>
</ion-slides>
<ion-infinite-scroll
#
infiniteScrollContent
(
ionInfinite
)="
doInfinite
($
event
)"
>
<ion-infinite-scroll
#
infiniteScrollContent
(
ionInfinite
)="
doInfinite
($
event
)"
>
<ion-infinite-scroll-content
<ion-infinite-scroll-content
loadingSpinner=
"bubbles"
threshold=
"10%"
loadingSpinner=
"bubbles"
threshold=
"10%"
...
...
src/pages/tabs/home/home.scss
View file @
aff0710f
page-home
{
page-home
{
//头部搜索
//头部搜索
.toolbar
.searchbar-ios
.searchbar-input
{
.toolbar
.searchbar-ios
.searchbar-input
{
background-color
:
#e12724
;
background-color
:
#e12724
;
...
@@ -109,7 +106,7 @@ page-home {
...
@@ -109,7 +106,7 @@ page-home {
}
}
.news-content
{
.news-content
{
margin-top
:
1
.2
rem
;
margin-top
:
.8
rem
;
}
}
.news-content.ion-fixed
{
.news-content.ion-fixed
{
margin
:
0
;
margin
:
0
;
...
@@ -189,7 +186,8 @@ page-home {
...
@@ -189,7 +186,8 @@ page-home {
.swiper-slide
{
.swiper-slide
{
align-items
:
baseline
;
align-items
:
baseline
;
font-size
:
1
.4rem
;
font-size
:
1
.4rem
;
overflow-y
:
auto
;
overflow-y
:
scroll
;
padding-bottom
:
1rem
;
}
}
.slide-zoom
{
.slide-zoom
{
text-align
:
left
;
text-align
:
left
;
...
...
src/theme/icon.scss
View file @
aff0710f
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
//tabs-icon
//tabs-icon
ion-icon
{
ion-icon
{
&
[
class
*=
"custom-"
]
{
&
[
class
*=
"custom-"
]
{
margin
:
0
5
px
0
0
;
margin
:
0
2
px
0
0
;
vertical-align
:
middle
;
vertical-align
:
middle
;
$sz
:
20px
;
$sz
:
20px
;
width
:
$sz
;
width
:
$sz
;
...
...
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