From ca6ba8179e1450357275741f2363712507e0db65 Mon Sep 17 00:00:00 2001
From: anweshknayak <anweshknayak@gmail.com>
Date: Sat, 16 Jun 2018 18:07:26 +0530
Subject: [PATCH] bug fix

---
 .../core/shell/header/header.component.html   |  8 --------
 src/main.scss                                 | 19 +++++++++----------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/app/core/shell/header/header.component.html b/src/app/core/shell/header/header.component.html
index 5c104ab3c..f353b4c0a 100644
--- a/src/app/core/shell/header/header.component.html
+++ b/src/app/core/shell/header/header.component.html
@@ -57,14 +57,6 @@
       <li class="nav-item">
         <a class="nav-link" href="#"><h5 class="font-weight-normal">Groups</h5></a>
       </li>
-      <li ngbDropdown class="nav-item dropdown d-inline-block">
-          <div class="nav-link" id="dropdownBasic2" ngbDropdownToggle>Toggle dropup</div>
-          <div ngbDropdownMenu aria-labelledby="dropdownBasic2">
-            <button class="dropdown-item">Action - 1</button>
-            <button class="dropdown-item">Another Action</button>
-            <button class="dropdown-item">Something else is here</button>
-          </div>
-        </li>
         <li class="nav-item dropdown" ngbDropdown>
             <a class="nav-link" id="self-service-dropdown">
               <h5 class="font-weight-normal" ngbDropdownToggle>Self Service</h5>
diff --git a/src/main.scss b/src/main.scss
index aec7dfd25..1e5d422d4 100644
--- a/src/main.scss
+++ b/src/main.scss
@@ -3,21 +3,20 @@
  * Component-specific style should not go here and be included directly as part of the components.
  */
 
-// Theme variables, must be included before the libraries to allow overriding defaults
-
-@import "theme/theme-variables";
-
-// 3rd party libraries
-
-@import "~@fortawesome/fontawesome-free-webfonts/scss/fontawesome.scss";
-@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-brands.scss";
-@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-regular.scss";
-@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-solid.scss";
 
 // Theme customization
 @import "styles/bootstrap-material/_variables.scss";
 @import "~bootstrap/scss/bootstrap";
 @import "styles/bootstrap-material/_bootswatch.scss";
 
+// Theme variables, must be included before the libraries to allow overriding defaults
+@import "theme/theme-variables";
+
+// 3rd party libraries
+@import "~@fortawesome/fontawesome-free-webfonts/scss/fontawesome.scss";
+@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-brands.scss";
+@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-regular.scss";
+@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-solid.scss";
+
 //other scss imports
 @import "styles/_loader.scss"