diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-13 16:06:34 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-13 16:06:34 +0000 |
| commit | 9122b2fc619dca82225c2551a6215490e842f2e7 (patch) | |
| tree | 40e60426a1b41387c21a5957c74bdd0e54f5014e | |
| parent | bf5e617a10e8df48ff78442f42f2cd6e47f59072 (diff) | |
| parent | e92db999ffd5110f42d2f1e5ca7d1c5b051b28ad (diff) | |
| download | gitlab-ce-9122b2fc619dca82225c2551a6215490e842f2e7.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue index 3a344c89299..9d22b9d77be 100644 --- a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue +++ b/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" > diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 759719a72da..3fe95b34e01 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/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; } } } |