kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'backport-widget-changes' into 'master'

Browse source 
Backport mr widget changes from EE

See merge request gitlab-org/gitlab-ce!20598
This commit is contained in:
Filipa Lacerda 2018-07-12 16:58:57 +00:00
commit 07866b040e
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
View file

@ -32,7 +32,7 @@
};
</script>
<template>
<div class="space-children d-flex append-right-10">
<div class="space-children d-flex append-right-10 widget-status-icon">
<div
v-if="isLoading"
class="mr-widget-icon"

2
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
View file

@ -233,7 +233,7 @@ export default {
<status-icon :status="iconClass" />
<div class="media-body">
<div class="mr-widget-body-controls media space-children">
<span class="btn-group append-bottom-5">
<span class="btn-group">
<button
:disabled="isMergeButtonDisabled"
:class="mergeButtonClass"

4
app/assets/stylesheets/pages/merge_requests.scss
View file

@ -214,6 +214,10 @@
}
}
.widget-status-icon {
align-self: flex-start;
}
.mr-widget-body {
line-height: 28px;