diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-14 11:41:38 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-14 11:41:38 +0300 |
| commit | e865ee2b57ddcde51920a7b84189862dd4011b7e (patch) | |
| tree | bc0327908dd4b016291d1271dbe139710ee04fdc | |
| parent | 1322146bbf5c76403db10969f1af6540717b1cdf (diff) | |
| parent | 93991ebd5b83372e6a3e61a7dc2df80dad769e81 (diff) | |
Merge branch 'regression-commits-header-link' into 'master'
Fixed link alignment
See merge request gitlab-org/gitlab-ce!25162
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue index a1d3a09cca4..33963d5e1e6 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue @@ -73,14 +73,14 @@ export default { <gl-button :aria-label="ariaLabel" variant="blank" - class="commit-edit-toggle mr-2" + class="commit-edit-toggle square s24 mr-2" @click.stop="toggle()" > <icon :name="collapseIcon" :size="16" /> </gl-button> <span v-if="expanded">{{ __('Collapse') }}</span> <span v-else> - <span v-html="message"></span> + <span class="vertical-align-middle" v-html="message"></span> <gl-button variant="link" class="modify-message-button"> {{ modifyLinkMessage }} </gl-button> diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index c78876d9e2a..790d438c7e2 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -1017,3 +1017,8 @@ z-index: 99999; background: $black-transparent; } + +.source-branch-removal-status { + padding-left: 50px; + padding-bottom: $gl-padding; +} |