Merge from parent/make-sense. This updates css/uni-form.css to have u…

…nix line endings.
draganbabic · Apr 8, 2013 · 06c5b08 · 06c5b08
2 parents 09507f6 + 1941a5b
commit 06c5b08
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/css/uni-form.css b/css/uni-form.css
@@ -238,7 +238,7 @@
     .uni-form .inline-labels .ctrl-holder > ul .input-file,
     .uni-form .inline-labels .ctrl-holder > ul .input-textarea {
       float: none;
-      display: block;
+      display: inline-block;
       width: 100%;
     }
 
@@ -308,11 +308,17 @@
 .uni-form .auto {
   width: auto !important;
   height: auto !important;
+  display: inline-block !important;
 }
 
-.uni-form .small,
-.uni-form .medium,
-.uni-form .auto {
+/* Make spacing in between two inputs */
+
+.uni-form .small + input,
+.uni-form .medium + input,
+.uni-form .auto + input,
+.uni-form .small + select,
+.uni-form .medium + select,
+.uni-form .auto + select {
   margin-right: 4px !important;
 }