From 9b2a942838d06778af49bcfb48842802c309ef41 Mon Sep 17 00:00:00 2001
From: Micah Godbolt <micahgodbolt@gmail.com>
Date: Fri, 28 Apr 2017 14:40:27 -0700
Subject: [PATCH 1/3] Fixed input font

---
 .../src/components/TextField/TextField.scss                     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/office-ui-fabric-react/src/components/TextField/TextField.scss b/packages/office-ui-fabric-react/src/components/TextField/TextField.scss
index 298b70332e9332..4a36451949db99 100644
--- a/packages/office-ui-fabric-react/src/components/TextField/TextField.scss
+++ b/packages/office-ui-fabric-react/src/components/TextField/TextField.scss
@@ -116,6 +116,8 @@
 }
 
 .field {
+  @include ms-u-normalize;
+  @include ms-baseFont;
   border-radius: 0;
   border: none;
   color: $ms-color-neutralPrimary;

From fab690110e782b05f193086825ce1113ab062f7b Mon Sep 17 00:00:00 2001
From: Micah Godbolt <micahgodbolt@gmail.com>
Date: Mon, 1 May 2017 08:54:55 -0700
Subject: [PATCH 2/3] Fixed textfield bugs, fonts, focus

---
 .../src/components/TextField/TextField.scss   | 22 +++++++------------
 .../src/components/TextField/TextField.tsx    |  2 +-
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/office-ui-fabric-react/src/components/TextField/TextField.scss b/packages/office-ui-fabric-react/src/components/TextField/TextField.scss
index 4a36451949db99..e44177a8bebad0 100644
--- a/packages/office-ui-fabric-react/src/components/TextField/TextField.scss
+++ b/packages/office-ui-fabric-react/src/components/TextField/TextField.scss
@@ -85,11 +85,11 @@
     border-color: $ms-color-neutralSecondaryAlt;
   }
 
-  &:focus {
+  &.fieldGroupIsFocused {
     border-color: $ms-color-themePrimary;
   }
   &:hover,
-  &:focus {
+  &.fieldGroupIsFocused {
     @media screen and (-ms-high-contrast: active) {
       border-color: $ms-color-contrastBlackSelected;
     }
@@ -123,9 +123,13 @@
   color: $ms-color-neutralPrimary;
   @include padding(0, 12px, 0, 12px);
   width: 100%;
-  outline: 0;
   text-overflow: ellipsis;
-
+  outline: 0;
+  &:active,
+  &:focus,
+  &:hover {
+      outline: 0;
+    }
   &.hasIcon {
     @include padding-right(24px);
   }
@@ -171,11 +175,6 @@
     }
   }
 
-  &:active,
-  &:focus {
-    border-color: $ms-color-themePrimary;
-  }
-
   :global(.ms-Label) {
     font-size: $ms-font-size-m;
     @include margin-right(8px);
@@ -188,11 +187,6 @@
     flex: 1 1 0;
     border: 0;
     @include text-align(left);
-    &:active,
-    &:focus,
-    &:hover {
-      outline: 0;
-    }
   }
 
   &.rootIsDisabled {
diff --git a/packages/office-ui-fabric-react/src/components/TextField/TextField.tsx b/packages/office-ui-fabric-react/src/components/TextField/TextField.tsx
index 6ebac0170d5c09..b49d666d89bbac 100644
--- a/packages/office-ui-fabric-react/src/components/TextField/TextField.tsx
+++ b/packages/office-ui-fabric-react/src/components/TextField/TextField.tsx
@@ -147,7 +147,7 @@ export class TextField extends BaseComponent<ITextFieldProps, ITextFieldState> i
     return (
       <div className={ textFieldClassName }>
         { label && <Label htmlFor={ this._id }>{ label }</Label> }
-        <div className={ css(styles.fieldGroup) }>
+        <div className={ css(styles.fieldGroup, isFocused && styles.fieldGroupIsFocused) }>
           { (addonString !== undefined || this.props.onRenderAddon) && (
             <div className={ css(styles.fieldAddon) }>
               { onRenderAddon(this.props, this._onRenderAddon) }

From c079a4b97a7fad920624e706061ff1df30d0bc1a Mon Sep 17 00:00:00 2001
From: Micah Godbolt <micahgodbolt@gmail.com>
Date: Mon, 1 May 2017 08:56:42 -0700
Subject: [PATCH 3/3] Change file

---
 .../changes/textfield-text-fixes_2017-05-01-15-56.json | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 common/changes/textfield-text-fixes_2017-05-01-15-56.json

diff --git a/common/changes/textfield-text-fixes_2017-05-01-15-56.json b/common/changes/textfield-text-fixes_2017-05-01-15-56.json
new file mode 100644
index 00000000000000..1072968837fb0e
--- /dev/null
+++ b/common/changes/textfield-text-fixes_2017-05-01-15-56.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "TextField: Fixed bugs in textfield font family and focus borders",
+      "type": "patch"
+    }
+  ],
+  "email": "micahgodbolt@gmail.com"
+}
\ No newline at end of file