Commit 0f62e0eb authored by Eric Eastwood's avatar Eric Eastwood

Even out spacing in panel body token list

parent db60fbe7
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
</li> </li>
</ul> </ul>
</div> </div>
<div class="clearfix prepend-top-10"> <div class="add-issuable-form-actions clearfix">
<button <button
ref="addButton" ref="addButton"
type="button" type="button"
......
...@@ -146,9 +146,9 @@ export default { ...@@ -146,9 +146,9 @@ export default {
</div> </div>
<div <div
v-if="hasRelatedIssues" v-if="hasRelatedIssues"
class="panel-body"> class="related-issues-token-body panel-body">
<ul <ul
class="related-issues-token-body"> class="related-issues-token-list">
<li <li
:key="issue.id" :key="issue.id"
v-for="issue in relatedIssues" v-for="issue in relatedIssues"
......
@mixin panel { .panel {
.panel-heading { margin-bottom: $gl-padding;
padding: $gl-vert-padding $gl-padding; }
line-height: 36px;
.panel-slim {
.controls { @extend .panel;
margin-top: -2px; margin-bottom: $gl-vert-padding;
float: right; }
}
.dropdown-menu-toggle { .panel-heading {
line-height: 20px; padding: $gl-vert-padding $gl-padding;
} line-height: 36px;
.badge { .controls {
margin-top: -2px; margin-top: -2px;
margin-left: 5px; float: right;
}
&.split {
display: flex;
align-items: center;
}
.left {
flex: 1 1 auto;
}
.right {
flex: 0 0 auto;
text-align: right;
}
} }
.panel-empty-heading { .dropdown-menu-toggle {
border-bottom: 0; line-height: 20px;
} }
.panel-body { .badge {
padding: $gl-padding; margin-top: -2px;
margin-left: 5px;
}
.form-actions { &.split {
margin: -$gl-padding; display: flex;
margin-top: $gl-padding; align-items: center;
}
} }
.panel-title { .left {
font-size: inherit; flex: 1 1 auto;
line-height: inherit; }
.right {
flex: 0 0 auto;
text-align: right;
} }
} }
.panel { .panel-empty-heading {
@include panel; border-bottom: 0;
margin-bottom: $gl-padding;
} }
.panel-slim { .panel-body {
@extend .panel; padding: $gl-padding;
@include panel;
margin-bottom: $gl-vert-padding; .form-actions {
margin: -$gl-padding;
margin-top: $gl-padding;
}
}
.panel-title {
font-size: inherit;
line-height: inherit;
} }
...@@ -768,3 +768,7 @@ ...@@ -768,3 +768,7 @@
outline: none; outline: none;
} }
} }
.add-issuable-form-actions {
margin-top: $gl-padding;
}
$token_spacing_bottom: 0.5em;
.related-issues-block { .related-issues-block {
margin-top: 3 * $gl-vert-padding; margin-top: 3 * $gl-vert-padding;
} }
...@@ -21,6 +23,10 @@ ...@@ -21,6 +23,10 @@
} }
.related-issues-token-body { .related-issues-token-body {
padding-bottom: calc(#{$gl-padding} - #{$token_spacing_bottom});
}
.related-issues-token-list {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-bottom: 0; margin-bottom: 0;
...@@ -30,6 +36,6 @@ ...@@ -30,6 +36,6 @@
.related-issues-token-list-item { .related-issues-token-list-item {
max-width: 100%; max-width: 100%;
margin-bottom: 0.5em; margin-bottom: $token_spacing_bottom;
margin-right: 5px; margin-right: 5px;
} }
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