Commit 07866b04 authored by Filipa Lacerda's avatar Filipa Lacerda

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

Backport mr widget changes from EE

See merge request gitlab-org/gitlab-ce!20598
parents df55e39b f4b73d67
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
}; };
</script> </script>
<template> <template>
<div class="space-children d-flex append-right-10"> <div class="space-children d-flex append-right-10 widget-status-icon">
<div <div
v-if="isLoading" v-if="isLoading"
class="mr-widget-icon" class="mr-widget-icon"
......
...@@ -233,7 +233,7 @@ export default { ...@@ -233,7 +233,7 @@ export default {
<status-icon :status="iconClass" /> <status-icon :status="iconClass" />
<div class="media-body"> <div class="media-body">
<div class="mr-widget-body-controls media space-children"> <div class="mr-widget-body-controls media space-children">
<span class="btn-group append-bottom-5"> <span class="btn-group">
<button <button
:disabled="isMergeButtonDisabled" :disabled="isMergeButtonDisabled"
:class="mergeButtonClass" :class="mergeButtonClass"
......
...@@ -214,6 +214,10 @@ ...@@ -214,6 +214,10 @@
} }
} }
.widget-status-icon {
align-self: flex-start;
}
.mr-widget-body { .mr-widget-body {
line-height: 28px; line-height: 28px;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment