From 53ba8ec9c2bbaee510c2b1c9b5b59f9fdf44f365 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Thu, 29 Sep 2016 10:58:30 -0400
Subject: Renamed NavbarDropdown to SidebarHeaderDropdown and switched it to
 react-bootstrap (#4109)

---
 webapp/sass/layout/_headers.scss | 49 +++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

(limited to 'webapp/sass/layout/_headers.scss')

diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index ee13e3c54..71dc98804 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -244,14 +244,16 @@
                 @include alpha-property(background, $black, .1);
             }
 
-            a {
-                text-decoration: none;
-            }
-
             .user__name {
                 color: $white;
             }
 
+            .sidebar-header-dropdown {
+                .sidebar-header-dropdown__toggle {
+                    @include opacity(1);
+                }
+            }
+
             .navbar-right {
                 .dropdown-toggle {
                     @include opacity(1);
@@ -259,16 +261,28 @@
             }
         }
 
-        .navbar-right {
+        a {
+            text-decoration: none;
+        }
+
+        .sidebar-header-dropdown,
+        .admin-navbar-dropdown {
             font-size: .85em;
             position: absolute;
+            margin-right: -15px;
             right: 22px;
             top: 10px;
             z-index: 5;
 
-            .dropdown-toggle {
+            .sidebar-header-dropdown__toggle,
+            .admin-navbar-dropdown__toggle {
                 @include opacity(.8);
                 @include single-transition(all, .1s, linear);
+                background: none;
+                color: $white;
+                float: right;
+                font-size: 1em;
+                line-height: 1.8;
                 padding: 10px;
             }
 
@@ -284,9 +298,14 @@
                 }
             }
 
-            .dropdown__icon {
+            .sidebar-header-dropdown__icon,
+            .admin-navbar-dropdown__icon {
                 fill: $white;
             }
+
+            .divider + .divider {
+                display: none;
+            }
         }
 
         .user__picture {
@@ -330,22 +349,6 @@
             font-weight: 400;
             line-height: 18px;
         }
-
-        > .nav {
-            > li {
-                > a {
-                    background: none;
-                    float: right;
-                    padding: 2px;
-                }
-
-                .dropdown-toggle {
-                    color: $white;
-                    font-size: 1em;
-                    line-height: 1.8;
-                }
-            }
-        }
     }
 
     .search__clear {
-- 
cgit v1.2.3-1-g7c22