From cf9d5b48773fbcee3ed250920c4a82385ccb9bd8 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@gmail.com>
Date: Thu, 29 Aug 2013 12:59:08 -0500
Subject: [PATCH] forms

---
 dist/ionic.css                |  4 ++--
 example/forms.html            | 33 +++++++++++++++++++++++++++++++++
 scss/ionic/theme/_button.scss |  4 ++--
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/dist/ionic.css b/dist/ionic.css
index b93bcb36ea..3c7bef049e 100644
--- a/dist/ionic.css
+++ b/dist/ionic.css
@@ -1349,8 +1349,8 @@ a.button {
 .button-transparent {
   background: transparent; }
 
-.button-borderless [class^="icon-"], [class*=" icon-"] {
-  font-size: 2.3em; }
+.button-borderless [class^="icon-"] {
+  font-size: 24px; }
 
 .list-divider {
   background-color: whitesmoke;
diff --git a/example/forms.html b/example/forms.html
index cc44318704..460eb87abe 100644
--- a/example/forms.html
+++ b/example/forms.html
@@ -36,8 +36,41 @@
 
 
         <h2>Inline form layout</h2>
+        <form class="form-inline">
+          <input type="text" class="input-small" placeholder="Email">
+          <input type="password" class="input-small" placeholder="Password">
+          <label class="checkbox">
+            <input type="checkbox"> Remember me
+          </label>
+          <button type="submit" class="btn">Sign in</button>
+        </form>
 
 
+        <h2>Horizontal form layout</h2>
+        <form class="form-horizontal">
+          <div class="control-group">
+            <label class="control-label" for="inputEmail">Email</label>
+            <div class="controls">
+              <input type="text" id="inputEmail" placeholder="Email">
+            </div>
+          </div>
+          <div class="control-group">
+            <label class="control-label" for="inputPassword">Password</label>
+            <div class="controls">
+              <input type="password" id="inputPassword" placeholder="Password">
+            </div>
+          </div>
+          <div class="control-group">
+            <div class="controls">
+              <label class="checkbox">
+                <input type="checkbox"> Remember me
+              </label>
+              <button type="submit" class="btn">Sign in</button>
+            </div>
+          </div>
+        </form>
+        
+
         <p><a class="button button-secondary" href="index.html">Homepage</a></p>
       </main>
 
diff --git a/scss/ionic/theme/_button.scss b/scss/ionic/theme/_button.scss
index 639ce2fefa..0d22f3104d 100644
--- a/scss/ionic/theme/_button.scss
+++ b/scss/ionic/theme/_button.scss
@@ -38,6 +38,6 @@ a.button {
   background: transparent;
 }
 
-.button-borderless [class^="icon-"], [class*=" icon-"] {
-  font-size: 2.3em;  
+.button-borderless [class^="icon-"] {
+  font-size: 24px;  
 }
\ No newline at end of file