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
2c4da8de
Commit
2c4da8de
authored
Sep 11, 2020
by
Nicolò Maria Mezzopera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update list_item secondary row alignment
- source - snapshots
parent
eceb2547
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
18 deletions
+25
-18
app/assets/javascripts/packages/shared/components/package_list_row.vue
...vascripts/packages/shared/components/package_list_row.vue
+9
-7
app/assets/javascripts/packages/shared/components/publish_method.vue
...javascripts/packages/shared/components/publish_method.vue
+1
-1
app/assets/javascripts/vue_shared/components/registry/list_item.vue
.../javascripts/vue_shared/components/registry/list_item.vue
+6
-3
spec/frontend/packages/shared/components/__snapshots__/package_list_row_spec.js.snap
...ed/components/__snapshots__/package_list_row_spec.js.snap
+8
-6
spec/frontend/packages/shared/components/__snapshots__/publish_method_spec.js.snap
...ared/components/__snapshots__/publish_method_spec.js.snap
+1
-1
No files found.
app/assets/javascripts/packages/shared/components/package_list_row.vue
View file @
2c4da8de
...
@@ -116,6 +116,7 @@ export default {
...
@@ -116,6 +116,7 @@ export default {
</
template
>
</
template
>
<
template
#right-secondary
>
<
template
#right-secondary
>
<span>
<gl-sprintf
:message=
"__('Created %
{timestamp}')">
<gl-sprintf
:message=
"__('Created %
{timestamp}')">
<template
#timestamp
>
<template
#timestamp
>
<span
v-gl-tooltip
:title=
"tooltipTitle(packageEntity.created_at)"
>
<span
v-gl-tooltip
:title=
"tooltipTitle(packageEntity.created_at)"
>
...
@@ -123,6 +124,7 @@ export default {
...
@@ -123,6 +124,7 @@ export default {
</span>
</span>
</
template
>
</
template
>
</gl-sprintf>
</gl-sprintf>
</span>
</template>
</template>
<
template
v-if=
"!disableDelete"
#right-action
>
<
template
v-if=
"!disableDelete"
#right-action
>
...
...
app/assets/javascripts/packages/shared/components/publish_method.vue
View file @
2c4da8de
...
@@ -36,7 +36,7 @@ export default {
...
@@ -36,7 +36,7 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"gl-display-flex gl-align-items-center
gl-mb-2
"
>
<div
class=
"gl-display-flex gl-align-items-center"
>
<template
v-if=
"hasPipeline"
>
<template
v-if=
"hasPipeline"
>
<gl-icon
name=
"git-merge"
class=
"gl-mr-2"
/>
<gl-icon
name=
"git-merge"
class=
"gl-mr-2"
/>
<span
data-testid=
"pipeline-ref"
class=
"gl-mr-2"
>
{{
packageEntity
.
pipeline
.
ref
}}
</span>
<span
data-testid=
"pipeline-ref"
class=
"gl-mr-2"
>
{{
packageEntity
.
pipeline
.
ref
}}
</span>
...
...
app/assets/javascripts/vue_shared/components/registry/list_item.vue
View file @
2c4da8de
...
@@ -83,7 +83,7 @@ export default {
...
@@ -83,7 +83,7 @@ export default {
</div>
</div>
<div
<div
v-if=
"$slots['left-secondary']"
v-if=
"$slots['left-secondary']"
class=
"gl-text-gray-500 gl-mt-1 gl-min-h-6 gl-min-w-0 gl-flex-fill-1"
class=
"gl-
display-flex gl-align-items-center gl-
text-gray-500 gl-mt-1 gl-min-h-6 gl-min-w-0 gl-flex-fill-1"
>
>
<slot
name=
"left-secondary"
></slot>
<slot
name=
"left-secondary"
></slot>
</div>
</div>
...
@@ -93,11 +93,14 @@ export default {
...
@@ -93,11 +93,14 @@ export default {
>
>
<div
<div
v-if=
"$slots['right-primary']"
v-if=
"$slots['right-primary']"
class=
"gl-sm-text-body gl-sm-font-weight-bold gl-min-h-6"
class=
"gl-
display-flex gl-align-items-center gl-
sm-text-body gl-sm-font-weight-bold gl-min-h-6"
>
>
<slot
name=
"right-primary"
></slot>
<slot
name=
"right-primary"
></slot>
</div>
</div>
<div
v-if=
"$slots['right-secondary']"
class=
"gl-mt-1 gl-min-h-6"
>
<div
v-if=
"$slots['right-secondary']"
class=
"gl-display-flex gl-align-items-center gl-mt-1 gl-min-h-6"
>
<slot
name=
"right-secondary"
></slot>
<slot
name=
"right-secondary"
></slot>
</div>
</div>
</div>
</div>
...
...
spec/frontend/packages/shared/components/__snapshots__/package_list_row_spec.js.snap
View file @
2c4da8de
...
@@ -40,7 +40,7 @@ exports[`packages_list_row renders 1`] = `
...
@@ -40,7 +40,7 @@ exports[`packages_list_row renders 1`] = `
</div>
</div>
<div
<div
class="gl-text-gray-500 gl-mt-1 gl-min-h-6 gl-min-w-0 gl-flex-fill-1"
class="gl-
display-flex gl-align-items-center gl-
text-gray-500 gl-mt-1 gl-min-h-6 gl-min-w-0 gl-flex-fill-1"
>
>
<div
<div
class="gl-display-flex"
class="gl-display-flex"
...
@@ -94,7 +94,7 @@ exports[`packages_list_row renders 1`] = `
...
@@ -94,7 +94,7 @@ exports[`packages_list_row renders 1`] = `
class="gl-display-flex gl-flex-direction-column gl-sm-align-items-flex-end gl-justify-content-space-between gl-text-gray-500 gl-flex-shrink-0"
class="gl-display-flex gl-flex-direction-column gl-sm-align-items-flex-end gl-justify-content-space-between gl-text-gray-500 gl-flex-shrink-0"
>
>
<div
<div
class="gl-sm-text-body gl-sm-font-weight-bold gl-min-h-6"
class="gl-
display-flex gl-align-items-center gl-
sm-text-body gl-sm-font-weight-bold gl-min-h-6"
>
>
<publish-method-stub
<publish-method-stub
packageentity="[object Object]"
packageentity="[object Object]"
...
@@ -102,11 +102,13 @@ exports[`packages_list_row renders 1`] = `
...
@@ -102,11 +102,13 @@ exports[`packages_list_row renders 1`] = `
</div>
</div>
<div
<div
class="gl-mt-1 gl-min-h-6"
class="gl-
display-flex gl-align-items-center gl-
mt-1 gl-min-h-6"
>
>
<span>
<gl-sprintf-stub
<gl-sprintf-stub
message="Created %{timestamp}"
message="Created %{timestamp}"
/>
/>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
spec/frontend/packages/shared/components/__snapshots__/publish_method_spec.js.snap
View file @
2c4da8de
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
exports[`publish_method renders 1`] = `
exports[`publish_method renders 1`] = `
<div
<div
class="gl-display-flex gl-align-items-center
gl-mb-2
"
class="gl-display-flex gl-align-items-center"
>
>
<gl-icon-stub
<gl-icon-stub
class="gl-mr-2"
class="gl-mr-2"
...
...
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