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
a7510b34
Commit
a7510b34
authored
Jul 24, 2020
by
Tom Quirk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't bold design dropzone text
Also, make `designs` copy lowercase
parent
539d69fc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
16 deletions
+21
-16
app/assets/javascripts/design_management_new/components/upload/design_dropzone.vue
...sign_management_new/components/upload/design_dropzone.vue
+3
-3
changelogs/unreleased/design-management-tweaks.yml
changelogs/unreleased/design-management-tweaks.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+1
-1
spec/frontend/design_management_new/components/upload/__snapshots__/design_dropzone_spec.js.snap
...ponents/upload/__snapshots__/design_dropzone_spec.js.snap
+12
-12
No files found.
app/assets/javascripts/design_management_new/components/upload/design_dropzone.vue
View file @
a7510b34
...
@@ -97,10 +97,10 @@ export default {
...
@@ -97,10 +97,10 @@ export default {
data-testid="dropzone-area"
data-testid="dropzone-area"
>
>
<gl-icon
name=
"upload"
:size=
"iconStyles.size"
:class=
"iconStyles.class"
/>
<gl-icon
name=
"upload"
:size=
"iconStyles.size"
:class=
"iconStyles.class"
/>
<p
class=
"gl-
font-weight-bold gl-
mb-0"
>
<p
class=
"gl-mb-0"
>
<gl-sprintf
:message=
"__('Drop or %
{linkStart}upload%{linkEnd}
D
esigns to attach')">
<gl-sprintf
:message=
"__('Drop or %
{linkStart}upload%{linkEnd}
d
esigns to attach')">
<template
#link
="
{ content }">
<template
#link
="
{ content }">
<gl-link
class=
"gl-font-weight-normal"
@
click.stop=
"openFileUpload"
>
<gl-link
@
click.stop=
"openFileUpload"
>
{{
content
}}
{{
content
}}
</gl-link>
</gl-link>
</
template
>
</
template
>
...
...
changelogs/unreleased/design-management-tweaks.yml
0 → 100644
View file @
a7510b34
---
title
:
Use normal font weight for Design Management dropzone text
merge_request
:
37787
author
:
type
:
changed
locale/gitlab.pot
View file @
a7510b34
...
@@ -8557,7 +8557,7 @@ msgstr ""
...
@@ -8557,7 +8557,7 @@ msgstr ""
msgid "Draft merge requests can't be merged."
msgid "Draft merge requests can't be merged."
msgstr ""
msgstr ""
msgid "Drop or %{linkStart}upload%{linkEnd}
D
esigns to attach"
msgid "Drop or %{linkStart}upload%{linkEnd}
d
esigns to attach"
msgstr ""
msgstr ""
msgid "Drop your designs to start your upload."
msgid "Drop your designs to start your upload."
...
...
spec/frontend/design_management_new/components/upload/__snapshots__/design_dropzone_spec.js.snap
View file @
a7510b34
...
@@ -18,10 +18,10 @@ exports[`Design management dropzone component when dragging renders correct temp
...
@@ -18,10 +18,10 @@ exports[`Design management dropzone component when dragging renders correct temp
/>
/>
<p
<p
class="gl-
font-weight-bold gl-
mb-0"
class="gl-mb-0"
>
>
<gl-sprintf-stub
<gl-sprintf-stub
message="Drop or %{linkStart}upload%{linkEnd}
D
esigns to attach"
message="Drop or %{linkStart}upload%{linkEnd}
d
esigns to attach"
/>
/>
</p>
</p>
</div>
</div>
...
@@ -94,10 +94,10 @@ exports[`Design management dropzone component when dragging renders correct temp
...
@@ -94,10 +94,10 @@ exports[`Design management dropzone component when dragging renders correct temp
/>
/>
<p
<p
class="gl-
font-weight-bold gl-
mb-0"
class="gl-mb-0"
>
>
<gl-sprintf-stub
<gl-sprintf-stub
message="Drop or %{linkStart}upload%{linkEnd}
D
esigns to attach"
message="Drop or %{linkStart}upload%{linkEnd}
d
esigns to attach"
/>
/>
</p>
</p>
</div>
</div>
...
@@ -170,10 +170,10 @@ exports[`Design management dropzone component when dragging renders correct temp
...
@@ -170,10 +170,10 @@ exports[`Design management dropzone component when dragging renders correct temp
/>
/>
<p
<p
class="gl-
font-weight-bold gl-
mb-0"
class="gl-mb-0"
>
>
<gl-sprintf-stub
<gl-sprintf-stub
message="Drop or %{linkStart}upload%{linkEnd}
D
esigns to attach"
message="Drop or %{linkStart}upload%{linkEnd}
d
esigns to attach"
/>
/>
</p>
</p>
</div>
</div>
...
@@ -245,10 +245,10 @@ exports[`Design management dropzone component when dragging renders correct temp
...
@@ -245,10 +245,10 @@ exports[`Design management dropzone component when dragging renders correct temp
/>
/>
<p
<p
class="gl-
font-weight-bold gl-
mb-0"
class="gl-mb-0"
>
>
<gl-sprintf-stub
<gl-sprintf-stub
message="Drop or %{linkStart}upload%{linkEnd}
D
esigns to attach"
message="Drop or %{linkStart}upload%{linkEnd}
d
esigns to attach"
/>
/>
</p>
</p>
</div>
</div>
...
@@ -320,10 +320,10 @@ exports[`Design management dropzone component when dragging renders correct temp
...
@@ -320,10 +320,10 @@ exports[`Design management dropzone component when dragging renders correct temp
/>
/>
<p
<p
class="gl-
font-weight-bold gl-
mb-0"
class="gl-mb-0"
>
>
<gl-sprintf-stub
<gl-sprintf-stub
message="Drop or %{linkStart}upload%{linkEnd}
D
esigns to attach"
message="Drop or %{linkStart}upload%{linkEnd}
d
esigns to attach"
/>
/>
</p>
</p>
</div>
</div>
...
@@ -395,10 +395,10 @@ exports[`Design management dropzone component when no slot provided renders defa
...
@@ -395,10 +395,10 @@ exports[`Design management dropzone component when no slot provided renders defa
/>
/>
<p
<p
class="gl-
font-weight-bold gl-
mb-0"
class="gl-mb-0"
>
>
<gl-sprintf-stub
<gl-sprintf-stub
message="Drop or %{linkStart}upload%{linkEnd}
D
esigns to attach"
message="Drop or %{linkStart}upload%{linkEnd}
d
esigns to attach"
/>
/>
</p>
</p>
</div>
</div>
...
...
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