Commit 4a60711c authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'nmezzopera-remove-container-registry-css' into 'master'

Remove container registry css

See merge request gitlab-org/gitlab!35959
parents de5c202f b6701fc1
...@@ -18,10 +18,9 @@ export default { ...@@ -18,10 +18,9 @@ export default {
<gl-empty-state <gl-empty-state
:title="s__('ContainerRegistry|There are no container images available in this group')" :title="s__('ContainerRegistry|There are no container images available in this group')"
:svg-path="config.noContainersImage" :svg-path="config.noContainersImage"
class="container-message"
> >
<template #description> <template #description>
<p class="js-no-container-images-text"> <p>
<gl-sprintf <gl-sprintf
:message=" :message="
s__( s__(
......
<script> <script>
import { GlEmptyState, GlSprintf, GlLink } from '@gitlab/ui'; import { GlEmptyState, GlSprintf, GlLink, GlFormInputGroup, GlFormInput } from '@gitlab/ui';
import { mapState, mapGetters } from 'vuex'; import { mapState, mapGetters } from 'vuex';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
...@@ -17,6 +17,8 @@ export default { ...@@ -17,6 +17,8 @@ export default {
GlEmptyState, GlEmptyState,
GlSprintf, GlSprintf,
GlLink, GlLink,
GlFormInputGroup,
GlFormInput,
}, },
i18n: { i18n: {
quickStart: QUICK_START, quickStart: QUICK_START,
...@@ -43,10 +45,9 @@ export default { ...@@ -43,10 +45,9 @@ export default {
<gl-empty-state <gl-empty-state
:title="s__('ContainerRegistry|There are no container images stored for this project')" :title="s__('ContainerRegistry|There are no container images stored for this project')"
:svg-path="config.noContainersImage" :svg-path="config.noContainersImage"
class="container-message"
> >
<template #description> <template #description>
<p class="js-no-container-images-text"> <p>
<gl-sprintf :message="$options.i18n.introText"> <gl-sprintf :message="$options.i18n.introText">
<template #docLink="{content}"> <template #docLink="{content}">
<gl-link :href="config.helpPagePath" target="_blank">{{ content }}</gl-link> <gl-link :href="config.helpPagePath" target="_blank">{{ content }}</gl-link>
...@@ -54,7 +55,7 @@ export default { ...@@ -54,7 +55,7 @@ export default {
</gl-sprintf> </gl-sprintf>
</p> </p>
<h5>{{ $options.i18n.quickStart }}</h5> <h5>{{ $options.i18n.quickStart }}</h5>
<p class="js-not-logged-in-to-registry-text"> <p>
<gl-sprintf :message="$options.i18n.notLoggedInMessage"> <gl-sprintf :message="$options.i18n.notLoggedInMessage">
<template #twofaDocLink="{content}"> <template #twofaDocLink="{content}">
<gl-link :href="config.twoFactorAuthHelpLink" target="_blank">{{ content }}</gl-link> <gl-link :href="config.twoFactorAuthHelpLink" target="_blank">{{ content }}</gl-link>
...@@ -66,42 +67,49 @@ export default { ...@@ -66,42 +67,49 @@ export default {
</template> </template>
</gl-sprintf> </gl-sprintf>
</p> </p>
<div class="input-group append-bottom-10"> <gl-form-input-group class="gl-mb-4">
<input :value="dockerLoginCommand" type="text" class="form-control monospace" readonly /> <gl-form-input
<span class="input-group-append"> :value="dockerLoginCommand"
readonly
type="text"
class="gl-font-monospace!"
/>
<template #append>
<clipboard-button <clipboard-button
:text="dockerLoginCommand" :text="dockerLoginCommand"
:title="$options.i18n.copyLoginTitle" :title="$options.i18n.copyLoginTitle"
class="input-group-text" class="gl-m-0!"
/> />
</span> </template>
</div> </gl-form-input-group>
<p></p> <p class="gl-mb-4">
<p>
{{ $options.i18n.addImageText }} {{ $options.i18n.addImageText }}
</p> </p>
<gl-form-input-group class="gl-mb-4 ">
<div class="input-group append-bottom-10"> <gl-form-input
<input :value="dockerBuildCommand" type="text" class="form-control monospace" readonly /> :value="dockerBuildCommand"
<span class="input-group-append"> readonly
type="text"
class="gl-font-monospace!"
/>
<template #append>
<clipboard-button <clipboard-button
:text="dockerBuildCommand" :text="dockerBuildCommand"
:title="$options.i18n.copyBuildTitle" :title="$options.i18n.copyBuildTitle"
class="input-group-text" class="gl-m-0!"
/> />
</span> </template>
</div> </gl-form-input-group>
<gl-form-input-group>
<div class="input-group"> <gl-form-input :value="dockerPushCommand" readonly type="text" class="gl-font-monospace!" />
<input :value="dockerPushCommand" type="text" class="form-control monospace" readonly /> <template #append>
<span class="input-group-append">
<clipboard-button <clipboard-button
:text="dockerPushCommand" :text="dockerPushCommand"
:title="$options.i18n.copyPushTitle" :title="$options.i18n.copyPushTitle"
class="input-group-text" class="gl-m-0!"
/> />
</span> </template>
</div> </gl-form-input-group>
</template> </template>
</gl-empty-state> </gl-empty-state>
</template> </template>
...@@ -217,7 +217,6 @@ export default { ...@@ -217,7 +217,6 @@ export default {
:svg-path="config.noContainersImage" :svg-path="config.noContainersImage"
data-testid="emptySearch" data-testid="emptySearch"
:title="$options.i18n.EMPTY_RESULT_TITLE" :title="$options.i18n.EMPTY_RESULT_TITLE"
class="container-message"
> >
<template #description> <template #description>
{{ $options.i18n.EMPTY_RESULT_MESSAGE }} {{ $options.i18n.EMPTY_RESULT_MESSAGE }}
......
/**
* Container Registry
*/
.container-message {
span .btn {
margin: 0;
}
}
.container-image {
border-bottom: 1px solid $white-normal;
}
.container-image-head {
padding: 0 16px;
line-height: 4em;
.btn-link {
padding: 0;
&:focus {
outline: none;
}
}
}
.table.tags {
margin-bottom: 0;
.registry-image-row {
.check {
padding-right: $gl-padding;
width: 5%;
}
.action-buttons {
opacity: 0;
}
&:hover {
.action-buttons {
opacity: 1;
}
}
}
}
...@@ -2,13 +2,10 @@ ...@@ -2,13 +2,10 @@
exports[`Registry Group Empty state to match the default snapshot 1`] = ` exports[`Registry Group Empty state to match the default snapshot 1`] = `
<div <div
class="container-message"
svg-path="foo" svg-path="foo"
title="There are no container images available in this group" title="There are no container images available in this group"
> >
<p <p>
class="js-no-container-images-text"
>
With the Container Registry, every project can have its own space to store its Docker images. Push at least one Docker image in one of this group's projects in order to show up here. With the Container Registry, every project can have its own space to store its Docker images. Push at least one Docker image in one of this group's projects in order to show up here.
<gl-link-stub <gl-link-stub
href="baz" href="baz"
......
...@@ -2,13 +2,10 @@ ...@@ -2,13 +2,10 @@
exports[`Registry Project Empty state to match the default snapshot 1`] = ` exports[`Registry Project Empty state to match the default snapshot 1`] = `
<div <div
class="container-message"
svg-path="bazFoo" svg-path="bazFoo"
title="There are no container images stored for this project" title="There are no container images stored for this project"
> >
<p <p>
class="js-no-container-images-text"
>
With the Container Registry, every project can have its own space to store its Docker images. With the Container Registry, every project can have its own space to store its Docker images.
<gl-link-stub <gl-link-stub
href="baz" href="baz"
...@@ -22,9 +19,7 @@ exports[`Registry Project Empty state to match the default snapshot 1`] = ` ...@@ -22,9 +19,7 @@ exports[`Registry Project Empty state to match the default snapshot 1`] = `
CLI Commands CLI Commands
</h5> </h5>
<p <p>
class="js-not-logged-in-to-registry-text"
>
If you are not already logged in, you need to authenticate to the Container Registry by using your GitLab username and password. If you have If you are not already logged in, you need to authenticate to the Container Registry by using your GitLab username and password. If you have
<gl-link-stub <gl-link-stub
href="barBaz" href="barBaz"
...@@ -42,78 +37,50 @@ exports[`Registry Project Empty state to match the default snapshot 1`] = ` ...@@ -42,78 +37,50 @@ exports[`Registry Project Empty state to match the default snapshot 1`] = `
instead of a password. instead of a password.
</p> </p>
<div <gl-form-input-group-stub
class="input-group append-bottom-10" class="gl-mb-4"
predefinedoptions="[object Object]"
value=""
> >
<input <gl-form-input-stub
class="form-control monospace" class="gl-font-monospace!"
readonly="readonly" readonly=""
type="text" type="text"
value="docker login bar"
/> />
</gl-form-input-group-stub>
<span
class="input-group-append"
>
<clipboard-button-stub
class="input-group-text"
cssclass="btn-default"
text="docker login bar"
title="Copy login command"
tooltipplacement="top"
/>
</span>
</div>
<p /> <p
class="gl-mb-4"
<p> >
You can add an image to this registry with the following commands: You can add an image to this registry with the following commands:
</p> </p>
<div <gl-form-input-group-stub
class="input-group append-bottom-10" class="gl-mb-4 "
predefinedoptions="[object Object]"
value=""
> >
<input <gl-form-input-stub
class="form-control monospace" class="gl-font-monospace!"
readonly="readonly" readonly=""
type="text" type="text"
value="docker build -t foo ."
/> />
</gl-form-input-group-stub>
<span
class="input-group-append"
>
<clipboard-button-stub
class="input-group-text"
cssclass="btn-default"
text="docker build -t foo ."
title="Copy build command"
tooltipplacement="top"
/>
</span>
</div>
<div <gl-form-input-group-stub
class="input-group" predefinedoptions="[object Object]"
value=""
> >
<input <gl-form-input-stub
class="form-control monospace" class="gl-font-monospace!"
readonly="readonly" readonly=""
type="text" type="text"
value="docker push foo"
/> />
</gl-form-input-group-stub>
<span
class="input-group-append"
>
<clipboard-button-stub
class="input-group-text"
cssclass="btn-default"
text="docker push foo"
title="Copy push command"
tooltipplacement="top"
/>
</span>
</div>
</div> </div>
`; `;
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