fix(infinite-scroll): move css to ion-infinite-scroll-content

This commit is contained in:
Manu Mtz.-Almeida
2018-02-09 18:14:35 +01:00
parent 3d5abffdd6
commit 4189c4fd9f
12 changed files with 87 additions and 86 deletions

View File

@ -0,0 +1,18 @@
@import "./infinite-scroll-content";
@import "./infinite-scroll-content.ios.vars";
.infinite-scroll-content-ios .infinite-loading-text {
color: $infinite-scroll-ios-loading-text-color;
}
.infinite-scroll-content-ios .infinite-loading-spinner .spinner-ios line,
.infinite-scroll-content-ios .infinite-loading-spinner .spinner-ios-small line,
.infinite-scroll-content-ios .infinite-loading-spinner .spinner-crescent circle {
stroke: $infinite-scroll-ios-loading-color;
}
.infinite-scroll-content-ios .infinite-loading-spinner .spinner-bubbles circle,
.infinite-scroll-content-ios .infinite-loading-spinner .spinner-circles circle,
.infinite-scroll-content-ios .infinite-loading-spinner .spinner-dots circle {
fill: $infinite-scroll-ios-loading-color;
}

View File

@ -0,0 +1,16 @@
@import "./infinite-scroll-content";
@import "./infinite-scroll-content.md.vars";
.infinite-scroll-content-md .infinite-loading-text {
color: $infinite-scroll-md-loading-text-color;
}
.infinite-scroll-content-md .infinite-loading-spinner .spinner-crescent circle {
stroke: $infinite-scroll-md-loading-color;
}
.infinite-scroll-content-md .infinite-loading-spinner .spinner-bubbles circle,
.infinite-scroll-content-md .infinite-loading-spinner .spinner-circles circle,
.infinite-scroll-content-md .infinite-loading-spinner .spinner-dots circle {
fill: $infinite-scroll-md-loading-color;
}

View File

@ -0,0 +1,36 @@
@import "./infinite-scroll-content.vars";
// Infinite Scroll Content
// --------------------------------------------------
ion-infinite-scroll-content {
@include text-align(center);
display: flex;
flex-direction: column;
justify-content: center;
min-height: $infinite-scroll-content-min-height;
}
.infinite-loading {
@include margin($infinite-scroll-loading-margin-top, $infinite-scroll-loading-margin-end, $infinite-scroll-loading-margin-bottom, $infinite-scroll-loading-margin-start);
display: none;
width: 100%;
}
.infinite-loading-text {
@include margin($infinite-scroll-loading-text-margin-top, $infinite-scroll-loading-text-margin-end, $infinite-scroll-loading-text-margin-bottom, $infinite-scroll-loading-text-margin-start);
}
// Infinite Scroll Content States
// --------------------------------------------------
.infinite-scroll-loading ion-infinite-scroll-content > .infinite-loading {
display: block;
}

View File

@ -3,7 +3,14 @@ import { Config } from '../../index';
@Component({
tag: 'ion-infinite-scroll-content'
tag: 'ion-infinite-scroll-content',
styleUrls: {
ios: 'infinite-scroll-content.ios.scss',
md: 'infinite-scroll-content.md.scss'
},
host: {
theme: 'infinite-scroll-content'
}
})
export class InfiniteScrollContent {

View File

@ -1,17 +0,0 @@
@import "./infinite-scroll.ios.vars";
.infinite-scroll-ios .infinite-loading-text {
color: $infinite-scroll-ios-loading-text-color;
}
.infinite-scroll-ios .infinite-loading-spinner .spinner-ios line,
.infinite-scroll-ios .infinite-loading-spinner .spinner-ios-small line,
.infinite-scroll-ios .infinite-loading-spinner .spinner-crescent circle {
stroke: $infinite-scroll-ios-loading-color;
}
.infinite-scroll-ios .infinite-loading-spinner .spinner-bubbles circle,
.infinite-scroll-ios .infinite-loading-spinner .spinner-circles circle,
.infinite-scroll-ios .infinite-loading-spinner .spinner-dots circle {
fill: $infinite-scroll-ios-loading-color;
}

View File

@ -1,15 +0,0 @@
@import "./infinite-scroll.md.vars";
.infinite-scroll-md .infinite-loading-text {
color: $infinite-scroll-md-loading-text-color;
}
.infinite-scroll-md .infinite-loading-spinner .spinner-crescent circle {
stroke: $infinite-scroll-md-loading-color;
}
.infinite-scroll-md .infinite-loading-spinner .spinner-bubbles circle,
.infinite-scroll-md .infinite-loading-spinner .spinner-circles circle,
.infinite-scroll-md .infinite-loading-spinner .spinner-dots circle {
fill: $infinite-scroll-md-loading-color;
}

View File

@ -1,5 +1,3 @@
@import "./infinite-scroll.vars";
// Infinite Scroll
// --------------------------------------------------
@ -12,39 +10,3 @@ ion-infinite-scroll {
.infinite-scroll-enabled {
display: block;
}
// Infinite Scroll Content
// --------------------------------------------------
ion-infinite-scroll-content {
@include text-align(center);
display: flex;
flex-direction: column;
justify-content: center;
min-height: $infinite-scroll-content-min-height;
}
.infinite-loading {
@include margin($infinite-scroll-loading-margin-top, $infinite-scroll-loading-margin-end, $infinite-scroll-loading-margin-bottom, $infinite-scroll-loading-margin-start);
display: none;
width: 100%;
}
.infinite-loading-text {
@include margin($infinite-scroll-loading-text-margin-top, $infinite-scroll-loading-text-margin-end, $infinite-scroll-loading-text-margin-bottom, $infinite-scroll-loading-text-margin-start);
}
// Infinite Scroll Content States
// --------------------------------------------------
.infinite-scroll-loading ion-infinite-scroll-content > .infinite-loading {
display: block;
}

View File

@ -9,13 +9,7 @@ const enum Position {
@Component({
tag: 'ion-infinite-scroll',
styleUrls: {
ios: 'infinite-scroll.ios.scss',
md: 'infinite-scroll.md.scss'
},
host: {
theme: 'infinite-scroll'
}
styleUrl: 'infinite-scroll.scss'
})
export class InfiniteScroll {

View File

@ -7,11 +7,6 @@
## Properties
#### disabled
boolean
#### onionScroll
@ -27,13 +22,13 @@ boolean
## Attributes
#### disabled
#### scrollEvents
boolean
## Attributes
#### onion-scroll
@ -49,6 +44,11 @@ boolean
#### scroll-events
boolean
## Events
#### ionScroll