This commit is contained in:
Max Lynch
2015-06-23 14:20:20 -05:00
parent 867330026d
commit e5caeb9b8f
3 changed files with 21 additions and 18 deletions

View File

@@ -1,11 +1,6 @@
<ion-view>
<ion-aside [content]="content" style="background-color: red">
<h2 style="color: white">LEFT</h2>
<!--
<ion-aside [content]="content">
<ion-list inset>
<div class="list-header">
Menu
</div>
<ion-item>
About
</ion-item>
@@ -19,11 +14,10 @@
Potatoes
</ion-item>
</ion-list>
-->
</ion-aside>
<ion-content #content style="background-color: blue">
<h2 style="color: white">HELLO</h2>
<ion-content #content>
<h2>Content</h2>
</ion-content>
<!--

View File

@@ -4,12 +4,11 @@ import {View} from 'angular2/src/core/annotations_impl/view';
import {ItemPrimaryOptions, ItemSecondaryOptions} from './item-options'
import {ItemPrimarySwipeButtons, ItemSecondarySwipeButtons} from './item-swipe-buttons'
import {IonicComponent} from '../../config/component'
import {dom} from 'ionic/util'
@Component({
selector: 'ion-item'
})
@IonicComponent(Item)
@View({
template: `
<!--
@@ -30,15 +29,29 @@ import {dom} from 'ionic/util'
<content select="ion-secondary-options"></content>
<content select="ion-secondary-swipe-buttons"></content>
-->
`,
`
/*
directives: [
ItemPrimarySwipeButtons,
// ItemSecondarySwipeButtons,
// ItemPrimaryOptions,
// ItemSecondaryOptions
]
*/
})
export class Item {
static get config() {
return {
selector: 'ion-item',
properties: [
]
}
}
onInit() {
Item.applyConfig(this);
}
constructor(elementRef: ElementRef) {
this._isOpen = false;
this._isSlideActive = false;

View File

@@ -14,11 +14,7 @@ $list-ios-footer-font-size: 1.4rem !default;
$list-ios-footer-color: #8f8f94 !default;
.platform-ios {
.list {
}
.list.list-ios {
// Add the hairline to the top of the first item
.item:first-of-type {
@include hairline(top, $list-ios-border-color, $z-index-list-border);