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
98ef5405
Commit
98ef5405
authored
Jul 23, 2020
by
Natalia Tepluhina
Committed by
Phil Hughes
Jul 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "UX Polish: Fix icon styles"
parent
bb2b2477
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
3 deletions
+16
-3
app/assets/javascripts/design_management_new/components/upload/design_dropzone.vue
...sign_management_new/components/upload/design_dropzone.vue
+7
-1
changelogs/unreleased/229961-ux-polish-fix-icon-styles.yml
changelogs/unreleased/229961-ux-polish-fix-icon-styles.yml
+5
-0
doc/user/project/issues/design_management.md
doc/user/project/issues/design_management.md
+1
-1
doc/user/project/issues/img/design_management_upload_v13.2.png
...ser/project/issues/img/design_management_upload_v13.2.png
+0
-0
doc/user/project/issues/img/design_management_upload_v13.3.png
...ser/project/issues/img/design_management_upload_v13.3.png
+0
-0
spec/frontend/design_management_new/components/upload/design_dropzone_spec.js
..._management_new/components/upload/design_dropzone_spec.js
+3
-1
No files found.
app/assets/javascripts/design_management_new/components/upload/design_dropzone.vue
View file @
98ef5405
...
...
@@ -28,6 +28,12 @@ export default {
dragging
()
{
return
this
.
dragCounter
!==
0
;
},
iconStyles
()
{
return
{
size
:
this
.
hasDesigns
?
24
:
16
,
class
:
this
.
hasDesigns
?
'
gl-mb-2
'
:
'
gl-mr-3 gl-text-gray-700
'
,
};
},
},
methods
:
{
isValidUpload
(
files
)
{
...
...
@@ -90,7 +96,7 @@ export default {
class="gl-display-flex gl-align-items-center gl-justify-content-center gl-text-center"
data-testid="dropzone-area"
>
<gl-icon
name=
"upload"
:size=
"
24"
:class=
"hasDesigns ? 'gl-mb-2' : 'gl-mr-4'
"
/>
<gl-icon
name=
"upload"
:size=
"
iconStyles.size"
:class=
"iconStyles.class
"
/>
<p
class=
"gl-font-weight-bold gl-mb-0"
>
<gl-sprintf
:message=
"__('Drop or %
{linkStart}upload%{linkEnd} Designs to attach')">
<template
#link
="
{ content }">
...
...
changelogs/unreleased/229961-ux-polish-fix-icon-styles.yml
0 → 100644
View file @
98ef5405
---
title
:
'
Resolve
UX
Polish:
Fix
icon
styles'
merge_request
:
37546
author
:
type
:
fixed
doc/user/project/issues/design_management.md
View file @
98ef5405
...
...
@@ -110,7 +110,7 @@ instead of directly on the issue description.
To upload Design images, drag files from your computer and drop them in the Design Management section,
or click
**upload**
to select images from your file browser:
![
Designs empty state
](
img/design_management_upload_v13.
2
.png
)
![
Designs empty state
](
img/design_management_upload_v13.
3
.png
)
[
Introduced
](
https://gitlab.com/gitlab-org/gitlab/-/issues/34353
)
in
[
GitLab Premium
](
https://about.gitlab.com/pricing/
)
12.9,
you can drag and drop designs onto the dedicated drop zone to upload them.
...
...
doc/user/project/issues/img/design_management_upload_v13.2.png
deleted
100644 → 0
View file @
bb2b2477
60.7 KB
doc/user/project/issues/img/design_management_upload_v13.3.png
0 → 100644
View file @
98ef5405
55.9 KB
spec/frontend/design_management_new/components/upload/design_dropzone_spec.js
View file @
98ef5405
...
...
@@ -140,12 +140,14 @@ describe('Design management dropzone component', () => {
it
(
'
applies correct classes when there are no designs or no design saving loader
'
,
()
=>
{
createComponent
({
props
:
{
hasDesigns
:
false
}
});
expect
(
findDropzoneArea
().
classes
()).
not
.
toContain
(
'
gl-flex-direction-column
'
);
expect
(
findIcon
().
classes
()).
toEqual
([
'
gl-mr-4
'
]);
expect
(
findIcon
().
classes
()).
toEqual
([
'
gl-mr-3
'
,
'
gl-text-gray-700
'
]);
expect
(
findIcon
().
props
(
'
size
'
)).
toBe
(
16
);
});
it
(
'
applies correct classes when there are designs or design saving loader
'
,
()
=>
{
createComponent
({
props
:
{
hasDesigns
:
true
}
});
expect
(
findDropzoneArea
().
classes
()).
toContain
(
'
gl-flex-direction-column
'
);
expect
(
findIcon
().
classes
()).
toEqual
([
'
gl-mb-2
'
]);
expect
(
findIcon
().
props
(
'
size
'
)).
toBe
(
24
);
});
});
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