Commit 3e4df6c3 authored by Jarek Ostrowski's avatar Jarek Ostrowski

Resolve gitlab pot conflicts

Apply suggestion to app/assets/javascripts/project_find_file.js
Move branch from ce to gitlab
Revert back to original proposal for removing hidden class
Update MR number in changelog
Remove database example file
Regenerate gitlab pot
Change to boolean
Prettify
Implicit coercion
parent d2c1eb44
...@@ -116,6 +116,9 @@ export default class ProjectFindFile { ...@@ -116,6 +116,9 @@ export default class ProjectFindFile {
html = ProjectFindFile.makeHtml(filePath, matches, blobItemUrl); html = ProjectFindFile.makeHtml(filePath, matches, blobItemUrl);
results.push(this.element.find('.tree-table > tbody').append(html)); results.push(this.element.find('.tree-table > tbody').append(html));
} }
this.element.find('.empty-state').toggleClass('hidden', Boolean(results.length));
return results; return results;
} }
......
...@@ -15,4 +15,12 @@ ...@@ -15,4 +15,12 @@
.table-holder .table-holder
%table.table.files-slider{ class: "table_#{@hex_path} tree-table" } %table.table.files-slider{ class: "table_#{@hex_path} tree-table" }
%tbody %tbody
.col-12.empty-state.hidden
.svg-250.svg-content
= image_tag('illustrations/profile-page/personal-projects.svg', alt: 'No files svg', lazy: true)
.text-center
%h4
= _('There are no matching files')
%p.text-secondary
= _('Try using a different search term to find the file you are looking for.')
= spinner nil, true = spinner nil, true
---
title: Add empty state in file search
merge_request: 16851
author:
type: changed
...@@ -15611,6 +15611,9 @@ msgstr "" ...@@ -15611,6 +15611,9 @@ msgstr ""
msgid "There are no labels yet" msgid "There are no labels yet"
msgstr "" msgstr ""
msgid "There are no matching files"
msgstr ""
msgid "There are no open issues" msgid "There are no open issues"
msgstr "" msgstr ""
...@@ -16530,6 +16533,9 @@ msgstr "" ...@@ -16530,6 +16533,9 @@ msgstr ""
msgid "Try to fork again" msgid "Try to fork again"
msgstr "" msgstr ""
msgid "Try using a different search term to find the file you are looking for."
msgstr ""
msgid "Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now." msgid "Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now."
msgstr "" msgstr ""
......
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