Merge branch 'master' of github.com:driftyco/ionic2

This commit is contained in:
jbavari
2015-10-12 16:23:41 -06:00
8 changed files with 220 additions and 1 deletions

View File

@@ -0,0 +1,26 @@
<ion-navbar *navbar>
<ion-title>Fixed Labels</ion-title>
</ion-navbar>
<ion-content class="has-header components-demo">
<ion-list>
<ion-input fixed-label>
<ion-label>Username</ion-label>
<input type="text" value="">
</ion-input>
<ion-input fixed-label>
<ion-label>Password</ion-label>
<input type="password" value="">
</ion-input>
</ion-list>
<div padding>
<button primary block>Sign In</button>
</div>
</ion-content>

View File

@@ -0,0 +1,25 @@
<ion-navbar *navbar>
<ion-title>Floating Labels</ion-title>
</ion-navbar>
<ion-content class="has-header components-demo">
<ion-list>
<ion-input floating-label>
<ion-label>Username</ion-label>
<input type="text" value="">
</ion-input>
<ion-input floating-label>
<ion-label>Password</ion-label>
<input type="password" value="">
</ion-input>
</ion-list>
<div padding>
<button primary block>Sign In</button>
</div>
</ion-content>

View File

@@ -23,3 +23,60 @@ export class FormsPage {
}
@Page({
templateUrl: 'forms/fixed-inline.html',
})
export class FixedInlinePage {
constructor() {
}
}
@Page({
templateUrl: 'forms/floating.html',
})
export class FloatingPage {
constructor() {
}
}
@Page({
templateUrl: 'forms/inline.html',
})
export class InlinePage {
constructor() {
}
}
@Page({
templateUrl: 'forms/inset.html',
})
export class InsetPage {
constructor() {
}
}
@Page({
templateUrl: 'forms/placeholder.html',
})
export class PlaceholderPage {
constructor() {
}
}
@Page({
templateUrl: 'forms/stacked.html',
})
export class StackedPage {
constructor() {
}
}

View File

@@ -0,0 +1,25 @@
<ion-navbar *navbar>
<ion-title>Inline Labels</ion-title>
</ion-navbar>
<ion-content class="has-header components-demo">
<ion-list>
<ion-input>
<ion-label>Username</ion-label>
<input type="text" value="">
</ion-input>
<ion-input>
<ion-label>Password</ion-label>
<input type="password" value="">
</ion-input>
</ion-list>
<div padding>
<button primary block>Sign In</button>
</div>
</ion-content>

View File

@@ -0,0 +1,23 @@
<ion-navbar *navbar>
<ion-title>Inset Labels</ion-title>
</ion-navbar>
<ion-content class="has-header components-demo">
<ion-list inset>
<ion-input>
<ion-label>Username</ion-label>
<input type="text" value="">
</ion-input>
<ion-input>
<ion-label>Password</ion-label>
<input type="password" value="">
</ion-input>
</ion-list>
<div padding>
<button primary block>Sign In</button>
</div>
</ion-content>

View File

@@ -0,0 +1,23 @@
<ion-navbar *navbar>
<ion-title>Placeholders</ion-title>
</ion-navbar>
<ion-content class="has-header components-demo">
<ion-list>
<ion-input>
<input type="text" placeholder="Username">
</ion-input>
<ion-input>
<input type="password" placeholder="Password">
</ion-input>
</ion-list>
<div padding>
<button primary block>Sign In</button>
</div>
</ion-content>

View File

@@ -0,0 +1,24 @@
<ion-navbar *navbar>
<ion-title>Stacked Labels</ion-title>
</ion-navbar>
<ion-content class="has-header components-demo">
<ion-list>
<ion-input stacked-label>
<ion-label>Username</ion-label>
<input type="text">
</ion-input>
<ion-input stacked-label>
<ion-label>Password</ion-label>
<input type="password">
</ion-input>
</ion-list>
<div padding>
<button primary block>Sign In</button>
</div>
</ion-content>

View File

@@ -12,7 +12,15 @@ import {ButtonsPage,
ButtonsInComponentsPage} from './buttons/buttons';
import {CardsPage} from './cards/cards';
import {FormsPage} from './forms/forms';
import {FormsPage,
FixedInlinePage,
FloatingPage,
InlinePage,
InsetPage,
PlaceholderPage,
StackedPage} from './forms/forms';
import {IconsPage} from './icons/icons';
import {ListsPage} from './lists/lists';
import {MenusPage} from './menus/menus';
@@ -41,7 +49,15 @@ export function getPageFor(hash) {
'button-sizes': ButtonSizesPage,
'icon-buttons': IconButtonsPage,
'cards': CardsPage,
'forms': FormsPage,
'fixed-inline-labels': FixedInlinePage,
'floating-labels': FloatingPage,
'inline-labels': InlinePage,
'inset-labels': InsetPage,
'placeholder-labels': PlaceholderPage,
'stacked-labels': StackedPage,
'icons': IconsPage,
'lists': ListsPage,
'menus': MenusPage,