summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Kipling <nkipling@gitlab.com>2019-07-09 10:26:08 +0100
committerNick Kipling <nkipling@gitlab.com>2019-07-10 16:02:29 +0100
commit8c9949414c85919bc5e77cedc8dbb2446e89d47f (patch)
tree4f0310415099b5abab9aaa04ef38b189f861ac2b
parent2d9cd76f4f7319a9f4cafc5a01e6b5f29d3cb1fc (diff)
downloadgitlab-ce-8c9949414c85919bc5e77cedc8dbb2446e89d47f.tar.gz
Fixing empty container registry message
-rw-r--r--app/assets/javascripts/registry/components/app.vue4
-rw-r--r--app/assets/javascripts/registry/components/svg_message.vue6
-rw-r--r--changelogs/unreleased/64249-align-container-registry-empty-state-with-design-guidelines.yml5
3 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/javascripts/registry/components/app.vue b/app/assets/javascripts/registry/components/app.vue
index 7752723baac..f6112dcfb9b 100644
--- a/app/assets/javascripts/registry/components/app.vue
+++ b/app/assets/javascripts/registry/components/app.vue
@@ -99,7 +99,7 @@ export default {
<p v-html="dockerConnectionErrorText"></p>
</svg-message>
- <gl-loading-icon v-else-if="isLoading" size="md" class="prepend-top-16" />
+ <gl-loading-icon v-else-if="isLoading && !characterError" size="md" class="prepend-top-16" />
<div v-else-if="!isLoading && !characterError && repos.length">
<h4>{{ s__('ContainerRegistry|Container Registry') }}</h4>
@@ -128,6 +128,8 @@ export default {
<pre>
docker build -t {{ repositoryUrl }} .
+ </pre>
+ <pre>
docker push {{ repositoryUrl }}
</pre>
</svg-message>
diff --git a/app/assets/javascripts/registry/components/svg_message.vue b/app/assets/javascripts/registry/components/svg_message.vue
index d0d44bf2d14..617093e054e 100644
--- a/app/assets/javascripts/registry/components/svg_message.vue
+++ b/app/assets/javascripts/registry/components/svg_message.vue
@@ -15,10 +15,12 @@ export default {
</script>
<template>
- <div :id="id" class="empty-state container-message mw-70p">
+ <div :id="id" class="empty-state container-message">
<div class="svg-content">
<img :src="svgPath" class="flex-align-self-center" />
</div>
- <slot></slot>
+ <div class="text-content">
+ <slot></slot>
+ </div>
</div>
</template>
diff --git a/changelogs/unreleased/64249-align-container-registry-empty-state-with-design-guidelines.yml b/changelogs/unreleased/64249-align-container-registry-empty-state-with-design-guidelines.yml
new file mode 100644
index 00000000000..ecdb4b6bed1
--- /dev/null
+++ b/changelogs/unreleased/64249-align-container-registry-empty-state-with-design-guidelines.yml
@@ -0,0 +1,5 @@
+---
+title: Alignign empty container registry message with design guidelines
+merge_request: 30502
+author:
+type: other