Commit 9e8fc4be authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '267505-mobile-empty-screen-svg-overlap' into 'master'

Class and markup cleanup to prevent SVG header bar overlap

See merge request gitlab-org/gitlab!45334
parents 37b4a3e1 d260143d
...@@ -61,26 +61,26 @@ export default { ...@@ -61,26 +61,26 @@ export default {
}; };
</script> </script>
<template> <template>
<div class="container gl-flex-grow-1 gl-display-flex gl-flex-direction-column"> <div>
<div <div class="gl-border-b-solid gl-border-b-1 gl-border-b-gray-100">
v-if="savedContentMeta"
class="gl-fixed gl-left-0 gl-right-0 gl-border-b-solid gl-border-b-1 gl-border-b-gray-100"
>
<div class="container gl-py-4"> <div class="container gl-py-4">
<div class="gl-display-flex">
<gl-button <gl-button
v-if="appData.returnUrl" v-if="appData.returnUrl"
ref="returnToSiteButton" ref="returnToSiteButton"
class="gl-mr-5" class="gl-mr-5 gl-align-self-start"
:href="appData.returnUrl" :href="appData.returnUrl"
>{{ $options.returnToSiteBtnText }}</gl-button >{{ $options.returnToSiteBtnText }}</gl-button
> >
<strong> <strong class="gl-mt-2">
{{ updatedFileDescription }} {{ updatedFileDescription }}
</strong> </strong>
</div> </div>
</div> </div>
</div>
<div class="container">
<gl-empty-state <gl-empty-state
class="gl-my-9" class="gl-my-7"
:title="savedContentMeta ? $options.title : $options.submittingTitle" :title="savedContentMeta ? $options.title : $options.submittingTitle"
:primary-button-text="savedContentMeta && $options.primaryButtonText" :primary-button-text="savedContentMeta && $options.primaryButtonText"
:primary-button-link="savedContentMeta && savedContentMeta.mergeRequest.url" :primary-button-link="savedContentMeta && savedContentMeta.mergeRequest.url"
...@@ -102,4 +102,5 @@ export default { ...@@ -102,4 +102,5 @@ export default {
</template> </template>
</gl-empty-state> </gl-empty-state>
</div> </div>
</div>
</template> </template>
---
title: Class and markup cleanup to prevent SVG header bar overlap in Static Site Editor
merge_request: 45334
author:
type: fixed
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