Commit 8c136177 authored by Phil Hughes's avatar Phil Hughes

Merge branch '6228-bs-modal' into 'master'

Resolve "Merge Request > Security Reports > Vulnerability Modal broken with Bootstrap 4 update"

Closes #6228

See merge request gitlab-org/gitlab-ee!5972
parents 9298d37b 5c90815f
...@@ -66,13 +66,13 @@ export default { ...@@ -66,13 +66,13 @@ export default {
class="row prepend-top-10 append-bottom-10" class="row prepend-top-10 append-bottom-10"
:key="index" :key="index"
> >
<label class="col-sm-2 text-right"> <label class="col-sm-2 text-right font-weight-bold">
{{ field.text }}: {{ field.text }}:
</label> </label>
<div class="col-sm-10 text-secondary"> <div class="col-sm-10 text-secondary">
<div <div
v-if="hasInstances(field, key)" v-if="hasInstances(field, key)"
class="well" class="info-well"
> >
<ul class="report-block-list"> <ul class="report-block-list">
<li <li
...@@ -163,7 +163,7 @@ export default { ...@@ -163,7 +163,7 @@ export default {
</div> </div>
<div class="row prepend-top-20 append-bottom-10"> <div class="row prepend-top-20 append-bottom-10">
<div class="col-sm-10 col-sm-offset-2 text-secondary"> <div class="col-sm-10 offset-sm-2 text-secondary">
<template v-if="hasDismissedBy"> <template v-if="hasDismissedBy">
{{ s__('ciReport|Dismissed by') }} {{ s__('ciReport|Dismissed by') }}
<a <a
......
...@@ -125,9 +125,6 @@ ...@@ -125,9 +125,6 @@
.modal-security-report-dast { .modal-security-report-dast {
.modal-dialog { .modal-dialog {
width: $modal-lg; width: $modal-lg;
} max-width: $modal-lg;
// TODO remove this when gl_modal support not rendering the footer
.modal-footer {
display: block;
} }
} }
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