Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
crimx committed Jun 13, 2018
2 parents cb93aad + 76c02f0 commit 403f546
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

<a name="6.3.2"></a>
## [6.3.2](https://github.com/crimx/ext-saladict/compare/v6.3.1...v6.3.2) (2018-06-13)


### Bug Fixes

* **popup:** qrcode hiding ([eec0d02](https://github.com/crimx/ext-saladict/commit/eec0d02))



<a name="6.3.1"></a>
## [6.3.1](https://github.com/crimx/ext-saladict/compare/v6.3.0...v6.3.1) (2018-06-13)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "saladict",
"version": "6.3.1",
"version": "6.3.2",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/popup/Popup.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="popup-container">
<div class="active-switch">
<svg class="icon-qrcode" @mouseenter="showQRcode" @mouseleave="currentTabUrl = ''"xmlns="http://www.w3.org/2000/svg" viewBox="0 0 612 612">
<svg class="icon-qrcode" @mouseenter="showQRcode" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 612 612">
<path d="M0 225v25h250v-25H0zM0 25h250V0H0v25z"/>
<path d="M0 250h25V0H0v250zm225 0h25V0h-25v250zM87.5 162.5h75v-75h-75v75zM362 587v25h80v-25h-80zm0-200h80v-25h-80v25z"/>
<path d="M362 612h25V362h-25v250zm190-250v25h60v-25h-60zm-77.5 87.5v25h50v-25h-50z"/>
Expand All @@ -20,7 +20,7 @@
<label for="opt-temp-active"></label>
</div>
<transition name="fade">
<div class="qrcode-panel" v-if="currentTabUrl">
<div class="qrcode-panel" v-if="currentTabUrl" @mouseleave="currentTabUrl = ''">
<qriously :value="currentTabUrl" :size="250" />
<p class="qrcode-panel-title">{{ $t('qrcode_title') }}</p>
</div>
Expand Down

0 comments on commit 403f546

Please sign in to comment.