Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d260143d
Commit
d260143d
authored
Oct 15, 2020
by
derek-knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Class and markup cleanup to prevent SVG header bar overlap
parent
bf2a91f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
37 deletions
+43
-37
app/assets/javascripts/static_site_editor/pages/success.vue
app/assets/javascripts/static_site_editor/pages/success.vue
+38
-37
changelogs/unreleased/267505-mobile-empty-screen-svg-overlap.yml
...ogs/unreleased/267505-mobile-empty-screen-svg-overlap.yml
+5
-0
No files found.
app/assets/javascripts/static_site_editor/pages/success.vue
View file @
d260143d
...
...
@@ -61,45 +61,46 @@ export default {
};
</
script
>
<
template
>
<div
class=
"container gl-flex-grow-1 gl-display-flex gl-flex-direction-column"
>
<div
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>
<div
class=
"gl-border-b-solid gl-border-b-1 gl-border-b-gray-100"
>
<div
class=
"container gl-py-4"
>
<gl-button
v-if=
"appData.returnUrl"
ref=
"returnToSiteButton"
class=
"gl-mr-5"
:href=
"appData.returnUrl"
>
{{
$options
.
returnToSiteBtnText
}}
</gl-button
>
<strong>
{{
updatedFileDescription
}}
</strong>
<div
class=
"gl-display-flex"
>
<gl-button
v-if=
"appData.returnUrl"
ref=
"returnToSiteButton"
class=
"gl-mr-5 gl-align-self-start"
:href=
"appData.returnUrl"
>
{{
$options
.
returnToSiteBtnText
}}
</gl-button
>
<strong
class=
"gl-mt-2"
>
{{
updatedFileDescription
}}
</strong>
</div>
</div>
</div>
<gl-empty-state
class=
"gl-my-9"
:title=
"savedContentMeta ? $options.title : $options.submittingTitle"
:primary-button-text=
"savedContentMeta && $options.primaryButtonText"
:primary-button-link=
"savedContentMeta && savedContentMeta.mergeRequest.url"
:svg-path=
"mergeRequestsIllustrationPath"
:svg-height=
"146"
>
<template
#description
>
<div
v-if=
"savedContentMeta"
>
<p>
{{
$options
.
mergeRequestInstructionsHeading
}}
</p>
<p>
{{
$options
.
addTitleInstruction
}}
</p>
<p>
{{
$options
.
addDescriptionInstruction
}}
</p>
<p>
{{
$options
.
assignMergeRequestInstruction
}}
</p>
</div>
<div
v-else
>
<p>
{{
$options
.
submittingNotePrimary
}}
</p>
<p>
{{
$options
.
submittingNoteSecondary
}}
</p>
<gl-loading-icon
size=
"xl"
/>
</div>
</
template
>
</gl-empty-state>
<div
class=
"container"
>
<gl-empty-state
class=
"gl-my-7"
:title=
"savedContentMeta ? $options.title : $options.submittingTitle"
:primary-button-text=
"savedContentMeta && $options.primaryButtonText"
:primary-button-link=
"savedContentMeta && savedContentMeta.mergeRequest.url"
:svg-path=
"mergeRequestsIllustrationPath"
:svg-height=
"146"
>
<template
#description
>
<div
v-if=
"savedContentMeta"
>
<p>
{{
$options
.
mergeRequestInstructionsHeading
}}
</p>
<p>
{{
$options
.
addTitleInstruction
}}
</p>
<p>
{{
$options
.
addDescriptionInstruction
}}
</p>
<p>
{{
$options
.
assignMergeRequestInstruction
}}
</p>
</div>
<div
v-else
>
<p>
{{
$options
.
submittingNotePrimary
}}
</p>
<p>
{{
$options
.
submittingNoteSecondary
}}
</p>
<gl-loading-icon
size=
"xl"
/>
</div>
</
template
>
</gl-empty-state>
</div>
</div>
</template>
changelogs/unreleased/267505-mobile-empty-screen-svg-overlap.yml
0 → 100644
View file @
d260143d
---
title
:
Class and markup cleanup to prevent SVG header bar overlap in Static Site Editor
merge_request
:
45334
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment