From b59d4e861c5e7e9d9113afbadeef6528be321a79 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 31 Mar 2016 10:56:22 -0500
Subject: Change reply button to text field

---
 app/helpers/notes_helper.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'app/helpers/notes_helper.rb')

diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 698f90cb27a..3363001fcdb 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -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
-- 
cgit v1.2.1


From de63de18d77624d49b6a9d150f2581be0ac55e00 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 31 Mar 2016 13:37:27 -0500
Subject: Update diff colors and icons

---
 app/helpers/notes_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/helpers/notes_helper.rb')

diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 3363001fcdb..681df89836d 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -69,7 +69,8 @@ module NotesHelper
       line_type:     line_type
     }
 
-    text_field_tag 'reply-field', nil, placeholder: 'Reply...',
+    text_field_tag 'reply-field', nil,
+                    placeholder: 'Reply...',
                     class: 'form-control note-reply-field js-discussion-reply-button',
                     data: data
   end
-- 
cgit v1.2.1


From dab4ac54b691f1c832b1fe444859c3183a231411 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 1 Apr 2016 14:27:39 -0500
Subject: Diff design updates

---
 app/helpers/notes_helper.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/helpers/notes_helper.rb')

diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 681df89836d..d86954c105e 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -69,9 +69,9 @@ module NotesHelper
       line_type:     line_type
     }
 
-    text_field_tag 'reply-field', nil,
-                    placeholder: 'Reply...',
-                    class: 'form-control note-reply-field js-discussion-reply-button',
-                    data: data
+    button_tag class: 'btn btn-text-field js-discussion-reply-button',
+               data: data, title: 'Add a reply' do
+      link_text = 'Reply...'
+    end
   end
 end
-- 
cgit v1.2.1


From 6ee2069768279a9f9e03ae20f10b906a807a5eb7 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 6 Apr 2016 18:33:00 -0700
Subject: Fix lint errors

---
 app/helpers/notes_helper.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'app/helpers/notes_helper.rb')

diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index d86954c105e..95072b5373f 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -69,9 +69,7 @@ module NotesHelper
       line_type:     line_type
     }
 
-    button_tag class: 'btn btn-text-field js-discussion-reply-button',
-               data: data, title: 'Add a reply' do
-      link_text = 'Reply...'
-    end
+    button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button',
+                           data: data, title: 'Add a reply'
   end
 end
-- 
cgit v1.2.1