diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-14 11:41:38 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-14 19:10:04 +0300 |
| commit | 38ef0bbe7ee976f00896d9cdc56aa74618b6a167 (patch) | |
| tree | d67385b4b4bea98122a4e68510dd85a280080b00 /app | |
| parent | 31e5dc77290cd507088223a5017157cd1e973e7b (diff) | |
Merge branch 'regression-commits-header-link' into 'master'
Fixed link alignment
See merge request gitlab-org/gitlab-ce!25162
(cherry picked from commit e865ee2b57ddcde51920a7b84189862dd4011b7e)
9189f14f Fixed link alignment
bf1a7910 Fixed static analysis issue
c0db4c7e Replaced class on caret
b96f9011 Replaced flex with vertical-align-middle
665c1b96 Added mr-2 class back
91b97ae6 Fixed visual issue when MR has conflicts
Diffstat (limited to 'app')
| -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 135730d71e9..a27594a5080 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -1019,3 +1019,8 @@ z-index: 99999; background: $black-transparent; } + +.source-branch-removal-status { + padding-left: 50px; + padding-bottom: $gl-padding; +} |