Skip to content

Commit

Permalink
Merge branch 'develop' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
sy-records authored Mar 17, 2021
2 parents a861f6a + d6df2b8 commit 96de0c4
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 32 deletions.
72 changes: 45 additions & 27 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,47 +1,65 @@
<!-- Please use English language -->
<!-- Please don't delete this template -->
<!--
PULL REQUEST TEMPLATE
---
Please use English language
Please don't delete this template
---
Update "[ ]" to "[x]" to check a box in any list below.
---
To avoid wasting your time, it's best to open a **feature request issue** first and wait for approval before working on it.
-->

<!-- PULL REQUEST TEMPLATE -->
<!-- (Update "[ ]" to "[x]" to check a box) -->
## **Summary**

**Summary**
<!--
THIS IS REQUIRED! Please describe what the change does and why it should be merged.
-->

**What kind of change does this PR introduce?** (check at least one)
<!--
If changing the UI in any way, please provide the a **before/after** screenshot:
-->

- [ ] Bugfix
- [ ] Feature
- [ ] Code style update
- [ ] Refactor
- [ ] Docs
- [ ] Build-related changes
- [ ] Repo settings
- [ ] Other, please describe:
## **What kind of change does this PR introduce?**

If changing the UI of default theme, please provide the **before/after** screenshot:
<!--
Copy/paste one of the following options:
-->

**Does this PR introduce a breaking change?** (check one)
<!--
Bugfix
Feature
Code style update
Refactor
Docs
Build-related changes
Repo settings
Other
-->

<!--
If you chose Other, please describe.
-->

## **For any code change,**

- [ ] Related documentation has been updated if needed
- [ ] Related tests have been updated or tests have been added

## **Does this PR introduce a breaking change?** (check one)

- [ ] Yes
- [ ] No

If yes, please describe the impact and migration path for existing applications:

**The PR fulfills these requirements:**
## **Related issue, if any:**

- [ ] When resolving a specific issue, it's referenced in the PR's title (e.g. `fix #xxx[,#xxx]`, where "xxx" is the issue number)
<!-- Paste issue's link or number hashtag here. -->

You have tested in the following browsers: (Providing a detailed version will be better.)
## **Tested in the following browsers:**

- [ ] Chrome
- [ ] Firefox
- [ ] Safari
- [ ] Edge
- [ ] IE

If adding a **new feature**, the PR's description includes:

- [ ] A convincing reason for adding this feature
- [ ] Related documents have been updated
- [ ] Related tests have been updated

To avoid wasting your time, it's best to open a **feature request issue** first and wait for approval before working on it.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: npm run test:unit -- -ci --runInBand
- name: integration tests
run: npm run test:integration -- -ci --runInBand
- uses: microsoft/playwright-github-action@v1.3.0
- uses: microsoft/playwright-github-action@v1
- name: e2e tests
run: npm run test:e2e -- --ci --runInBand
- name: Upload artifacts (diff output)
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/search/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ function doSearch(value) {
$panel.innerHTML = '';

if (options.hideOtherSidebarContent) {
$sidebarNav.classList.remove('hide');
$appName.classList.remove('hide');
$sidebarNav && $sidebarNav.classList.remove('hide');
$appName && $appName.classList.remove('hide');
}

return;
Expand All @@ -160,8 +160,8 @@ function doSearch(value) {
$clearBtn.classList.add('show');
$panel.innerHTML = html || `<p class="empty">${NO_DATA_TEXT}</p>`;
if (options.hideOtherSidebarContent) {
$sidebarNav.classList.add('hide');
$appName.classList.add('hide');
$sidebarNav && $sidebarNav.classList.add('hide');
$appName && $appName.classList.add('hide');
}
}

Expand Down

0 comments on commit 96de0c4

Please sign in to comment.