summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel van Remmerden <mvanremmerden@gitlab.com>2019-05-30 13:51:45 -0600
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2019-05-31 10:53:51 -0500
commit753119acb77310d416a55f43705f2fc84cdc915d (patch)
tree43d81233b1f242f60618f2dd75dcc97c0630e971
parente4c9b43a251f56b8aea4e03b52bec0ebd9ca444e (diff)
downloadgitlab-ce-61339-Add-underline-to-attach-a-file.tar.gz
Add hover and focus state to commits editor61339-Add-underline-to-attach-a-file
-rw-r--r--app/assets/stylesheets/pages/note_form.scss9
-rw-r--r--app/views/shared/notes/_hints.html.haml5
2 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 67fef5cad64..8c7b124dd33 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -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 {
diff --git a/app/views/shared/notes/_hints.html.haml b/app/views/shared/notes/_hints.html.haml
index 46f3f8428f1..fae7d6526e8 100644
--- a/app/views/shared/notes/_hints.html.haml
+++ b/app/views/shared/notes/_hints.html.haml
@@ -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")