diff --git a/app/assets/javascripts/ide/components/ide_review.vue b/app/assets/javascripts/ide/components/ide_review.vue index ec2af50283ac436a671a3f4982d53024bb649d95..99fa2465a841d86d8bfcb3bb7d8daae4b8d81257 100644 --- a/app/assets/javascripts/ide/components/ide_review.vue +++ b/app/assets/javascripts/ide/components/ide_review.vue @@ -18,6 +18,9 @@ export default { showMergeRequestText() { return this.currentMergeRequestId && this.viewer === viewerTypes.mr; }, + mergeRequestId() { + return `!${this.currentMergeRequest.iid}`; + }, }, mounted() { this.$nextTick(() => { @@ -57,7 +60,8 @@ export default { (!{{ currentMergeRequest.iid }}) + v-text="mergeRequestId" + >) diff --git a/app/assets/javascripts/ide/components/ide_side_bar.vue b/app/assets/javascripts/ide/components/ide_side_bar.vue index 11ac14dfce85269948c62745ef095af512502237..1dc2170edde67ab759b7c7f39a2ba45aef4b3464 100644 --- a/app/assets/javascripts/ide/components/ide_side_bar.vue +++ b/app/assets/javascripts/ide/components/ide_side_bar.vue @@ -127,9 +127,8 @@ export default { class="context-header ide-context-header dropdown" ref="mergeRequestDropdown" > -
- + diff --git a/app/assets/javascripts/ide/components/merge_requests/list.vue b/app/assets/javascripts/ide/components/merge_requests/list.vue index fdadc89a62890b99e0344e7bfba73bd9efff3617..5896e3a147d672bcca15e346239a93a158eddaca 100644 --- a/app/assets/javascripts/ide/components/merge_requests/list.vue +++ b/app/assets/javascripts/ide/components/merge_requests/list.vue @@ -82,7 +82,7 @@ export default { a, + > button { transition: padding $sidebar-transition-duration; font-weight: $gl-font-weight-bold; display: flex; + width: 100%; align-items: center; padding: 10px 16px 10px 10px; color: $gl-text-color; + background-color: transparent; + border: 0; + text-align: left; &:hover, - a:hover { + &:focus { background-color: $link-hover-background; color: $gl-text-color; + outline: 0; } } diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 741b4179e80e0cecccae73cb70bcb9050f6303a3..3c7edb0d4bbc986ecc4faf40c59bf20dfc289af3 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -458,14 +458,10 @@ width: auto; margin-right: 0; - a { + > a, + > button { height: 60px; } - - a:hover, - a:focus { - text-decoration: none; - } } .projects-sidebar { @@ -1302,6 +1298,10 @@ .dropdown-input { padding-left: $gl-padding; padding-right: $gl-padding; + + .fa { + right: 26px; + } } .btn-link {