Commit 02bd43de authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'fix-design-overlay-positioning' into 'master'

Fix design view overlay positioning

See merge request gitlab-org/gitlab!22856
parents 96c35ddb 4ca2d41f
...@@ -238,12 +238,14 @@ export default { ...@@ -238,12 +238,14 @@ export default {
/> />
</template> </template>
</design-destroyer> </design-destroyer>
<div v-if="errorMessage" class="p-3">
<gl-alert variant="danger" @dismiss="errorMessage = null">
{{ errorMessage }}
</gl-alert>
</div>
<div class="d-flex flex-column h-100 mh-100 position-relative"> <div class="d-flex flex-column h-100 mh-100 position-relative">
<div class="p-3">
<gl-alert v-if="errorMessage" variant="danger" @dismiss="errorMessage = null">
{{ errorMessage }}
</gl-alert>
</div>
<design-image <design-image
:image="design.image" :image="design.image"
:name="design.filename" :name="design.filename"
......
---
title: fix positioning of design overlay pins when viewing design
merge_request:
author:
type: fixed
...@@ -13,15 +13,11 @@ exports[`Design management design index page renders design index 1`] = ` ...@@ -13,15 +13,11 @@ exports[`Design management design index page renders design index 1`] = `
projectpath="" projectpath=""
/> />
<!---->
<div <div
class="d-flex flex-column h-100 mh-100 position-relative" class="d-flex flex-column h-100 mh-100 position-relative"
> >
<div
class="p-3"
>
<!---->
</div>
<design-image-stub <design-image-stub
image="test.jpg" image="test.jpg"
name="test.jpg" name="test.jpg"
...@@ -96,27 +92,27 @@ exports[`Design management design index page with error GlAlert is rendered in c ...@@ -96,27 +92,27 @@ exports[`Design management design index page with error GlAlert is rendered in c
/> />
<div <div
class="d-flex flex-column h-100 mh-100 position-relative" class="p-3"
> >
<div <gl-alert-stub
class="p-3" dismissible="true"
dismisslabel="Dismiss"
primarybuttonlink=""
primarybuttontext=""
secondarybuttonlink=""
secondarybuttontext=""
title=""
variant="danger"
> >
<gl-alert-stub
dismissible="true" woops
dismisslabel="Dismiss"
primarybuttonlink="" </gl-alert-stub>
primarybuttontext="" </div>
secondarybuttonlink=""
secondarybuttontext="" <div
title="" class="d-flex flex-column h-100 mh-100 position-relative"
variant="danger" >
>
woops
</gl-alert-stub>
</div>
<design-image-stub <design-image-stub
image="test.jpg" image="test.jpg"
name="test.jpg" name="test.jpg"
......
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