diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-05 22:41:39 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-05 23:01:43 -0500 |
| commit | b47b6abfdb04f1f97aa9d94f948a54eb4fd3404f (patch) | |
| tree | c4abfaac6657893fc2784aee381611fe7e0c4e9e | |
| parent | 99dec8e6c25a01d208b02633f07e57e56bf7c242 (diff) | |
| download | gitlab-ce-b47b6abfdb04f1f97aa9d94f948a54eb4fd3404f.tar.gz | |
Fix squared buttons by removing not needed CSS classes
Also removes dropdown HTML where is not needed.
| -rw-r--r-- | app/assets/javascripts/notes.js | 18 | ||||
| -rw-r--r-- | app/views/projects/notes/_comment_type_button.html.haml | 2 |
2 files changed, 17 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index d595b48d301..d0b7b90b1d1 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -739,7 +739,7 @@ require('./task_list'); Notes.prototype.replyToDiscussionNote = function(e) { var form, replyLink; - form = this.formClone.clone(); + form = this.cleanForm(this.formClone.clone()); replyLink = $(e.target).closest(".js-discussion-reply-button"); // insert the form after the button replyLink @@ -863,7 +863,7 @@ require('./task_list'); } if (addForm) { - newForm = this.formClone.clone(); + newForm = this.cleanForm(this.formClone.clone()); newForm.appendTo(notesContent); // show the form return this.setupDiscussionNoteForm($link, newForm); @@ -1049,6 +1049,20 @@ require('./task_list'); }); }; + Notes.prototype.cleanForm = function($form) { + // Remove JS classes that are not needed here + $form + .find('.js-comment-type-dropdown') + .removeClass('btn-group'); + + // Remove dropdown + $form + .find('.dropdown-menu') + .remove(); + + return $form; + } + return Notes; })(); }).call(window); diff --git a/app/views/projects/notes/_comment_type_button.html.haml b/app/views/projects/notes/_comment_type_button.html.haml index e3bb15e1d15..078b606eda8 100644 --- a/app/views/projects/notes/_comment_type_button.html.haml +++ b/app/views/projects/notes/_comment_type_button.html.haml @@ -1,6 +1,6 @@ - noteable_type = @note.noteable_type -.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown +.pull-left.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown %button.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button Comment - if @note.can_be_discussion_note? |