Update with latest changes to UI Framework.

elastic · Dec 13, 2016 · a44140a · a44140a
1 parent fe5bab1
commit a44140a
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 2 deletions.
diff --git a/src/ui_framework/components/local_nav/_local_breadcrumbs.scss b/src/ui_framework/components/local_nav/_local_breadcrumbs.scss
@@ -28,8 +28,12 @@
 
     &:last-child {
       .localBreadcrumb__link {
-        pointer-events: none;
         color: $localNavTextColor;
+        cursor: default;
+
+        &:hover {
+          text-decoration: none;
+        }
 
         @include darkTheme {
           color: $localNavTextColor--darkTheme;

diff --git a/src/ui_framework/components/local_nav/_local_dropdown.scss b/src/ui_framework/components/local_nav/_local_dropdown.scss
@@ -1,5 +1,6 @@
 
 .localDropdown {
+  position: relative;
   padding: 10px $localNavSideSpacing 14px;
   background-color: $localDropdownBackgroundColor;
   line-height: 20px;
@@ -9,6 +10,28 @@
   }
 }
 
+.localDropdownCloseButton {
+  appearance: none;
+  background-color: transparent;
+  padding: 4px;
+  border: none;
+  position: absolute;
+  top: 1px;
+  right: 5px;
+  font-size: 16px;
+  color: $localNavTextColor;
+  cursor: pointer;
+  opacity: 0.35;
+
+  &:hover {
+    opacity: 1;
+  }
+
+  @include darkTheme {
+    color: $localNavTextColor--darkTheme;
+  }
+}
+
 .localDropdownPanels {
   display: flex;
 }

diff --git a/src/ui_framework/components/local_nav/_local_menu.scss b/src/ui_framework/components/local_nav/_local_menu.scss
@@ -28,7 +28,11 @@
     &.localMenuItem-isDisabled {
       opacity: 0.5;
       cursor: default;
-      pointer-events: none;
+
+      &:hover {
+        background-color: $localNavButtonBackgroundColor;
+        color: $localNavButtonTextColor;
+      }
     }
 
     @include darkTheme {
@@ -42,6 +46,13 @@
       &.localMenuItem-isSelected {
         background-color: $localNavButtonBackgroundColor-isSelected--darkTheme;
       }
+
+      &.localMenuItem-isDisabled {
+        &:hover {
+          background-color: transparent;
+          color: $localNavButtonTextColor--darkTheme;
+        }
+      }
     }
   }
 

diff --git a/src/ui_framework/doc_site/src/views/local_nav/local_nav_dropdown/local_nav_dropdown.html b/src/ui_framework/doc_site/src/views/local_nav/local_nav_dropdown/local_nav_dropdown.html
@@ -40,6 +40,11 @@
   </div>
 
   <div class="localDropdown">
+    <!-- Dropdown close button -->
+    <button class="localDropdownCloseButton">
+      <span class="fa fa-chevron-circle-up"></span>
+    </button>
+
     <!-- Title -->
     <div class="localDropdownTitle">Dropdown title</div>
 

diff --git a/...ork/doc_site/src/views/local_nav/local_nav_dropdown_panels/local_nav_dropdown_panels.html b/...ork/doc_site/src/views/local_nav/local_nav_dropdown_panels/local_nav_dropdown_panels.html
@@ -40,6 +40,11 @@
   </div>
 
   <div class="localDropdown">
+    <!-- Dropdown close button -->
+    <button class="localDropdownCloseButton">
+      <span class="fa fa-chevron-circle-up"></span>
+    </button>
+
     <div class="localDropdownPanels">
       <!-- Left panel -->
       <div class="localDropdownPanel localDropdownPanel--left">