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
4717998e
Commit
4717998e
authored
Sep 29, 2020
by
Natalia Tepluhina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Design Management toolbar to use GitLab UI classes
parent
60a60a32
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
12 deletions
+17
-12
app/assets/javascripts/design_management/components/toolbar/design_navigation.vue
...esign_management/components/toolbar/design_navigation.vue
+2
-2
app/assets/javascripts/design_management/components/toolbar/index.vue
...avascripts/design_management/components/toolbar/index.vue
+4
-4
changelogs/unreleased/ntepluhina-refactor-toolbar-to-gitlab-ui.yml
...s/unreleased/ntepluhina-refactor-toolbar-to-gitlab-ui.yml
+5
-0
spec/frontend/design_management/components/toolbar/__snapshots__/design_navigation_spec.js.snap
...ents/toolbar/__snapshots__/design_navigation_spec.js.snap
+2
-2
spec/frontend/design_management/components/toolbar/__snapshots__/index_spec.js.snap
...ement/components/toolbar/__snapshots__/index_spec.js.snap
+4
-4
No files found.
app/assets/javascripts/design_management/components/toolbar/design_navigation.vue
View file @
4717998e
...
@@ -64,9 +64,9 @@ export default {
...
@@ -64,9 +64,9 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
v-if=
"designsCount"
class=
"
d-flex
align-items-center"
>
<div
v-if=
"designsCount"
class=
"
gl-display-flex gl-
align-items-center"
>
{{
paginationText
}}
{{
paginationText
}}
<gl-button-group
class=
"
ml-3 mr-3
"
>
<gl-button-group
class=
"
gl-mx-5
"
>
<gl-button
<gl-button
:disabled=
"!previousDesign"
:disabled=
"!previousDesign"
:title=
"s__('DesignManagement|Go to previous design')"
:title=
"s__('DesignManagement|Go to previous design')"
...
...
app/assets/javascripts/design_management/components/toolbar/index.vue
View file @
4717998e
...
@@ -106,12 +106,12 @@ export default {
...
@@ -106,12 +106,12 @@ export default {
>
>
<gl-icon
name=
"close"
/>
<gl-icon
name=
"close"
/>
</router-link>
</router-link>
<div
class=
"
overflow-hidden d-flex
align-items-center"
>
<div
class=
"
gl-overflow-hidden gl-display-flex gl-
align-items-center"
>
<h2
class=
"m-0 str-truncated-100 gl-font-base"
>
{{
filename
}}
</h2>
<h2
class=
"
gl-
m-0 str-truncated-100 gl-font-base"
>
{{
filename
}}
</h2>
<small
v-if=
"updatedAt"
class=
"
text-secondary
"
>
{{
updatedText
}}
</small>
<small
v-if=
"updatedAt"
class=
"
gl-text-gray-500
"
>
{{
updatedText
}}
</small>
</div>
</div>
</div>
</div>
<design-navigation
:id=
"id"
class=
"
ml-auto
flex-shrink-0"
/>
<design-navigation
:id=
"id"
class=
"
gl-ml-auto gl-
flex-shrink-0"
/>
<gl-button
:href=
"image"
icon=
"download"
/>
<gl-button
:href=
"image"
icon=
"download"
/>
<delete-button
<delete-button
v-if=
"isLatestVersion && canDeleteDesign"
v-if=
"isLatestVersion && canDeleteDesign"
...
...
changelogs/unreleased/ntepluhina-refactor-toolbar-to-gitlab-ui.yml
0 → 100644
View file @
4717998e
---
title
:
Update Design Management toolbar to use GitLab UI classes
merge_request
:
43682
author
:
type
:
other
spec/frontend/design_management/components/toolbar/__snapshots__/design_navigation_spec.js.snap
View file @
4717998e
...
@@ -4,13 +4,13 @@ exports[`Design management pagination component hides components when designs ar
...
@@ -4,13 +4,13 @@ exports[`Design management pagination component hides components when designs ar
exports[`Design management pagination component renders navigation buttons 1`] = `
exports[`Design management pagination component renders navigation buttons 1`] = `
<div
<div
class="
d-flex
align-items-center"
class="
gl-display-flex gl-
align-items-center"
>
>
0 of 2
0 of 2
<gl-button-group-stub
<gl-button-group-stub
class="
ml-3 mr-3
"
class="
gl-mx-5
"
>
>
<gl-button-stub
<gl-button-stub
buttontextclasses=""
buttontextclasses=""
...
...
spec/frontend/design_management/components/toolbar/__snapshots__/index_spec.js.snap
View file @
4717998e
...
@@ -19,16 +19,16 @@ exports[`Design management toolbar component renders design and updated data 1`]
...
@@ -19,16 +19,16 @@ exports[`Design management toolbar component renders design and updated data 1`]
</a>
</a>
<div
<div
class="
overflow-hidden d-flex
align-items-center"
class="
gl-overflow-hidden gl-display-flex gl-
align-items-center"
>
>
<h2
<h2
class="m-0 str-truncated-100 gl-font-base"
class="
gl-
m-0 str-truncated-100 gl-font-base"
>
>
test.jpg
test.jpg
</h2>
</h2>
<small
<small
class="
text-secondary
"
class="
gl-text-gray-500
"
>
>
Updated 1 hour ago by Test Name
Updated 1 hour ago by Test Name
</small>
</small>
...
@@ -36,7 +36,7 @@ exports[`Design management toolbar component renders design and updated data 1`]
...
@@ -36,7 +36,7 @@ exports[`Design management toolbar component renders design and updated data 1`]
</div>
</div>
<design-navigation-stub
<design-navigation-stub
class="
ml-auto
flex-shrink-0"
class="
gl-ml-auto gl-
flex-shrink-0"
id="1"
id="1"
/>
/>
...
...
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