Commit 655510ec authored by Phil Hughes's avatar Phil Hughes

fixed haml lint

parent 85582b05
...@@ -731,9 +731,15 @@ GitLabDropdown = (function() { ...@@ -731,9 +731,15 @@ GitLabDropdown = (function() {
GitLabDropdown.prototype.focusTextInput = function(triggerFocus = false) { GitLabDropdown.prototype.focusTextInput = function(triggerFocus = false) {
if (this.options.filterable) { if (this.options.filterable) {
this.dropdown.one('transitionend', () => { this.dropdown.one('transitionend', () => {
const initialScrollTop = $(window).scrollTop();
if (this.dropdown.is('.open')) { if (this.dropdown.is('.open')) {
this.filterInput.focus(); this.filterInput.focus();
} }
if ($(window).scrollTop() < initialScrollTop) {
$(window).scrollTop(initialScrollTop);
}
}); });
if (triggerFocus) { if (triggerFocus) {
......
...@@ -574,6 +574,7 @@ ...@@ -574,6 +574,7 @@
.dropdown-input-field, .dropdown-input-field,
.default-dropdown-input { .default-dropdown-input {
display: block;
width: 100%; width: 100%;
min-height: 30px; min-height: 30px;
padding: 0 7px; padding: 0 7px;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- can_create_note = !@diff_notes_disabled && can?(current_user, :create_note, diffs.project) - can_create_note = !@diff_notes_disabled && can?(current_user, :create_note, diffs.project)
- diff_files = diffs.diff_files - diff_files = diffs.diff_files
.content-block.oneline-block.files-changed .content-block.oneline-block.files-changed.diff-files-changed.js-diff-files-changed
.inline-parallel-buttons .inline-parallel-buttons
- if !diffs_expanded? && diff_files.any? { |diff_file| diff_file.collapsed? } - if !diffs_expanded? && diff_files.any? { |diff_file| diff_file.collapsed? }
= link_to 'Expand all', url_for(params.merge(expanded: 1, format: nil)), class: 'btn btn-default' = link_to 'Expand all', url_for(params.merge(expanded: 1, format: nil)), class: 'btn btn-default'
......
...@@ -20,5 +20,7 @@ ...@@ -20,5 +20,7 @@
= icon("#{diff_file_changed_icon(diff_file)} fw", class: "#{diff_file_changed_icon_color(diff_file)} append-right-5") = icon("#{diff_file_changed_icon(diff_file)} fw", class: "#{diff_file_changed_icon_color(diff_file)} append-right-5")
%span.diff-file-changes-path= diff_file.new_path %span.diff-file-changes-path= diff_file.new_path
.pull-right .pull-right
%span.cgreen= "+#{added_lines}" %span.cgreen<
%span.cred= "-#{removed_lines}" +#{added_lines}
%span.cred<
\-#{removed_lines}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment