diff --git a/app/assets/javascripts/shared/inline_editing.js b/app/assets/javascripts/shared/inline_editing.js index 009a38910..650ac64cc 100644 --- a/app/assets/javascripts/shared/inline_editing.js +++ b/app/assets/javascripts/shared/inline_editing.js @@ -85,6 +85,7 @@ function initInlineEditing(title) { if (inputString.disabled) { saveAllEditFields(); editBlock.dataset.editMode = 1; + $editBlock.closest('.inline_scroll_block').scrollTop(editBlock.offsetTop); inputString.disabled = false; $inputString.removeClass('hidden'); $editBlock.find('.view-mode').addClass('hidden'); diff --git a/app/assets/javascripts/sitewide/comments.js b/app/assets/javascripts/sitewide/comments.js index 2127b94a1..415fa2fef 100644 --- a/app/assets/javascripts/sitewide/comments.js +++ b/app/assets/javascripts/sitewide/comments.js @@ -76,6 +76,7 @@ var Comments = (function() { $el.find('#message').val(''); $el.find('.new-comment-button').removeClass('show'); newButton.disable = false; + $el.find('textarea').focus().blur(); }) .error((error) => { errorField.html(error.responseJSON.errors.message); diff --git a/app/assets/stylesheets/shared/comments.scss b/app/assets/stylesheets/shared/comments.scss index b321ef775..90e837e25 100644 --- a/app/assets/stylesheets/shared/comments.scss +++ b/app/assets/stylesheets/shared/comments.scss @@ -239,13 +239,16 @@ .new-comment-button { cursor: pointer; - font-size: 18px; + font-size: 14px; line-height: 18px; - margin: 8px; + margin: 4px; + padding: 4px; position: absolute; right: -36px; + text-align: center; top: 0; transition: $md-transaction; + width: 26px; &.show { right: 0; diff --git a/app/views/shared/comments/_comments.html.erb b/app/views/shared/comments/_comments.html.erb index 7168ff3ac..542a41ed5 100644 --- a/app/views/shared/comments/_comments.html.erb +++ b/app/views/shared/comments/_comments.html.erb @@ -1,6 +1,6 @@
> <% per_page = Constants::COMMENTS_SEARCH_LIMIT %> -
+
<% if comments.size == per_page %>