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
0
Merge Requests
0
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
iv
gitlab-ce
Commits
b59d4e86
Commit
b59d4e86
authored
Mar 31, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change reply button to text field
parent
8419f355
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
7 deletions
+19
-7
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+16
-2
app/helpers/notes_helper.rb
app/helpers/notes_helper.rb
+3
-5
No files found.
app/assets/stylesheets/pages/note_form.scss
View file @
b59d4e86
...
@@ -5,6 +5,11 @@
...
@@ -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 @@
...
@@ -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 @@
...
@@ -183,3 +188,12 @@
float
:
left
;
float
:
left
;
}
}
}
}
.note-reply-field
{
background-color
:
$background-color
;
&
:focus
{
box-shadow
:
none
;
border-color
:
$border-color
;
}
}
app/helpers/notes_helper.rb
View file @
b59d4e86
...
@@ -69,10 +69,8 @@ module NotesHelper
...
@@ -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
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