diff --git a/packages/ionic-angular/.scss-lint.yml b/.scss-lint.yml similarity index 100% rename from packages/ionic-angular/.scss-lint.yml rename to .scss-lint.yml diff --git a/packages/ionic-angular/.scss-linters/default_rule.rb b/.scss-linters/default_rule.rb similarity index 100% rename from packages/ionic-angular/.scss-linters/default_rule.rb rename to .scss-linters/default_rule.rb diff --git a/packages/core-hn-demo/stencil.config.js b/packages/core-hn-demo/stencil.config.js index 86fbf0515b..185af97c93 100644 --- a/packages/core-hn-demo/stencil.config.js +++ b/packages/core-hn-demo/stencil.config.js @@ -5,6 +5,6 @@ exports.config = { { components: ['news-list', 'news-container', 'comments-page', 'comments-list'] } ], collections: [ - '@ionic/core' + '@ionic/core', ] }; diff --git a/packages/core/src/components/loading-controller/loading-controller.ts b/packages/core/src/components/loading-controller/loading-controller.ts index ac8d7d5e6e..0c7a9a5463 100644 --- a/packages/core/src/components/loading-controller/loading-controller.ts +++ b/packages/core/src/components/loading-controller/loading-controller.ts @@ -4,7 +4,7 @@ import { GlobalNamespace, LoadingEvent, LoadingOptions, Loading, IonicController @Component({ tag: 'ion-loading-controller', - styleUrls: 'loading-controller.scss' + styleUrl: 'loading-controller.scss' }) export class LoadingController implements IonicControllerApi { private ids = 0; diff --git a/packages/core/src/components/modal-controller/modal-controller.ts b/packages/core/src/components/modal-controller/modal-controller.ts index 41a09317ff..6c0c105b86 100644 --- a/packages/core/src/components/modal-controller/modal-controller.ts +++ b/packages/core/src/components/modal-controller/modal-controller.ts @@ -4,7 +4,7 @@ import { GlobalNamespace, ModalEvent, ModalOptions, Modal, IonicControllerApi } @Component({ tag: 'ion-modal-controller', - styleUrls: 'modal-controller.scss' + styleUrl: 'modal-controller.scss' }) export class ModalController implements IonicControllerApi { private ids = 0; diff --git a/packages/core/src/components/skeleton-text/skeleton-text.tsx b/packages/core/src/components/skeleton-text/skeleton-text.tsx index 55c36e4fe2..842863119e 100644 --- a/packages/core/src/components/skeleton-text/skeleton-text.tsx +++ b/packages/core/src/components/skeleton-text/skeleton-text.tsx @@ -3,7 +3,7 @@ import { Component, h, Prop } from '@stencil/core'; @Component({ tag: 'ion-skeleton-text', - styleUrls: 'skeleton-text.scss' + styleUrl: 'skeleton-text.scss' }) export class SkeletonText { @Prop() width: string = '100%'; diff --git a/packages/core/src/components/slides/slide.tsx b/packages/core/src/components/slides/slide.tsx index 379ec2ef91..4d4b5aced9 100644 --- a/packages/core/src/components/slides/slide.tsx +++ b/packages/core/src/components/slides/slide.tsx @@ -14,7 +14,7 @@ import { Component, h, VNodeData } from '@stencil/core'; */ @Component({ tag: 'ion-slide', - styleUrls: 'slide.scss' + styleUrl: 'slide.scss' }) export class Slide { hostData(): VNodeData { diff --git a/packages/core/src/components/slides/slides.tsx b/packages/core/src/components/slides/slides.tsx index 0da9edefd8..ceacce5613 100644 --- a/packages/core/src/components/slides/slides.tsx +++ b/packages/core/src/components/slides/slides.tsx @@ -24,7 +24,7 @@ import { Swiper } from '../../vendor/swiper'; @Component({ tag: 'ion-slides', - styleUrls: 'slides.scss' + styleUrl: 'slides.scss' }) export class Slides { swiper: any; diff --git a/packages/ionic-angular/src/components/badge/badge.ios.scss b/packages/ionic-angular/src/components/badge/badge.ios.scss deleted file mode 100644 index 7e9a22b45e..0000000000 --- a/packages/ionic-angular/src/components/badge/badge.ios.scss +++ /dev/null @@ -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; - } - -}