diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-27 15:30:57 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-03 17:03:49 +0100 |
| commit | 655510ec9a658c28f50ccb0caea394f5db7cae59 (patch) | |
| tree | ba7d3c35c5d906ad28f2811cfb501bbc7aa0941e | |
| parent | 85582b0537c50304f30b71a0de61954b1f6c508a (diff) | |
| download | gitlab-ce-655510ec9a658c28f50ccb0caea394f5db7cae59.tar.gz | |
fixed haml lint
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/diffs/_stats.html.haml | 6 |
4 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index 9475498e176..85d720c3a69 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -731,9 +731,15 @@ GitLabDropdown = (function() { GitLabDropdown.prototype.focusTextInput = function(triggerFocus = false) { if (this.options.filterable) { this.dropdown.one('transitionend', () => { + const initialScrollTop = $(window).scrollTop(); + if (this.dropdown.is('.open')) { this.filterInput.focus(); } + + if ($(window).scrollTop() < initialScrollTop) { + $(window).scrollTop(initialScrollTop); + } }); if (triggerFocus) { diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 572203bce34..9b8176a4a90 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -574,6 +574,7 @@ .dropdown-input-field, .default-dropdown-input { + display: block; width: 100%; min-height: 30px; padding: 0 7px; diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index f9385459a66..8c8aa4c78f5 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -3,7 +3,7 @@ - can_create_note = !@diff_notes_disabled && can?(current_user, :create_note, diffs.project) - 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 - 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' diff --git a/app/views/projects/diffs/_stats.html.haml b/app/views/projects/diffs/_stats.html.haml index 4c7af37e305..307311a090f 100644 --- a/app/views/projects/diffs/_stats.html.haml +++ b/app/views/projects/diffs/_stats.html.haml @@ -20,5 +20,7 @@ = 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 .pull-right - %span.cgreen= "+#{added_lines}" - %span.cred= "-#{removed_lines}" + %span.cgreen< + +#{added_lines} + %span.cred< + \-#{removed_lines} |