Skip to content
Snippets Groups Projects
Commit 96d10213 authored by Marcel van Remmerden's avatar Marcel van Remmerden Committed by Clement Ho
Browse files

Revert "Make status icon in merge widget borderless"

This reverts commit c3751046d217008404a0bd371e59d6ffd6734923.
parent d2aeae58
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -166,7 +166,7 @@ export default {
<section class="media-section">
<div class="media">
<status-icon :status="statusIconName" :size="24" />
<div class="media-body d-flex flex-align-self-center prepend-left-default">
<div class="media-body d-flex flex-align-self-center">
<span class="js-code-text code-text">
{{ headerText }}
<slot :name="slotName"></slot>
Loading
Loading
Loading
Loading
@@ -32,10 +32,13 @@ export default {
};
</script>
<template>
<div class="d-flex widget-status-icon">
<div v-if="isLoading" class="mr-widget-icon"><gl-loading-icon size="sm" /></div>
<ci-icon v-else :status="statusObj" :size="24" />
<div class="d-flex align-self-start">
<div class="square s24 h-auto d-flex-center append-right-default">
<div v-if="isLoading" class="mr-widget-icon">
<gl-loading-icon size="sm" />
</div>
<ci-icon v-else :status="statusObj" :size="24" />
</div>
 
<button
v-if="showDisabledButton"
Loading
Loading
Loading
Loading
@@ -88,7 +88,7 @@
}
 
.mr-widget-info {
padding-left: $gl-padding-50 - $gl-padding-32;
padding-left: $gl-padding;
padding-right: $gl-padding;
}
 
Loading
Loading
@@ -262,23 +262,11 @@
}
}
 
.widget-status-icon {
align-self: flex-start;
button {
margin-left: $gl-padding;
}
}
.mr-widget-body {
line-height: 28px;
 
@include clearfix;
 
button {
margin-left: $gl-padding;
}
.approve-btn {
margin-right: 5px;
}
Loading
Loading
@@ -527,7 +515,7 @@
}
 
.mr-links {
padding-left: $status-icon-size + $gl-btn-padding;
padding-left: $gl-padding-8 + $status-icon-size + $gl-btn-padding;
 
&:last-child {
padding-bottom: $gl-padding;
Loading
Loading
---
title: Add space to "merged by" widget
merge_request: 30972
author:
type: fixed
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment