style(select,input): bring non-floating inputs and select into line

closes #2793
angular · Jun 28, 2015 · e9f5a99 · e9f5a99
1 parent 1a8acd0
commit e9f5a99
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/input/input.scss b/src/components/input/input.scss
@@ -120,9 +120,9 @@ md-input-container {
    * The .md-input class is added to the input/textarea
    */
   .md-input {
-    flex: 1 1 auto;
     order: 2;
     display: block;
+    margin-top: auto;
 
     background: none;
     padding-top: $input-padding-top;

diff --git a/src/components/select/select.scss b/src/components/select/select.scss
@@ -47,12 +47,12 @@ $select-max-visible-options: 5;
 }
 
 md-input-container > md-select {
-  margin: 0;
+  margin: auto 0 0 0;
+  order: 2;
 }
 
 md-select {
   display: flex;
-  order: 2;
   margin: 2.5*$baseline-grid 0 3*$baseline-grid + 2 0;
   &:focus {
     outline: none;