javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(): corrected some components based on stencil updates. Also moved style based linting to top level directory.

Browse Source
This commit is contained in:
Josh Thomas
2017-06-28 14:43:44 -05:00
parent c94a1b7d97
commit f511aecd0a
9 changed files with 6 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
packages/ionic-angular/.scss-lint.yml → .scss-lint.yml
View File

0
packages/ionic-angular/.scss-linters/default_rule.rb → .scss-linters/default_rule.rb
View File

2
packages/core-hn-demo/stencil.config.js
View File

@ -5,6 +5,6 @@ exports.config = {
{ components: ['news-list', 'news-container', 'comments-page', 'comments-list'] } { components: ['news-list', 'news-container', 'comments-page', 'comments-list'] }
], ],
collections: [ collections: [
'@ionic/core' '@ionic/core',
] ]
}; };

2
packages/core/src/components/loading-controller/loading-controller.ts
View File

@ -4,7 +4,7 @@ import { GlobalNamespace, LoadingEvent, LoadingOptions, Loading, IonicController
@Component({ @Component({
tag: 'ion-loading-controller', tag: 'ion-loading-controller',
styleUrls: 'loading-controller.scss' styleUrl: 'loading-controller.scss'
}) })
export class LoadingController implements IonicControllerApi { export class LoadingController implements IonicControllerApi {
private ids = 0; private ids = 0;

2
packages/core/src/components/modal-controller/modal-controller.ts
View File

@ -4,7 +4,7 @@ import { GlobalNamespace, ModalEvent, ModalOptions, Modal, IonicControllerApi }
@Component({ @Component({
tag: 'ion-modal-controller', tag: 'ion-modal-controller',
styleUrls: 'modal-controller.scss' styleUrl: 'modal-controller.scss'
}) })
export class ModalController implements IonicControllerApi { export class ModalController implements IonicControllerApi {
private ids = 0; private ids = 0;

2
packages/core/src/components/skeleton-text/skeleton-text.tsx
View File

@ -3,7 +3,7 @@ import { Component, h, Prop } from '@stencil/core';
@Component({ @Component({
tag: 'ion-skeleton-text', tag: 'ion-skeleton-text',
styleUrls: 'skeleton-text.scss' styleUrl: 'skeleton-text.scss'
}) })
export class SkeletonText { export class SkeletonText {
@Prop() width: string = '100%'; @Prop() width: string = '100%';

2
packages/core/src/components/slides/slide.tsx
View File

@ -14,7 +14,7 @@ import { Component, h, VNodeData } from '@stencil/core';
*/ */
@Component({ @Component({
tag: 'ion-slide', tag: 'ion-slide',
styleUrls: 'slide.scss' styleUrl: 'slide.scss'
}) })
export class Slide { export class Slide {
hostData(): VNodeData { hostData(): VNodeData {

2
packages/core/src/components/slides/slides.tsx
View File

@ -24,7 +24,7 @@ import { Swiper } from '../../vendor/swiper';
@Component({ @Component({
tag: 'ion-slides', tag: 'ion-slides',
styleUrls: 'slides.scss' styleUrl: 'slides.scss'
}) })
export class Slides { export class Slides {
swiper: any; swiper: any;

36
packages/ionic-angular/src/components/badge/badge.ios.scss
View File

@ -1,36 +0,0 @@
@import "../../themes/ionic.globals.ios";
@import "./badge";
// iOS Badge
// --------------------------------------------------
/// @prop - Border radius of the badge
$badge-ios-border-radius: 10px !default;
/// @prop - Background color of the badge
$badge-ios-background-color: color($colors-ios, primary) !default;
/// @prop - Text color of the badge
$badge-ios-text-color: color-contrast($colors-ios, $badge-ios-background-color) !default;
.badge-ios {
@include border-radius($badge-ios-border-radius);
color: $badge-ios-text-color;
background-color: $badge-ios-background-color;
}
// Generate iOS Badge Colors
// --------------------------------------------------
@each $color-name, $color-base, $color-contrast in get-colors($colors-ios) {
.badge-ios-#{$color-name} {
color: $color-contrast;
background-color: $color-base;
}
}