Merge branch '42580-fix-lock-mr-hover-on-edit' into 'master'

Fixes hover style for lock merge request edit link

Closes #42580

See merge request gitlab-org/gitlab-ce!17065

app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue

@@ -75,7 +75,7 @@
       {{ sprintf(__('Lock %{issuableDisplayName}'), { issuableDisplayName: issuableDisplayName }) }}
       <button
         v-if="isEditable"
-        class="pull-right lock-edit btn btn-blank"
+        class="pull-right lock-edit"
         type="button"
         @click.prevent="toggleForm"
       >

app/assets/stylesheets/pages/issuable.scss

@@ -197,11 +197,18 @@
       margin-left: 0;
     }
+    a.edit-link:not([href]):hover {
+      color: rgba($avatar-border, .2);
+    }
+
+    .lock-edit, // uses same style, different js behaviour
     .edit-link {
+      @extend .btn-blank;
       color: $gl-text-color;
-      &:not([href]):hover {
-        color: rgba($avatar-border, .2);
+      &:hover {
+        text-decoration: underline;
+        color: $md-link-color;
       }
     }
   }