From a543666931f885340354ef1ac0e6eec3b573c7e1 Mon Sep 17 00:00:00 2001
From: Aniket Handa <anihan@microsoft.com>
Date: Wed, 3 Aug 2016 16:29:07 -0700
Subject: [PATCH] Fix alignment, Icon. consolidate overrides

---
 src/components/Dropdown/Dropdown.scss | 32 +++++----------------------
 src/components/Dropdown/Dropdown.tsx  |  2 +-
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/components/Dropdown/Dropdown.scss b/src/components/Dropdown/Dropdown.scss
index 70a919aa0ddbbc..f90daf14c5f9b3 100644
--- a/src/components/Dropdown/Dropdown.scss
+++ b/src/components/Dropdown/Dropdown.scss
@@ -36,6 +36,7 @@
   margin-bottom: 10px;
   position: relative;
   outline: 0;
+  user-select: none;
 
   &:hover,
   &:focus,
@@ -120,11 +121,6 @@
   }
 }
 
-// Hide the original dropdown
-.ms-Dropdown-select {
-  display: none;
-}
-
 .ms-Dropdown-caretDown {
   color: $ms-color-neutralDark;
   font-size: $ms-icon-size-s;
@@ -166,6 +162,9 @@
   bottom: auto;
   left: auto;
   max-width: 100%;
+  box-shadow: 0 0px 15px -5px rgba(0, 0, 0, 0.4);
+  border: 1px solid $ms-color-neutralLight;
+
 
   &::before {
     content: '';
@@ -175,7 +174,7 @@
     left: 0;
     right: 0;
     bottom: 0;
-    border: 1px solid $ms-color-neutralLight;
+    border: none;
   }
 
   @media screen and (-ms-high-contrast: active) {
@@ -222,7 +221,6 @@
     background: $ms-color-white;
     color: $ms-color-neutralTertiary;
     cursor: default;
-    line-height: 40px;
   }
 }
 
@@ -233,30 +231,10 @@
 .ms-Dropdown-item.ms-Dropdown-item--selected {
   background-color: $ms-color-themeLight;
   color: $ms-color-black;
-  line-height: 40px;
 
   &:hover {
     background-color: $ms-color-themeLight;
   }
 
   @include highContrastListItemState;
-}
-
-// TODO: remove overrides below.
-
-.ms-Dropdown {
-  user-select: none;
-}
-
-.ms-Dropdown-items {
-  box-shadow: 0 0px 15px -5px rgba(0, 0, 0, 0.4);
-  border: 1px solid $ms-color-neutralLight;
-
-  &:before {
-    border: none;
-  }
-}
-
-.ms-Dropdown-item.is-selected {
-  line-height: 38px;
 }
\ No newline at end of file
diff --git a/src/components/Dropdown/Dropdown.tsx b/src/components/Dropdown/Dropdown.tsx
index fdf8f7f4c5a144..a85a3138be83be 100644
--- a/src/components/Dropdown/Dropdown.tsx
+++ b/src/components/Dropdown/Dropdown.tsx
@@ -100,7 +100,7 @@ export class Dropdown extends React.Component<IDropdownProps, any> {
           aria-activedescendant={ selectedIndex >= 0 ? (id + '-list' + selectedIndex) : (id + '-list') }
           aria-controls={ id + '-list' }
           >
-          <i className='ms-Dropdown-caretDown ms-Icon ms-Icon--CaretDownSolid8'></i>
+          <i className='ms-Dropdown-caretDown ms-Icon ms-Icon--ChevronDown'></i>
           <span className='ms-Dropdown-title'>{ selectedOption ? selectedOption.text : '' }</span>
           <ul ref={ (c: HTMLElement) => this._optionList = c }
             id={ id + '-list' }