unify actions dropdowns

5 files changed, 25 insertions, 28 deletions

diff --git a/server/sonar-web/src/main/less/components/bubble-popup.less b/server/sonar-web/src/main/less/components/bubble-popup.less
index 947c7a84fdf..60ca63e2b47 100644
--- a/server/sonar-web/src/main/less/components/bubble-popup.less
+++ b/server/sonar-web/src/main/less/components/bubble-popup.less
@@ -35,6 +35,10 @@
   box-shadow: @defaultShadow;
 }
 
+.bubble-popup-menu {
+  padding: 0;
+}
+
 .bubble-popup-arrow,
 .bubble-popup-arrow:after {
   position: absolute;
diff --git a/server/sonar-web/src/main/less/components/dropdowns.less b/server/sonar-web/src/main/less/components/dropdowns.less
index e963838cd26..145443d0afb 100644
--- a/server/sonar-web/src/main/less/components/dropdowns.less
+++ b/server/sonar-web/src/main/less/components/dropdowns.less
@@ -45,7 +45,7 @@
   text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
   background-color: #fff;
   border: 1px solid @barBorderColor;
-  box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+  box-shadow: @defaultShadow;
   background-clip: padding-box;
 
   &.pull-right {
diff --git a/server/sonar-web/src/main/less/components/issues.less b/server/sonar-web/src/main/less/components/issues.less
index 5af36fb5f2a..e15e560b9cb 100644
--- a/server/sonar-web/src/main/less/components/issues.less
+++ b/server/sonar-web/src/main/less/components/issues.less
@@ -216,28 +216,6 @@
   white-space: nowrap;
 }
 
-.issue-action-options {
-  position: relative;
-  min-width: 120px;
-  margin: 0 -10px;
-  font-size: @smallFontSize;
-}
-
-.issue-action-option {
-  display: block;
-  padding: 3px 10px;
-}
-
-a.issue-action-option {
-  border-bottom: none;
-  color: @baseFontColor;
-
-  &.active {
-    background-color: @barBackgroundColor;
-    color: @baseFontColor;
-  }
-}
-
 input.issue-action-options-search {
   padding: 0 10px 0 30px;
   border: none;
diff --git a/server/sonar-web/src/main/less/components/menu.less b/server/sonar-web/src/main/less/components/menu.less
index 37df30a50f5..b805869ec17 100644
--- a/server/sonar-web/src/main/less/components/menu.less
+++ b/server/sonar-web/src/main/less/components/menu.less
@@ -19,6 +19,8 @@
  */
 @import (reference) "../mixins";
 @import (reference) "../variables";
+@import (reference) "../init/links";
+@import (reference) "../init/type";
 @import (reference) "ui";
 
 .menu {
@@ -33,7 +35,7 @@
   > li > a,
   > li > span {
     display: block;
-    padding: 4px 20px;
+    padding: 4px 16px;
     line-height: 16px;
     clear: both;
     font-weight: normal;
@@ -42,6 +44,8 @@
 
   > li > a {
     color: @baseFontColor;
+    .link-no-underline;
+    .trans(none);
   }
 
   .divider {
@@ -57,16 +61,22 @@
   &:hover, &:focus {
     text-decoration: none;
     color: @baseFontColor;
-    background-color: @lightBlue;
+    background-color: @barBackgroundColor;
   }
 }
 
-
-.menu > .active > a {
+.menu > .active > a,
+.menu > li > a.active {
   &, &:hover, &:focus {
     color: @baseFontColor;
     text-decoration: none;
     outline: 0;
-    background-color: @lightBlue;
+    background-color: @barBackgroundColor;
   }
 }
+
+.menu-search {
+  padding: 4px 16px 0;
+
+  .search-box-input { font-size: @smallFontSize; }
+}
diff --git a/server/sonar-web/src/main/less/components/search.less b/server/sonar-web/src/main/less/components/search.less
index 48be2ff2905..14bc3baf136 100644
--- a/server/sonar-web/src/main/less/components/search.less
+++ b/server/sonar-web/src/main/less/components/search.less
@@ -21,4 +21,9 @@
     color: @secondFontColor;
     font-size: @iconSmallFontSize;
   }
+
+  .icon-search-new {
+    position: relative;
+    top: 1px;
+  }
 }