From 771857b1df9470ebc15357e8879118a72c649d5b Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Sun, 26 Aug 2018 01:35:42 +0200 Subject: [PATCH] refactor(thumbnail): make it mode less --- core/src/components/slides/slides.tsx | 8 +------- core/src/components/thumbnail/thumbnail.ios.scss | 10 ---------- .../components/thumbnail/thumbnail.ios.vars.scss | 13 ------------- core/src/components/thumbnail/thumbnail.md.scss | 10 ---------- .../components/thumbnail/thumbnail.md.vars.scss | 13 ------------- core/src/components/thumbnail/thumbnail.scss | 2 ++ core/src/components/thumbnail/thumbnail.tsx | 16 +--------------- 7 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 core/src/components/thumbnail/thumbnail.ios.scss delete mode 100644 core/src/components/thumbnail/thumbnail.ios.vars.scss delete mode 100644 core/src/components/thumbnail/thumbnail.md.scss delete mode 100644 core/src/components/thumbnail/thumbnail.md.vars.scss diff --git a/core/src/components/slides/slides.tsx b/core/src/components/slides/slides.tsx index 48fd53f29d..d5c2f75043 100644 --- a/core/src/components/slides/slides.tsx +++ b/core/src/components/slides/slides.tsx @@ -1,7 +1,6 @@ import { Component, Element, Event, EventEmitter, Method, Prop, Watch } from '@stencil/core'; import { Mode } from '../../interface.js'; -import { createThemedClasses } from '../../utils/theme.js'; import { Swiper } from './vendor/swiper.js'; @@ -15,6 +14,7 @@ import { Swiper } from './vendor/swiper.js'; shadow: true }) export class Slides { + private container!: HTMLElement; private swiper: any; @@ -391,12 +391,6 @@ export class Slides { return { ...swiperOptions, ...this.options, ...eventOptions }; } - hostData() { - return { - class: createThemedClasses(this.mode, 'slides') - }; - } - render() { return (
this.container = el as HTMLElement }> diff --git a/core/src/components/thumbnail/thumbnail.ios.scss b/core/src/components/thumbnail/thumbnail.ios.scss deleted file mode 100644 index e3add452ec..0000000000 --- a/core/src/components/thumbnail/thumbnail.ios.scss +++ /dev/null @@ -1,10 +0,0 @@ -@import "./thumbnail"; -@import "./thumbnail.ios.vars"; - -// iOS Thumbnail -// -------------------------------------------------- - -:host { - --size: #{$thumbnail-ios-width}; - --border-radius: #{$thumbnail-ios-border-radius}; -} diff --git a/core/src/components/thumbnail/thumbnail.ios.vars.scss b/core/src/components/thumbnail/thumbnail.ios.vars.scss deleted file mode 100644 index 85d53e58a4..0000000000 --- a/core/src/components/thumbnail/thumbnail.ios.vars.scss +++ /dev/null @@ -1,13 +0,0 @@ -@import "../../themes/ionic.globals.ios"; - -// iOS Thumbnail -// -------------------------------------------------- - -/// @prop - Width of the thumbnail -$thumbnail-ios-width: 48px !default; - -/// @prop - Height of the thumbnail -$thumbnail-ios-height: $thumbnail-ios-width !default; - -/// @prop - Border radius of the thumbnail -$thumbnail-ios-border-radius: 0 !default; diff --git a/core/src/components/thumbnail/thumbnail.md.scss b/core/src/components/thumbnail/thumbnail.md.scss deleted file mode 100644 index 0fbb2ca515..0000000000 --- a/core/src/components/thumbnail/thumbnail.md.scss +++ /dev/null @@ -1,10 +0,0 @@ -@import "./thumbnail"; -@import "./thumbnail.md.vars"; - -// Material Design Thumbnail -// -------------------------------------------------- - -:host { - --size: #{$thumbnail-md-width}; - --border-radius: #{$thumbnail-md-border-radius}; -} diff --git a/core/src/components/thumbnail/thumbnail.md.vars.scss b/core/src/components/thumbnail/thumbnail.md.vars.scss deleted file mode 100644 index 94e48b264d..0000000000 --- a/core/src/components/thumbnail/thumbnail.md.vars.scss +++ /dev/null @@ -1,13 +0,0 @@ -@import "../../themes/ionic.globals.md"; - -// Material Design Thumbnail -// -------------------------------------------------- - -/// @prop - Width of the thumbnail -$thumbnail-md-width: 48px !default; - -/// @prop - Height of the thumbnail -$thumbnail-md-height: $thumbnail-md-width !default; - -/// @prop - Border radius of the thumbnail -$thumbnail-md-border-radius: 0 !default; diff --git a/core/src/components/thumbnail/thumbnail.scss b/core/src/components/thumbnail/thumbnail.scss index 8ac3a223f4..8af268d95d 100644 --- a/core/src/components/thumbnail/thumbnail.scss +++ b/core/src/components/thumbnail/thumbnail.scss @@ -9,6 +9,8 @@ * @prop --border-radius: Border radius of the thumbnail * @prop --size: Size of the thumbnail */ + --size: 48px; + --border-radius: 0; @include border-radius(var(--border-radius)); diff --git a/core/src/components/thumbnail/thumbnail.tsx b/core/src/components/thumbnail/thumbnail.tsx index 50ff2c24a2..de76593861 100644 --- a/core/src/components/thumbnail/thumbnail.tsx +++ b/core/src/components/thumbnail/thumbnail.tsx @@ -1,25 +1,11 @@ import { Component } from '@stencil/core'; -import { Mode } from '../../interface'; -import { createThemedClasses } from '../../utils/theme'; - @Component({ tag: 'ion-thumbnail', - styleUrls: { - ios: 'thumbnail.ios.scss', - md: 'thumbnail.md.scss' - }, + styleUrl: 'thumbnail.scss', shadow: true }) export class Thumbnail { - mode!: Mode; - - hostData() { - return { - class: createThemedClasses(this.mode, 'thumbnail') - }; - } - render() { return ; }