mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
alpha39 updates/hacks
Conflicts: ionic/components/search-bar/search-bar.ts ionic/config/decorators.ts
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
import {Directive} from 'angular2/angular2';
|
||||
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
@Directive({
|
||||
selector: 'ion-card',
|
||||
host: {
|
||||
'class': 'card'
|
||||
}
|
||||
})
|
||||
export class Card {}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
Reference in New Issue
Block a user