BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
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
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
7 deletions
+19
-7
note_form.scss
app/assets/stylesheets/pages/note_form.scss
+16
-2
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 @@
@extend
.btn-primary
;
margin
:
10px
$gl-padding
;
}
.comment-btn
{
@extend
.btn-create
;
}
.diff-file
.diff-content
{
tr
.line_holder
:hover
>
td
.line_note_link
{
opacity
:
1
.0
;
...
...
@@ -118,8 +123,8 @@
}
.discussion-reply-holder
{
background
:
$background-color
;
border-top
:
1px
solid
$border-color
;
background
-color
:
$white-light
;
padding
:
10px
16px
;
}
}
...
...
@@ -183,3 +188,12 @@
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
line_type:
line_type
}
button_tag
class:
'btn btn-nr reply-btn js-discussion-reply-button'
,
data:
data
,
title:
'Add a reply'
do
link_text
=
icon
(
'comment'
)
link_text
<<
' Reply'
end
text_field_tag
'reply-field'
,
nil
,
placeholder:
'Reply...'
,
class:
'form-control note-reply-field js-discussion-reply-button'
,
data:
data
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