Merge branch 'dev-angular' of github.com:opf/openproject into dev-angular

app/assets/stylesheets/content/_context_menu.sass

@@ -34,108 +34,9 @@
   padding: 0
   border: 0
 
-.action-menu
+#work-package-context-menu, #column-context-menu
+  &.action-menu
     position: absolute
 
-.context-menu
-  font-size: 0.9em
-  left: -7px
-  top: -7px
-  padding: 6px
-  z-index: 21
-  ul
-    @include context_menu_defaults
-    width: 140px
-    list-style: none
-    position: absolute
-    left: -7px
-    z-index: 20
-    background: #f4f4f4
-    border: 1px solid #afafaf
-  li
-    @include context_menu_defaults
-    position: relative
-    padding: 1px
-    padding: 6px
-    z-index: 39
-    border: 1px solid white
-    background-position: 6px center
-    background-repeat: no-repeat
-    cursor: pointer
-    border-top: 1px solid #fff
-    border-bottom: 1px solid #ddd
-    > a
-      width:auto
-    &:hover
-      border: 1px solid gray
-      background-color: #eee
-
-    &.folder
-      &:hover
-        z-index: 40
-      div.submenu
-        background: url(image-path('arrow-right.png')) no-repeat right
-        position: absolute
-        height: 9px
-        width: 7px
-        top: 11px
-        right: 6px
-      ul
-        display: none
-        position: absolute
-        max-height: 400px
-        overflow-x: hidden
-        overflow-y: auto
-        left: 140px
-        top: -1px
-        width: auto
-        z-index: 19
-
-  a
-    @include context_menu_defaults
-    border: none
-    background-repeat: no-repeat
-    background-position: 1px 50%
-    padding: 1px 10px 1px 15px
-    width: 100%
-
-    &.icon, &.icon-context
-      color: $content_icon_link_hover_color
-      font-weight: bold
-      padding-left: 0
-
-    &.disabled, &.disabled:hover
-      color: #ccc
-
-    &:hover
-      color: #2A5685
-      border: none
-      text-decoration: none
-
-  &.reverse-y li.folder>ul
-    top: auto
-    bottom: 0
-  &.reverse-x li.folder
-    ul
-      left: auto
-      right: 168px
-    >ul
-      right: 148px
-
-#context-menu ul ul, #context-menu  li:hover ul ul
-  display: none
-
-#context-menu li:hover ul, #context-menu li:hover li:hover ul
-  display: block
-
-#context-menu li li
-  padding: 6px 12px
-  width: auto
-  display: block
-  white-space: nowrap
-
-#context-menu li:hover ul
-  display: block
-
 .hascontextmenu
   cursor: context-menu

app/assets/stylesheets/context_menu_rtl.css

@@ -27,6 +27,8 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++*/
 
+/* FIXME adapt modifications to the new action-menu component */
+
 #context-menu li.folder ul { left:auto; right:168px; }
 #context-menu li.folder>ul { left:auto; right:148px; }
 #context-menu li a.submenu { background:url("../images/bullet_arrow_left.png") left no-repeat; }

app/assets/stylesheets/fonts/_openproject_icon_font.sass

@@ -166,7 +166,7 @@
   float: left
 
 // used for icons in the content area, which appear in context (menus)
-#context-menu .icon:before,
+.action-menu .icon:before,
 .icon-context:before
   @include icon-context-rules