From 8d81c8a60caf9942b94b57128f384a6e5fb5c199 Mon Sep 17 00:00:00 2001
From: Yuan Gao <tinagao@google.com>
Date: Tue, 20 Dec 2016 13:41:04 -0800
Subject: [PATCH 1/4] Make md-select, md-input, md-checkbox, md-radio-button
 align

---
 src/lib/checkbox/checkbox.scss | 1 +
 src/lib/input/input.scss       | 1 +
 src/lib/radio/radio.scss       | 6 ++++--
 src/lib/select/select.scss     | 5 +++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/lib/checkbox/checkbox.scss b/src/lib/checkbox/checkbox.scss
index 1e0a0d040002..24c78157c6b2 100644
--- a/src/lib/checkbox/checkbox.scss
+++ b/src/lib/checkbox/checkbox.scss
@@ -192,6 +192,7 @@ $md-checkbox-ripple-size: 15px;
 }
 
 md-checkbox {
+  margin: 16px 0;
   cursor: pointer;
 
   // Animation
diff --git a/src/lib/input/input.scss b/src/lib/input/input.scss
index 6f2a15c25f57..d489d0dc9522 100644
--- a/src/lib/input/input.scss
+++ b/src/lib/input/input.scss
@@ -55,6 +55,7 @@ md-input, md-textarea {
 
 .md-input-infix {
   position: relative;
+  line-height: 22px;
 }
 
 // The Input element proper.
diff --git a/src/lib/radio/radio.scss b/src/lib/radio/radio.scss
index 574833a0a37b..fd5d1b60672b 100644
--- a/src/lib/radio/radio.scss
+++ b/src/lib/radio/radio.scss
@@ -8,6 +8,7 @@ $md-radio-ripple-size: $md-radio-size * 0.75;
 // Top-level host container.
 md-radio-button {
   display: inline-block;
+  margin: 16px 0;
 }
 
 // Inner label container, wrapping entire element.
@@ -16,6 +17,7 @@ md-radio-button {
   cursor: pointer;
   display: inline-flex;
   align-items: baseline;
+  vertical-align: middle;
   white-space: nowrap;
 }
 
@@ -26,7 +28,7 @@ md-radio-button {
   height: $md-radio-size;
   position: relative;
   width: $md-radio-size;
-  top: 2px;
+  top: 4px;
 }
 
 // The outer circle for the radio, always present.
@@ -63,7 +65,7 @@ md-radio-button {
 .md-radio-label-content {
   display: inline-block;
   order: 0;
-  line-height: inherit;
+  line-height: 24px;
   padding-left: $md-toggle-padding;
   padding-right: 0;
 
diff --git a/src/lib/select/select.scss b/src/lib/select/select.scss
index 25e23fb8c147..115b17f6ddc9 100644
--- a/src/lib/select/select.scss
+++ b/src/lib/select/select.scss
@@ -3,7 +3,7 @@
 @import '../core/style/form-common';
 @import '../core/a11y/a11y';
 
-$md-select-trigger-height: 30px !default;
+$md-select-trigger-height: 27px !default;
 $md-select-trigger-min-width: 112px !default;
 $md-select-arrow-size: 5px !default;
 $md-select-arrow-margin: 4px !default;
@@ -11,6 +11,7 @@ $md-select-panel-max-height: 256px !default;
 
 md-select {
   display: inline-block;
+  margin: 16px 0;
   outline: none;
 }
 
@@ -18,11 +19,11 @@ md-select {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  height: $md-select-trigger-height;
   min-width: $md-select-trigger-min-width;
   cursor: pointer;
   position: relative;
   box-sizing: border-box;
+  height: $md-select-trigger-height;
 
   [aria-disabled='true'] & {
     @include md-control-disabled-underline();

From 86f890fe0c0c440fb016d4798884cad438aa0274 Mon Sep 17 00:00:00 2001
From: Yuan Gao <tinagao@google.com>
Date: Wed, 21 Dec 2016 10:09:30 -0800
Subject: [PATCH 2/4] Align text inside input and select

---
 src/lib/input/input.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/input/input.scss b/src/lib/input/input.scss
index d489d0dc9522..724235fde7bd 100644
--- a/src/lib/input/input.scss
+++ b/src/lib/input/input.scss
@@ -56,6 +56,7 @@ md-input, md-textarea {
 .md-input-infix {
   position: relative;
   line-height: 22px;
+  top: 4px;
 }
 
 // The Input element proper.

From fe719021292e3ddb37e47a104a832f5c8463203c Mon Sep 17 00:00:00 2001
From: Yuan Gao <tinagao@google.com>
Date: Wed, 21 Dec 2016 16:19:41 -0800
Subject: [PATCH 3/4] .

---
 src/demo-app/checkbox/checkbox-demo.html | 11 +++++++++++
 src/lib/checkbox/checkbox.scss           |  1 -
 src/lib/radio/radio.scss                 |  1 -
 src/lib/select/select.scss               |  1 -
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/demo-app/checkbox/checkbox-demo.html b/src/demo-app/checkbox/checkbox-demo.html
index 713f8b008d4c..79d89caa768d 100644
--- a/src/demo-app/checkbox/checkbox-demo.html
+++ b/src/demo-app/checkbox/checkbox-demo.html
@@ -45,3 +45,14 @@ <h1>md-checkbox: Basic Example</h1>
 
 <h1>Nested Checklist</h1>
 <md-checkbox-demo-nested-checklist></md-checkbox-demo-nested-checklist>
+
+<div [style.display]="flex ? 'flex' : 'block'" [style.align-items]="center ? 'center' : ''">
+  <md-checkbox (change)="flex = $event.checked">Toggle Flex</md-checkbox>
+  <md-input placeholder="An Input"></md-input>
+  <md-select placeholder="A Select">
+    <md-option *ngFor="let option of ['One', 'Two', 'Three']" [value]="option">{{ option }}</md-option>
+  </md-select>
+  <md-checkbox (change)="center = $event.checked">Toggle Align</md-checkbox>
+  <md-radio-button>Radio button</md-radio-button>
+  <button md-raised-button>Button</button>
+</div>
\ No newline at end of file
diff --git a/src/lib/checkbox/checkbox.scss b/src/lib/checkbox/checkbox.scss
index 24c78157c6b2..1e0a0d040002 100644
--- a/src/lib/checkbox/checkbox.scss
+++ b/src/lib/checkbox/checkbox.scss
@@ -192,7 +192,6 @@ $md-checkbox-ripple-size: 15px;
 }
 
 md-checkbox {
-  margin: 16px 0;
   cursor: pointer;
 
   // Animation
diff --git a/src/lib/radio/radio.scss b/src/lib/radio/radio.scss
index fd5d1b60672b..4b460aa38462 100644
--- a/src/lib/radio/radio.scss
+++ b/src/lib/radio/radio.scss
@@ -8,7 +8,6 @@ $md-radio-ripple-size: $md-radio-size * 0.75;
 // Top-level host container.
 md-radio-button {
   display: inline-block;
-  margin: 16px 0;
 }
 
 // Inner label container, wrapping entire element.
diff --git a/src/lib/select/select.scss b/src/lib/select/select.scss
index 115b17f6ddc9..832229615cf9 100644
--- a/src/lib/select/select.scss
+++ b/src/lib/select/select.scss
@@ -11,7 +11,6 @@ $md-select-panel-max-height: 256px !default;
 
 md-select {
   display: inline-block;
-  margin: 16px 0;
   outline: none;
 }
 

From 80016275fe5547ae0df7efa87d63050bbda62e64 Mon Sep 17 00:00:00 2001
From: Yuan Gao <tinagao@google.com>
Date: Tue, 17 Jan 2017 11:29:54 -0800
Subject: [PATCH 4/4] sync

---
 src/demo-app/checkbox/checkbox-demo.html | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/demo-app/checkbox/checkbox-demo.html b/src/demo-app/checkbox/checkbox-demo.html
index 79d89caa768d..713f8b008d4c 100644
--- a/src/demo-app/checkbox/checkbox-demo.html
+++ b/src/demo-app/checkbox/checkbox-demo.html
@@ -45,14 +45,3 @@ <h1>md-checkbox: Basic Example</h1>
 
 <h1>Nested Checklist</h1>
 <md-checkbox-demo-nested-checklist></md-checkbox-demo-nested-checklist>
-
-<div [style.display]="flex ? 'flex' : 'block'" [style.align-items]="center ? 'center' : ''">
-  <md-checkbox (change)="flex = $event.checked">Toggle Flex</md-checkbox>
-  <md-input placeholder="An Input"></md-input>
-  <md-select placeholder="A Select">
-    <md-option *ngFor="let option of ['One', 'Two', 'Three']" [value]="option">{{ option }}</md-option>
-  </md-select>
-  <md-checkbox (change)="center = $event.checked">Toggle Align</md-checkbox>
-  <md-radio-button>Radio button</md-radio-button>
-  <button md-raised-button>Button</button>
-</div>
\ No newline at end of file