Skip to content

Commit

Permalink
6.2.1 (#509)
Browse files Browse the repository at this point in the history
* close #506

* Bump lodash from 4.17.14 to 4.17.19

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.14 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.14...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

* ui fix

* code style fix

* fix #505

* v6.2.1

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Zhe Li <zlhe@microsoft.com>
  • Loading branch information
3 people committed Jul 16, 2020
1 parent bf313d0 commit 57bedac
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 50 deletions.
2 changes: 1 addition & 1 deletion manifest-chrome.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "__MSG_extName__",
"short_name": "__MSG_extShortName__",
"version": "6.2.0",
"version": "6.2.1",
"default_locale": "en",
"description": "__MSG_extDesc__",
"icons": {
Expand Down
2 changes: 1 addition & 1 deletion manifest-firefox.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "__MSG_extName__",
"short_name": "__MSG_extShortName__",
"version": "6.2.0",
"version": "6.2.1",
"default_locale": "en",
"description": "__MSG_extDesc__",
"applications": {
Expand Down
68 changes: 27 additions & 41 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"base64-loader": "^1.0.0",
"eslint": "^6.8.0",
"fork-ts-checker-webpack-plugin": "^4.1.4",
"npm-license-generator": "^1.0.0",
"npm-license-generator": "^1.0.2",
"prettier": "1.18.2",
"sass": "^1.26.5",
"ts-loader": "^6.2.2",
Expand Down
1 change: 1 addition & 0 deletions src/components/Popup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

<MenuPage
id="menu"
v-show="style.slidein || style.slideout"
v-bind:class="{ slidein: style.slidein, slideout: style.slideout }"
/>

Expand Down
7 changes: 5 additions & 2 deletions src/components/Popup/DrivePage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@
{{ i18n.account }} - {{ email }}
</div>
</div>
<div v-show="encryption.getEncryptionStatus() && backupToken">
<div
class="control-group"
v-show="encryption.getEncryptionStatus() && backupToken"
>
<label class="combo-label">{{ i18n.encrypted }}</label>
<select v-model="isEncrypted">
<select style="margin: 20px 10px;" v-model="isEncrypted">
<option value="true">{{ i18n.yes }}</option>
<option value="false">{{ i18n.no }}</option>
</select>
Expand Down
7 changes: 5 additions & 2 deletions src/components/Popup/DropboxPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@
{{ i18n.account }} - {{ email }}
</div>
</div>
<div v-show="encryption.getEncryptionStatus() && backupToken">
<div
class="control-group"
v-show="encryption.getEncryptionStatus() && backupToken"
>
<label class="combo-label">{{ i18n.encrypted }}</label>
<select v-model="isEncrypted">
<select style="margin: 20px 10px;" v-model="isEncrypted">
<option value="true">{{ i18n.yes }}</option>
<option value="false">{{ i18n.no }}</option>
</select>
Expand Down
7 changes: 5 additions & 2 deletions src/components/Popup/OneDrivePage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@
{{ i18n.account }} - {{ email }}
</div>
</div>
<div v-show="encryption.getEncryptionStatus() && backupToken">
<div
class="control-group"
v-show="encryption.getEncryptionStatus() && backupToken"
>
<label class="combo-label">{{ i18n.encrypted }}</label>
<select v-model="isEncrypted">
<select style="margin: 20px 10px;" v-model="isEncrypted">
<option value="true">{{ i18n.yes }}</option>
<option value="false">{{ i18n.no }}</option>
</select>
Expand Down

0 comments on commit 57bedac

Please sign in to comment.