Merge pull request #537 from twbs/and-forms

Adjusting the form inputs and input-rows in the android theme
twbs · Apr 2, 2014 · 980b250 · 980b250
2 parents bc4aa8b + 37c6acd
commit 980b250
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 7 deletions.
diff --git a/dist/css/ratchet-theme-android.css b/dist/css/ratchet-theme-android.css
@@ -411,9 +411,15 @@ textarea,
 }
 
 .input-row {
+  height: 40px;
   border-bottom: 1px solid #d9d9d9;
 }
 
+.input-row label {
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+
 .input-row label + input {
   background-image: none;
   border-bottom: 0;

diff --git a/dist/css/ratchet-theme-android.min.css b/dist/css/ratchet-theme-android.min.css
diff --git a/dist/css/ratchet.css b/dist/css/ratchet.css
@@ -495,8 +495,8 @@ input[type="button"] {
   background-color: white;
   border-bottom: 1px solid #ddd;
 
-          backface-visibility: hidden;
   -webkit-backface-visibility: hidden;
+          backface-visibility: hidden;
 }
 
 .bar-header-secondary {

diff --git a/dist/css/ratchet.min.css b/dist/css/ratchet.min.css
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
@@ -1766,8 +1766,13 @@ hr {
   background-image: none;
 }
 .platform-android .input-row {
+  height: 40px;
   border-bottom: 1px solid #d9d9d9;
 }
+.platform-android .input-row label {
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
 .platform-android .input-row label + input {
   background-image: none;
   border-bottom: 0;

diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css
diff --git a/docs/dist/css/ratchet-theme-android.css b/docs/dist/css/ratchet-theme-android.css
@@ -411,9 +411,15 @@ textarea,
 }
 
 .input-row {
+  height: 40px;
   border-bottom: 1px solid #d9d9d9;
 }
 
+.input-row label {
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+
 .input-row label + input {
   background-image: none;
   border-bottom: 0;

diff --git a/docs/dist/css/ratchet-theme-android.min.css b/docs/dist/css/ratchet-theme-android.min.css
diff --git a/docs/dist/css/ratchet.css b/docs/dist/css/ratchet.css
@@ -495,8 +495,8 @@ input[type="button"] {
   background-color: white;
   border-bottom: 1px solid #ddd;
 
-          backface-visibility: hidden;
   -webkit-backface-visibility: hidden;
+          backface-visibility: hidden;
 }
 
 .bar-header-secondary {

diff --git a/docs/dist/css/ratchet.min.css b/docs/dist/css/ratchet.min.css
diff --git a/sass/theme-android.scss b/sass/theme-android.scss
@@ -530,8 +530,13 @@ textarea,
 
 // To use labels with input groups, wrap a label and an input in an .input-row
 .input-row {
+  height: 40px; // Matches the height of inputs.
   border-bottom: 1px solid #d9d9d9;
 }
+.input-row label {
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
 // Remove bottom border on last input-row to avoid double bottom border
 .input-row label + input {
   background-image: none;