From c657bb6d6a7a5ccc0be601b63391f60ef5209dd0 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Wed, 7 Oct 2015 14:57:56 -0500 Subject: [PATCH] alpha39 updates/hacks Conflicts: ionic/components/search-bar/search-bar.ts ionic/config/decorators.ts --- demos/snapcat/main.html | 8 ++++---- ionic/components.ts | 1 - ionic/components/card/card.ts | 12 ------------ ionic/components/item/item.scss | 6 ++++++ ionic/components/item/item.ts | 17 +++++++++-------- ionic/components/item/modes/ios.scss | 2 +- ionic/components/item/modes/md.scss | 4 ++-- ionic/components/search-bar/test/basic/index.ts | 3 +-- ionic/config/directives.ts | 2 -- 9 files changed, 23 insertions(+), 32 deletions(-) delete mode 100644 ionic/components/card/card.ts diff --git a/demos/snapcat/main.html b/demos/snapcat/main.html index c214b45284..ca6e1c4d05 100644 --- a/demos/snapcat/main.html +++ b/demos/snapcat/main.html @@ -46,18 +46,18 @@ ion-content { background-color: #F5F5F5 !important; } - .card { + ion-card { box-shadow: none !important; } - .card .card-content { + ion-card ion-card-content { font-family: 'lato'; font-size: 16px; line-height: 25px; } - .card .item { + ion-card .item { border: none !important; } - .card .card-content { + ion-card ion-card-content { padding: 25px !important; } .item { diff --git a/ionic/components.ts b/ionic/components.ts index 895be1f630..a4ff6ecc97 100644 --- a/ionic/components.ts +++ b/ionic/components.ts @@ -4,7 +4,6 @@ export * from 'ionic/components/app/id' export * from 'ionic/components/action-sheet/action-sheet' export * from 'ionic/components/blur/blur' export * from 'ionic/components/button/button' -export * from 'ionic/components/card/card' export * from 'ionic/components/checkbox/checkbox' export * from 'ionic/components/content/content' export * from 'ionic/components/form/input' diff --git a/ionic/components/card/card.ts b/ionic/components/card/card.ts deleted file mode 100644 index 437ec3626f..0000000000 --- a/ionic/components/card/card.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Directive} from 'angular2/angular2'; - -/** - * TODO - */ -@Directive({ - selector: 'ion-card', - host: { - 'class': 'card' - } -}) -export class Card {} diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss index ee95de565d..b46024342b 100644 --- a/ionic/components/item/item.scss +++ b/ionic/components/item/item.scss @@ -155,3 +155,9 @@ ion-item-options { z-index: $z-index-item-options; height: 100%; } + + +// TEMP hack for https://github.com/angular/angular/issues/4582 +[item-right] { + order: 1; +} diff --git a/ionic/components/item/item.ts b/ionic/components/item/item.ts index 8863eb0539..785cca26cc 100644 --- a/ionic/components/item/item.ts +++ b/ionic/components/item/item.ts @@ -1,4 +1,4 @@ -import {Component, View} from 'angular2/angular2'; +import {Component, View, ElementRef, Renderer} from 'angular2/angular2'; /** @@ -18,17 +18,18 @@ import {Component, View} from 'angular2/angular2'; * ``` */ @Component({ - selector: 'ion-item,[ion-item]', - host: { - 'class': 'item' - } + selector: 'ion-item,[ion-item]' }) @View({ template: '' + + '' + '' + ''+ - '' + - '' + '' }) -export class Item {} +export class Item { + constructor(elementRef: ElementRef, renderer: Renderer) { + renderer.setElementClass(elementRef, 'item', true); + } +} diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss index 91d497470e..57f76a04db 100644 --- a/ionic/components/item/modes/ios.scss +++ b/ionic/components/item/modes/ios.scss @@ -210,7 +210,7 @@ button.item { } .list, -.card { +ion-card { button[ion-item]:not([detail-none]), a[ion-item]:not([detail-none]), [detail-push]:not(ion-item-sliding) { diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss index abc73e3575..345eb45184 100644 --- a/ionic/components/item/modes/md.scss +++ b/ionic/components/item/modes/md.scss @@ -148,8 +148,8 @@ $item-md-sliding-transition: transform 250ms ease-in-out !default; margin: 4px; } - icon + ion-item-content, - icon + .text-input { + icon[item-left] + ion-item-content, + icon[item-left] + .text-input { margin-left: $item-md-padding-left + ($item-md-padding-left / 2); } diff --git a/ionic/components/search-bar/test/basic/index.ts b/ionic/components/search-bar/test/basic/index.ts index 0df4a7d366..dae68cf5fa 100644 --- a/ionic/components/search-bar/test/basic/index.ts +++ b/ionic/components/search-bar/test/basic/index.ts @@ -1,5 +1,4 @@ -import {NgControl} from 'angular2/angular2'; -import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms'; +import {NgControl, FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2'; import {App} from 'ionic/ionic'; import {SearchPipe} from 'ionic/components/search-bar/search-bar'; diff --git a/ionic/config/directives.ts b/ionic/config/directives.ts index 9cce475457..e62e298ba2 100644 --- a/ionic/config/directives.ts +++ b/ionic/config/directives.ts @@ -12,7 +12,6 @@ import {Refresher} from '../components/scroll/pull-to-refresh'; import {Slides, Slide, SlideLazy} from '../components/slides/slides'; import {Tabs} from '../components/tabs/tabs'; import {Tab} from '../components/tabs/tab'; -import {Card} from '../components/card/card'; import {List, ListHeader} from '../components/list/list'; import {Item} from '../components/item/item'; import {ItemGroup, ItemGroupTitle} from '../components/item/item-group'; @@ -55,7 +54,6 @@ export const IONIC_DIRECTIVES = [ Refresher, // Lists - Card, List, ListHeader, Item,