From 4a254b38ca95c1bf6e19b9a309e530f34d6f7bbf Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Fri, 19 Jun 2015 12:07:01 -0500 Subject: [PATCH] Card tweaks --- ionic/components/card/card.scss | 7 +++---- ionic/components/card/test/basic/main.html | 13 ++++++++++++ ionic/components/slides/slides.js | 23 ++++++++++++++-------- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/ionic/components/card/card.scss b/ionic/components/card/card.scss index e13e25a7f2..a56db9b2e0 100644 --- a/ionic/components/card/card.scss +++ b/ionic/components/card/card.scss @@ -12,13 +12,12 @@ $card-box-shadow: 0 1px 3px rgba(0, 0, 0, .3) !default; .card { - - .card-content { - padding: 20px; + .card-header, .card-footer, .card-content { + padding: 15px; } img { - max-width: 100%; + width: 100%; } } diff --git a/ionic/components/card/test/basic/main.html b/ionic/components/card/test/basic/main.html index bf3c3b25d3..98d46203bc 100644 --- a/ionic/components/card/test/basic/main.html +++ b/ionic/components/card/test/basic/main.html @@ -7,6 +7,19 @@ List Header +
+
+ New Post +
+
+ Keep close to Nature's heart... and break clear away, once in awhile, and climb a mountain or spend a week in the woods. Wash your spirit clean. +
+ + +
+
diff --git a/ionic/components/slides/slides.js b/ionic/components/slides/slides.js index 3e9209ac87..7028aaa9e4 100644 --- a/ionic/components/slides/slides.js +++ b/ionic/components/slides/slides.js @@ -9,7 +9,7 @@ import {DragGesture} from 'ionic/gestures/drag-gesture'; import * as util from 'ionic/util'; import {dom} from 'ionic/util' -import {IonicComponent} from 'ionic/config/component' +import {IonicComponent, IonicDirective} from 'ionic/config/component' import {Hammer} from 'ionic/gestures/hammer'; @@ -51,8 +51,6 @@ export class Slides { // Grab the main container, and the slides-view wrapper this.domElement = elementRef.domElement; - this.config = Slides.config.invoke(this); - this.slides = []; this.currentIndex = 0; @@ -463,20 +461,24 @@ export class Slides { } -@Directive({ - selector: 'ion-slide', -}) +@IonicDirective(Slide) export class Slide { constructor( @Ancestor() slides: Slides, elementRef: ElementRef ) { this.domElement = elementRef.domElement; - this.config = Slide.config.invoke(this); slides.add(this); } + static get config() { + return { + selector: 'ion-slide', + } + } + + translate(x, duration) { this._translateX = x; @@ -523,13 +525,18 @@ export class SlidePager { elementRef: ElementRef ) { this.domElement = elementRef.domElement; - this.config = SlidePager.config.invoke(this); this.slides = slides; this.slides.setPager(this); } + static get config() { + return { + selector: 'ion-pager', + } + } + getSlides() { return this.slides.slides; }