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
aa5bfb91
Commit
aa5bfb91
authored
May 31, 2019
by
Marcel van Remmerden
Committed by
Annabel Dunstone Gray
May 31, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add hover and focus to "Attach a file"
parent
9209736a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
17 deletions
+31
-17
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
...ts/javascripts/vue_shared/components/markdown/toolbar.vue
+13
-14
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+10
-1
app/views/shared/notes/_hints.html.haml
app/views/shared/notes/_hints.html.haml
+3
-2
changelogs/unreleased/61339-Add-underline-to-attach-a-file.yml
...elogs/unreleased/61339-Add-underline-to-attach-a-file.yml
+5
-0
No files found.
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
View file @
aa5bfb91
...
...
@@ -33,37 +33,36 @@ export default {
<div
class=
"comment-toolbar clearfix"
>
<div
class=
"toolbar-text"
>
<template
v-if=
"!hasQuickActionsDocsPath && markdownDocsPath"
>
<gl-link
:href=
"markdownDocsPath"
target=
"_blank"
tabindex=
"-1"
>
Markdown is supported
</gl-link
>
<gl-link
:href=
"markdownDocsPath"
target=
"_blank"
tabindex=
"-1"
>
Markdown is supported
</gl-link
>
</
template
>
<
template
v-if=
"hasQuickActionsDocsPath && markdownDocsPath"
>
<gl-link
:href=
"markdownDocsPath"
target=
"_blank"
tabindex=
"-1"
>
Markdown
</gl-link>
and
<gl-link
:href=
"quickActionsDocsPath"
target=
"_blank"
tabindex=
"-1"
>
quick actions
</gl-link>
<gl-link
:href=
"markdownDocsPath"
target=
"_blank"
tabindex=
"-1"
>
Markdown
</gl-link>
and
<gl-link
:href=
"quickActionsDocsPath"
target=
"_blank"
tabindex=
"-1"
>
quick actions
</gl-link>
are supported
</
template
>
</div>
<span
v-if=
"canAttachFile"
class=
"uploading-container"
>
<span
class=
"uploading-progress-container hide"
>
<i
class=
"fa fa-file-image-o toolbar-button-icon"
aria-hidden=
"true"
>
</i>
<span
class=
"attaching-file-message"
></span>
<span
class=
"uploading-progress"
>
0%
</span>
<i
class=
"fa fa-file-image-o toolbar-button-icon"
aria-hidden=
"true"
></i>
<span
class=
"attaching-file-message"
></span>
<span
class=
"uploading-progress"
>
0%
</span>
<span
class=
"uploading-spinner"
>
<i
class=
"fa fa-spinner fa-spin toolbar-button-icon"
aria-hidden=
"true"
>
</i>
<i
class=
"fa fa-spinner fa-spin toolbar-button-icon"
aria-hidden=
"true"
></i>
</span>
</span>
<span
class=
"uploading-error-container hide"
>
<span
class=
"uploading-error-icon"
>
<i
class=
"fa fa-file-image-o toolbar-button-icon"
aria-hidden=
"true"
>
</i>
<i
class=
"fa fa-file-image-o toolbar-button-icon"
aria-hidden=
"true"
></i>
</span>
<span
class=
"uploading-error-message"
></span>
<button
class=
"retry-uploading-link"
type=
"button"
>
Try again
</button>
or
<button
class=
"attach-new-file markdown-selector"
type=
"button"
>
attach a new file
</button>
</span>
<button
class=
"markdown-selector button-attach-file"
tabindex=
"-1"
type=
"button"
>
<i
class=
"fa fa-file-image-o toolbar-button-icon"
aria-hidden=
"true"
>
</i>
Attach a file
<button
class=
"markdown-selector button-attach-file btn-link"
tabindex=
"-1"
type=
"button"
>
<i
class=
"fa fa-file-image-o toolbar-button-icon"
aria-hidden=
"true"
></i
><span
class=
"text-attach-file"
>
Attach a file
</span>
</button>
<button
class=
"btn btn-default btn-sm hide button-cancel-uploading-files"
type=
"button"
>
Cancel
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
aa5bfb91
...
...
@@ -334,7 +334,7 @@ table {
.toolbar-button-icon
{
position
:
relative
;
top
:
1px
;
margin-right
:
3px
;
margin-right
:
$gl-padding-4
;
color
:
inherit
;
font-size
:
16px
;
}
...
...
@@ -461,6 +461,15 @@ table {
border
:
0
;
font-size
:
14px
;
line-height
:
16px
;
&
:hover
,
&
:focus
{
text-decoration
:
none
;
.text-attach-file
{
text-decoration
:
underline
;
}
}
}
.markdown-selector
{
...
...
app/views/shared/notes/_hints.html.haml
View file @
aa5bfb91
...
...
@@ -28,8 +28,9 @@
or
%button
.attach-new-file.markdown-selector
{
type:
'button'
}=
_
(
"attach a new file"
)
%button
.markdown-selector.button-attach-file
{
type:
'button'
,
tabindex:
'-1'
}
%button
.markdown-selector.button-attach-file
.btn-link
{
type:
'button'
,
tabindex:
'-1'
}
=
icon
(
'file-image-o'
,
class:
'toolbar-button-icon'
)
=
_
(
"Attach a file"
)
%span
.text-attach-file
<>
=
_
(
"Attach a file"
)
%button
.btn.btn-default.btn-sm.hide.button-cancel-uploading-files
{
type:
'button'
}=
_
(
"Cancel"
)
changelogs/unreleased/61339-Add-underline-to-attach-a-file.yml
0 → 100644
View file @
aa5bfb91
---
title
:
Add hover and focus to Attach a file
merge_request
:
28682
author
:
Marcel van Remmerden
type
:
fixed
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