fixed hover styling caused by dropdown

fixed karma specs
added CHANGELOG item

2 files changed, 11 insertions, 10 deletions

diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list.vue b/app/assets/javascripts/ide/components/commit_sidebar/list.vue
index 72c02d1584f..62bff60cbd8 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/list.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list.vue
@@ -94,7 +94,7 @@ export default {
             v-show="fileList.length"
             v-tooltip
             type="button"
-            class="ide-staged-action-btn p-0 order-1 align-items-center rounded-right border-left-0"
+            class="btn btn-default ide-staged-action-btn p-0 order-1 align-items-center"
             :class="{
               'd-flex': fileList.length
             }"
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
index 040e2ea5375..5390b21cb57 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
@@ -54,6 +54,9 @@ export default {
     isActive() {
       return this.activeFileKey === this.fullKey;
     },
+    tooltipTitle() {
+      return this.file.path === this.file.name ? '' : this.file.path;
+    },
   },
   methods: {
     ...mapActions([
@@ -85,17 +88,15 @@ export default {
 </script>
 
 <template>
-  <div
-    :class="{
-      'is-active': isActive
-    }"
-    class="multi-file-commit-list-item"
-  >
+  <div class="multi-file-commit-list-item position-relative">
     <button
       v-tooltip
-      :title="file.path"
+      :title="tooltipTitle"
+      :class="{
+        'is-active': isActive
+      }"
       type="button"
-      class="multi-file-commit-list-path"
+      class="multi-file-commit-list-path w-100 border-0 ml-0 mr-0"
       @dblclick="fileAction"
       @click="openFileInEditor"
     >
@@ -108,9 +109,9 @@ export default {
       </span>
     </button>
     <component
-      class="d-flex ml-auto"
       :is="actionComponent"
       :path="file.path"
+      class="d-flex position-absolute"
     />
   </div>
 </template>