alpha39 updates/hacks

Conflicts:
	ionic/components/search-bar/search-bar.ts
	ionic/config/decorators.ts
This commit is contained in:
Adam Bradley
2015-10-07 14:57:56 -05:00
parent 9fc63fe17d
commit c657bb6d6a
9 changed files with 23 additions and 32 deletions

View File

@@ -1,12 +0,0 @@
import {Directive} from 'angular2/angular2';
/**
* TODO
*/
@Directive({
selector: 'ion-card',
host: {
'class': 'card'
}
})
export class Card {}

View File

@@ -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;
}

View File

@@ -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:
'<ng-content select="[item-left]"></ng-content>' +
'<ng-content select="[item-right]"></ng-content>' +
'<ion-item-content>' +
'<ng-content></ng-content>'+
'</ion-item-content>' +
'<ng-content select="[item-right]"></ng-content>'
'</ion-item-content>'
})
export class Item {}
export class Item {
constructor(elementRef: ElementRef, renderer: Renderer) {
renderer.setElementClass(elementRef, 'item', true);
}
}

View File

@@ -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) {

View File

@@ -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);
}

View File

@@ -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';