From e692ada5c00838703d2b93286da6685bfd561803 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Fri, 4 Mar 2016 14:08:05 -0700
Subject: [PATCH] resolve #3774

---
 app/components/action-menu/template.hbs   |  4 +++-
 app/components/stack-section/template.hbs |  6 +++---
 app/styles/layout/_header.scss            |  8 ++++++++
 app/styles/layout/_layout.scss            | 25 +++++++++++++++--------
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/components/action-menu/template.hbs b/app/components/action-menu/template.hbs
index ad421ad38..54fe52a23 100644
--- a/app/components/action-menu/template.hbs
+++ b/app/components/action-menu/template.hbs
@@ -8,4 +8,6 @@
     </button>
   {{/each}}
 {{/if}}
-<button class="btn btn-default btn-{{size}} more-actions pull-right"><i class="icon icon-fw icon-vertical-ellipsis" alt="More Actions"></i></button>
+<button class="btn btn-default btn-{{size}} more-actions pull-right" data-toggle="dropdown" aria-expanded="false"><i class="icon icon-fw icon-vertical-ellipsis" alt="More Actions"></i></button>
+
+
diff --git a/app/components/stack-section/template.hbs b/app/components/stack-section/template.hbs
index 4e3111f64..2f6c4ba78 100644
--- a/app/components/stack-section/template.hbs
+++ b/app/components/stack-section/template.hbs
@@ -21,7 +21,7 @@
           <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             Outputs <i class="icon icon-chevron-down"></i>
           </button>
-          <ul class="dropdown-menu dropdown-menu-right">
+          <ul class="dropdown-menu dropdown-menu-right" role="dropdown">
             {{#each outputs as |obj|}}
               <li><a href="{{obj.value}}" target="_blank">{{obj.key}}</a></li>
             {{/each}}
@@ -48,7 +48,7 @@
       {{upgrade-btn environmentResource=model}}
       <div class="btn-group">
         {{#link-to "service.new" (query-params environmentId=model.id) classNames="btn btn-default btn-sm"}}Add Service{{/link-to}}
-        <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+        <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
           <i class="icon icon-fw icon-chevron-down"></i>
           <span class="sr-only">Toggle Dropdown</span>
         </button>
@@ -80,7 +80,7 @@
                 {{#if service.hasSidekicks}}
                   + {{service.secondaryLaunchConfigs.length}} Sidekick{{unless (eq service.secondaryLaunchConfigs.length 1) 's'}}
                 {{/if}}
-                <i class="icon icon-info addtl-info-trigger" {{action 'addtlInfo' service target=controller}}/>
+                <button type="button" class="btn-link"><i class="icon icon-info addtl-info-trigger" {{action 'addtlInfo' service target=controller}}/></button>
               </td>
               <td data-title="Details:" class="force-wrap service-detail">{{service.displayDetail}}{{service.displayPorts}}</td>
               <td data-title="Kind:">
diff --git a/app/styles/layout/_header.scss b/app/styles/layout/_header.scss
index 882951ad7..dc483ab0e 100644
--- a/app/styles/layout/_header.scss
+++ b/app/styles/layout/_header.scss
@@ -136,6 +136,7 @@ HEADER {
       .link-admin {
         position : relative;
       }
+      
       &>li{
       &>A,
       &>.link-admin > a {
@@ -157,10 +158,12 @@ HEADER {
               left                : 45%;
             }
         }
+
         &.active,
          {
           color       : white;
           font-weight : bold;
+
           &:after{
             content             : "";
             border-width        : 5px;
@@ -174,6 +177,11 @@ HEADER {
         }
       }
       }
+
+      LI A UL A {
+        background: red!important;
+        display: block;
+      }
     }
 
     .logo {
diff --git a/app/styles/layout/_layout.scss b/app/styles/layout/_layout.scss
index c4620a1d0..fc175aaad 100644
--- a/app/styles/layout/_layout.scss
+++ b/app/styles/layout/_layout.scss
@@ -988,16 +988,23 @@ SECTION.header {
             display: none;
           }
 
-          + ul>a {
-            display: block;
-            color: white;
-            padding: 5px;
+          + ul {
+            padding: 0;
+            &>a {
+              display: block;
+              color: white;
+              padding: 5px 5px 5px 40px;
 
-            > I {
-              font-size: 20px;
-              padding-right: 10px;
-              vertical-align: middle;
-              color: $brand-info;
+              &:hover {
+                background: rgba(0,0,0,.15);
+              }
+
+              > I {
+                font-size: 20px;
+                padding-right: 10px;
+                vertical-align: middle;
+                color: $brand-info;
+              }
             }
           }
         }