javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 06:57:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename padded/padding, inset/margin

Browse Source
This commit is contained in:
Adam Bradley
2013-10-15 15:08:41 -05:00
parent 1828379217
commit d9543e56c8
34 changed files with 203 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
example/toderp/index.html
View File

@ -37,7 +37,7 @@
<h3>Finish your Top Three Tasks Today</h3>
</div>
<form class="form-horizontal" ng-submit="tryLogin(loginForm)">
<div class="input-group inset">
<div class="input-group margin">
<label class="input-wrapper row">
<span class="input-label col-xs-4">Email</span>
<input class="col-xs-8" type="email" placeholder="" ng-model="loginForm.email">
@ -47,7 +47,7 @@
<input class="col-xs-8" type="password" placeholder="" ng-model="loginForm.password">
</label>
</div>
<div class="input-group inset">
<div class="input-group margin">
<button class="button button-info button-block">Log in</button>
<div id="login-error" ng-show="loginError">Invalid email/password. Please try again.</div>
</div>
@ -63,7 +63,7 @@
</header>
<main class="content padded has-header">
<form class="form-horizontal" ng-submit="trySignup(signupForm)">
<div class="input-group inset">
<div class="input-group margin">
<label class="input-wrapper row">
<span class="input-label col-xs-4">Email</span>
<input class="col-xs-8" type="email" placeholder="" ng-model="signupForm.email">
@ -73,7 +73,7 @@
<input class="col-xs-8" type="password" placeholder="" ng-model="signupForm.password">
</label>
</div>
<div class="input-group inset">
<div class="input-group margin">
<button class="button button-info button-block">Sign up</button>
<div id="signup-error" ng-show="signupError">Unable to signup, please try again.</div>
</div>

10
example/toderp2/index.html
View File

@ -64,7 +64,7 @@
<input type="password" placeholder="" ng-model="signupForm.password" required>
</label>
</div>
<div class="inset">
<div class="margin">
<button type="submit" class="button button-primary button-block">Get derp'n</button>
<div id="signup-error" ng-show="signupError">Unable to signup, please try again.</div>
</div>
@ -84,9 +84,9 @@
<h1 class="title">Log in</h1>
<button class="button button-clear button-primary" ng-click="close()">Cancel</button>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
<form class="form-horizontal" ng-submit="tryLogin(loginForm)">
<div class="input-group inset">
<div class="input-group margin">
<label class="input-row">
<span class="input-label col-xs-4">Email</span>
<input type="email" placeholder="" ng-model="loginForm.email">
@ -96,7 +96,7 @@
<input type="password" placeholder="" ng-model="loginForm.password">
</label>
</div>
<div class="inset">
<div class="margin">
<button class="button button-primary button-block">Log in</button>
<div id="login-error" ng-show="loginError">Invalid email/password. Please try again.</div>
</div>
@ -158,7 +158,7 @@
<h1 class="title">Settings</h1>
<button class="button button-clear button-primary" ng-click="close()">Done</button>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
<list header="GENERAL">
<list-item>Account details <i class="icon-chevron-right"></i></list-item>
<list-item>Account details <toggle ng-model="settings.isSmallText"></toggle></i></list-item>