diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2018-09-06 14:56:08 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-06 14:56:08 +0300 |
| commit | 97b5ea02e42d8daf376fc2fc1f8bd50bb0834b3a (patch) | |
| tree | 33baacffe36dcd7d1621f647185d931892f175d0 /app | |
| parent | 2f0a0761a8e1352e74b328e5b9b9fa20057a1ac5 (diff) | |
Make MR diff file filter input Clear button functional
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/diffs/components/changed_files_dropdown.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/changed_files_dropdown.vue b/app/assets/javascripts/diffs/components/changed_files_dropdown.vue index 045688a32bf..0ec6b8b7f21 100644 --- a/app/assets/javascripts/diffs/components/changed_files_dropdown.vue +++ b/app/assets/javascripts/diffs/components/changed_files_dropdown.vue @@ -63,7 +63,7 @@ export default { v-else role="button" class="fa fa-times dropdown-input-search" - @click="clearSearch" + @click.stop.prevent="clearSearch" ></i> </div> <div class="dropdown-content"> diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 7d7143631f2..d673b59e1c0 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -749,6 +749,10 @@ left: $gl-padding; } + .dropdown-input .dropdown-input-search { + pointer-events: all; + } + .diff-changed-file { display: flex; padding-top: 8px; |