kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Change reply button to text field

Browse source
This commit is contained in:
Annabel Dunstone 2016-03-31 10:56:22 -05:00
parent 8419f355d6
commit b59d4e861c
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/assets/stylesheets/pages/note_form.scss
View file

@ -5,6 +5,11 @@
@extend .btn-primary; @extend .btn-primary;
margin: 10px $gl-padding; margin: 10px $gl-padding;
} }
.comment-btn {
@extend .btn-create;
}
.diff-file .diff-content { .diff-file .diff-content {
tr.line_holder:hover > td .line_note_link { tr.line_holder:hover > td .line_note_link {
opacity: 1.0; opacity: 1.0;
@ -118,8 +123,8 @@
} }
.discussion-reply-holder { .discussion-reply-holder {
background: $background-color; background-color: $white-light;
border-top: 1px solid $border-color; padding: 10px 16px;
} }
} }
@ -183,3 +188,12 @@
float: left; float: left;
} }
} }
.note-reply-field {
background-color: $background-color;
&:focus {
box-shadow: none;
border-color: $border-color;
}
}

8
app/helpers/notes_helper.rb
View file

@ -69,10 +69,8 @@ module NotesHelper
line_type: line_type line_type: line_type
} }
button_tag class: 'btn btn-nr reply-btn js-discussion-reply-button', text_field_tag 'reply-field', nil, placeholder: 'Reply...',
data: data, title: 'Add a reply' do class: 'form-control note-reply-field js-discussion-reply-button',
link_text = icon('comment') data: data
link_text << ' Reply'
end
end end
end end