hash
stringlengths 40
40
| date
stringdate 2018-01-15 01:43:19
2024-04-02 15:49:23
| author
stringclasses 18
values | commit_message
stringlengths 10
72
| is_merge
bool 1
class | git_diff
stringlengths 132
6.87M
| type
stringclasses 11
values | masked_commit_message
stringlengths 4
58
|
|---|---|---|---|---|---|---|---|
88d71014dc1ab1ba0b8866ee74f29237af5d8aa4
|
2020-07-10 22:17:28
|
crimx
|
chore: add conventional commits scopes
| false
|
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4c34f5147..6cbeca04d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,5 +11,21 @@
"**/node_modules/*/**": true,
"**/build/*/**": true,
"**/assets/*/**": true
- }
+ },
+ "conventionalCommits.scopes": [
+ "audio-control",
+ "background",
+ "components",
+ "config",
+ "dicts",
+ "history",
+ "locales",
+ "notebook",
+ "options",
+ "panel",
+ "popup",
+ "selecion",
+ "sync-services",
+ "word-editor"
+ ]
}
|
chore
|
add conventional commits scopes
|
d86b5c0d053bd826a5209849eb7bb15f075de780
|
2018-05-19 16:37:49
|
CRIMX
|
fix(options): fix language code
| false
|
diff --git a/src/options/OptLanguage.vue b/src/options/OptLanguage.vue
index a8c7153a4..d23f4a66a 100644
--- a/src/options/OptLanguage.vue
+++ b/src/options/OptLanguage.vue
@@ -8,8 +8,8 @@
<label class="select-box">
<span class="select-label">{{ $t('opt:language') }}</span>
<select class="form-control" v-model="langCode">
- <option value="zh_CN">简体中文</option>
- <option value="zh_TW">繁體中文</option>
+ <option value="zh-CN">简体中文</option>
+ <option value="zh-TW">繁體中文</option>
<option value="en">English</option>
</select>
</label>
|
fix
|
fix language code
|
e99c5201aa56ebe598f0abad0d6b69a78436cb16
|
2018-09-02 21:25:05
|
CRIMX
|
refactor(components): forbid style tags and attributes
| false
|
diff --git a/src/components/dictionaries/helpers.ts b/src/components/dictionaries/helpers.ts
index c34852bac..f1c6284cc 100644
--- a/src/components/dictionaries/helpers.ts
+++ b/src/components/dictionaries/helpers.ts
@@ -30,7 +30,10 @@ export function getInnerHTMLThunk (host?: string) {
return function getInnerHTML (parent: ParentNode, selector?: string): HTMLString {
const child = selector ? parent.querySelector(selector) : parent
if (!child) { return '' }
- const content = DOMPurify.sanitize(child['innerHTML'] || '')
+ const content = DOMPurify.sanitize(child['innerHTML'] || '', {
+ FORBID_TAGS: ['style'],
+ FORBID_ATTR: ['style'],
+ })
return host
? content.replace(/href="\/[^/]/g, 'href="' + host)
: content
@@ -44,7 +47,10 @@ export function getOuterHTMLThunk (host?: string) {
return function getOuterHTML (parent: ParentNode, selector?: string): HTMLString {
const child = selector ? parent.querySelector(selector) : parent
if (!child) { return '' }
- const content = DOMPurify.sanitize(child['outerHTML'] || '')
+ const content = DOMPurify.sanitize(child['outerHTML'] || '', {
+ FORBID_TAGS: ['style'],
+ FORBID_ATTR: ['style'],
+ })
return host
? content.replace(/href="\/(?!\/)/g, 'href="' + host)
: content
|
refactor
|
forbid style tags and attributes
|
f0149c5e79d8b092ac6521b1c8b0d035d659c6a5
|
2018-09-01 18:47:19
|
CRIMX
|
refactor(content): avoid exceeding quota bytes
| false
|
diff --git a/src/content/redux/modules/widget.ts b/src/content/redux/modules/widget.ts
index 68e0a3dd0..d1a58ef01 100644
--- a/src/content/redux/modules/widget.ts
+++ b/src/content/redux/modules/widget.ts
@@ -438,16 +438,21 @@ export function startUpAction (): DispatcherThunk {
return (dispatch, getState) => {
listenTempDisable(dispatch, getState)
- createConfigIDListStream().subscribe(idlist => {
- storage.sync.get(idlist).then(obj => {
+ createConfigIDListStream().subscribe(async idlist => {
+ const profiles: Array<{ id: string, name: string }> = []
+ for (let i = 0; i < idlist.length; i++) {
+ const id = idlist[i]
+ // beware of quota bytes per item exceeds
+ const profile = (await storage.sync.get(id))[id]
if (process.env.DEV_BUILD) {
- const l = idlist.filter(id => !obj[id])
- if (l.length > 0) {
- console.error(`Update config ID List: id "${l}" not exist`)
+ if (!profile) {
+ console.error(`Update config ID List: id "${id}" not exist`)
}
}
- dispatch(updateConfigProfiles(idlist.map(id => ({ id, name: obj[id].name }))))
- })
+ profiles.push({ id, name: profile.name })
+ }
+
+ dispatch(updateConfigProfiles(profiles))
})
// close panel and word editor on esc
|
refactor
|
avoid exceeding quota bytes
|
dca805f0a6595b6dd7ef850be40a04e6323d884e
|
2019-02-23 19:50:07
|
CRIMX
|
fix(options): styling
| false
|
diff --git a/src/options/components/options/helpers.ts b/src/options/components/options/helpers.ts
index bf7496092..2e352eda3 100644
--- a/src/options/components/options/helpers.ts
+++ b/src/options/components/options/helpers.ts
@@ -23,7 +23,7 @@ export const formSubItemLayout: FormItemLayout = {
}
export const formItemModalLayout: FormItemLayout = {
- labelCol: { span: 6 },
+ labelCol: { span: 7 },
wrapperCol: { span: 17 },
}
|
fix
|
styling
|
be4815dc05cefc69b1f895ea9678a398e136eb06
|
2018-05-19 17:09:56
|
CRIMX
|
fix(panel): fix panel init on options page
| false
|
diff --git a/src/content/redux/modules/dictionaries.ts b/src/content/redux/modules/dictionaries.ts
index 3908258c1..105113317 100644
--- a/src/content/redux/modules/dictionaries.ts
+++ b/src/content/redux/modules/dictionaries.ts
@@ -254,6 +254,10 @@ export function startUpAction (): DispatcherThunk {
} else {
listenTrpleCtrl(dispatch, getState)
}
+
+ if (isSaladictOptionsPage) {
+ dispatch(searchText({ info: getDefaultSelectionInfo({ text: 'salad' }) }))
+ }
}
}
diff --git a/src/content/redux/modules/widget.ts b/src/content/redux/modules/widget.ts
index c7a070045..7bf64fe25 100644
--- a/src/content/redux/modules/widget.ts
+++ b/src/content/redux/modules/widget.ts
@@ -75,14 +75,18 @@ const _initConfig = appConfigFactory()
export const initState: WidgetState = {
widget: {
isTempDisabled: false,
- isPinned: false,
+ isPinned: isSaladictOptionsPage,
isFav: false,
shouldBowlShow: false,
isPanelAppear: false,
- shouldPanelShow: isSaladictPopupPage,
+ shouldPanelShow: isSaladictPopupPage || isSaladictOptionsPage,
panelRect: {
- x: 0,
- y: 0,
+ x: isSaladictOptionsPage
+ ? window.innerWidth - _initConfig.panelWidth - 30
+ : 0,
+ y: isSaladictOptionsPage
+ ? window.innerHeight * (1 - _initConfig.panelMaxHeightRatio) / 2
+ : 0,
width: isSaladictPopupPage
? Math.min(750, _initConfig.panelWidth)
: _initConfig.panelWidth,
@@ -151,7 +155,7 @@ export const reducer: WidgetReducer = {
y = 10
break
case TCDirection.right:
- x = window.innerWidth - panelWidth - 20
+ x = window.innerWidth - panelWidth - 30
y = window.innerHeight * 0.3
break
case TCDirection.bottom:
@@ -167,7 +171,7 @@ export const reducer: WidgetReducer = {
y = 10
break
case TCDirection.topRight:
- x = window.innerWidth - panelWidth - 20
+ x = window.innerWidth - panelWidth - 30
y = 10
break
case TCDirection.bottomLeft:
@@ -175,7 +179,7 @@ export const reducer: WidgetReducer = {
y = window.innerHeight - 10
break
case TCDirection.bottomRight:
- x = window.innerWidth - panelWidth - 20
+ x = window.innerWidth - panelWidth - 30
y = window.innerHeight - 10
break
}
@@ -627,8 +631,8 @@ function listenTempDisable (
function _restoreWidget (widget: WidgetState['widget']): Mutable<WidgetState['widget']> {
return {
...widget,
- isPinned: false,
- shouldPanelShow: isSaladictPopupPage,
+ isPinned: isSaladictOptionsPage,
+ shouldPanelShow: isSaladictPopupPage || isSaladictOptionsPage,
shouldBowlShow: false,
isPanelAppear: false,
shouldWordEditorShow: false,
|
fix
|
fix panel init on options page
|
2689e967a431e51d16438da2fd3543d41594fe4f
|
2019-09-28 16:08:20
|
crimx
|
chore: upgrade storybook
| false
|
diff --git a/yarn.lock b/yarn.lock
index 6d524580c..0c4e61ff9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -37,7 +37,47 @@
dependencies:
"@babel/highlight" "^7.0.0"
-"@babel/[email protected]", "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.4.3", "@babel/core@^7.4.5":
+"@babel/[email protected]":
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.0.tgz#9b00f73554edd67bebc86df8303ef678be3d7b48"
+ integrity sha512-FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw==
+ dependencies:
+ "@babel/code-frame" "^7.5.5"
+ "@babel/generator" "^7.6.0"
+ "@babel/helpers" "^7.6.0"
+ "@babel/parser" "^7.6.0"
+ "@babel/template" "^7.6.0"
+ "@babel/traverse" "^7.6.0"
+ "@babel/types" "^7.6.0"
+ convert-source-map "^1.1.0"
+ debug "^4.1.0"
+ json5 "^2.1.0"
+ lodash "^4.17.13"
+ resolve "^1.3.2"
+ semver "^5.4.1"
+ source-map "^0.5.0"
+
+"@babel/core@^7.0.0", "@babel/core@^7.4.5":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.2.tgz#069a776e8d5e9eefff76236bc8845566bd31dd91"
+ integrity sha512-l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==
+ dependencies:
+ "@babel/code-frame" "^7.5.5"
+ "@babel/generator" "^7.6.2"
+ "@babel/helpers" "^7.6.2"
+ "@babel/parser" "^7.6.2"
+ "@babel/template" "^7.6.0"
+ "@babel/traverse" "^7.6.2"
+ "@babel/types" "^7.6.0"
+ convert-source-map "^1.1.0"
+ debug "^4.1.0"
+ json5 "^2.1.0"
+ lodash "^4.17.13"
+ resolve "^1.3.2"
+ semver "^5.4.1"
+ source-map "^0.5.0"
+
+"@babel/core@^7.1.0", "@babel/core@^7.4.3":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz#17b2686ef0d6bc58f963dddd68ab669755582c30"
integrity sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==
@@ -57,7 +97,7 @@
semver "^5.4.1"
source-map "^0.5.0"
-"@babel/generator@^7.4.0", "@babel/generator@^7.5.5":
+"@babel/generator@^7.4.0":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz#873a7f936a3c89491b43536d12245b626664e3cf"
integrity sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==
@@ -68,6 +108,16 @@
source-map "^0.5.0"
trim-right "^1.0.1"
+"@babel/generator@^7.5.5", "@babel/generator@^7.6.0", "@babel/generator@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.2.tgz#dac8a3c2df118334c2a29ff3446da1636a8f8c03"
+ integrity sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==
+ dependencies:
+ "@babel/types" "^7.6.0"
+ jsesc "^2.5.1"
+ lodash "^4.17.13"
+ source-map "^0.5.0"
+
"@babel/helper-annotate-as-pure@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
@@ -100,10 +150,10 @@
"@babel/traverse" "^7.4.4"
"@babel/types" "^7.4.4"
-"@babel/helper-create-class-features-plugin@^7.4.4", "@babel/helper-create-class-features-plugin@^7.5.5":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz#401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"
- integrity sha512-ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg==
+"@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.6.0":
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz#769711acca889be371e9bc2eb68641d55218021f"
+ integrity sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng==
dependencies:
"@babel/helper-function-name" "^7.1.0"
"@babel/helper-member-expression-to-functions" "^7.5.5"
@@ -243,14 +293,14 @@
"@babel/traverse" "^7.1.0"
"@babel/types" "^7.2.0"
-"@babel/helpers@^7.5.5":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz#63908d2a73942229d1e6685bc2a0e730dde3b75e"
- integrity sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==
+"@babel/helpers@^7.5.5", "@babel/helpers@^7.6.0", "@babel/helpers@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz#681ffe489ea4dcc55f23ce469e58e59c1c045153"
+ integrity sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==
dependencies:
- "@babel/template" "^7.4.4"
- "@babel/traverse" "^7.5.5"
- "@babel/types" "^7.5.5"
+ "@babel/template" "^7.6.0"
+ "@babel/traverse" "^7.6.2"
+ "@babel/types" "^7.6.0"
"@babel/highlight@^7.0.0":
version "7.5.0"
@@ -261,11 +311,16 @@
esutils "^2.0.2"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.5.5":
+"@babel/parser@^7.1.0", "@babel/parser@^7.4.3":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz#02f077ac8817d3df4a832ef59de67565e71cca4b"
integrity sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==
+"@babel/parser@^7.4.4", "@babel/parser@^7.5.5", "@babel/parser@^7.6.0", "@babel/parser@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz#205e9c95e16ba3b8b96090677a67c9d6075b70a1"
+ integrity sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==
+
"@babel/plugin-proposal-async-generator-functions@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
@@ -283,12 +338,12 @@
"@babel/helper-create-class-features-plugin" "^7.5.5"
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/[email protected]":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz#de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"
- integrity sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==
+"@babel/[email protected]":
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.6.0.tgz#6659d2572a17d70abd68123e89a12a43d90aa30c"
+ integrity sha512-ZSyYw9trQI50sES6YxREXKu+4b7MAg6Qx2cvyDDYjP2Hpzd3FleOUwC9cqn1+za8d0A2ZU8SHujxFao956efUg==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.4.4"
+ "@babel/helper-create-class-features-plugin" "^7.6.0"
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-decorators" "^7.2.0"
@@ -308,7 +363,7 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-json-strings" "^7.2.0"
-"@babel/[email protected]", "@babel/plugin-proposal-object-rest-spread@^7.3.2", "@babel/plugin-proposal-object-rest-spread@^7.5.5":
+"@babel/[email protected]":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58"
integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==
@@ -316,6 +371,14 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+"@babel/plugin-proposal-object-rest-spread@^7.3.2", "@babel/plugin-proposal-object-rest-spread@^7.5.5", "@babel/plugin-proposal-object-rest-spread@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz#8ffccc8f3a6545e9f78988b6bf4fe881b88e8096"
+ integrity sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+
"@babel/plugin-proposal-optional-catch-binding@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
@@ -324,14 +387,14 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78"
- integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz#05413762894f41bfe42b9a5e80919bd575dcc802"
+ integrity sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/helper-regex" "^7.4.4"
- regexpu-core "^4.5.4"
+ regexpu-core "^4.6.0"
"@babel/plugin-syntax-async-generators@^7.2.0":
version "7.2.0"
@@ -419,10 +482,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/plugin-transform-block-scoping@^7.5.5":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz#a35f395e5402822f10d2119f6f8e045e3639a2ce"
- integrity sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==
+"@babel/plugin-transform-block-scoping@^7.5.5", "@babel/plugin-transform-block-scoping@^7.6.0", "@babel/plugin-transform-block-scoping@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz#96c33ab97a9ae500cc6f5b19e04a7e6553360a79"
+ integrity sha512-zZT8ivau9LOQQaOGC7bQLQOT4XPkPXgN2ERfUgk1X8ql+mVkLc4E8eKk+FO3o0154kxzqenWCorfmEXpEZcrSQ==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
lodash "^4.17.13"
@@ -448,21 +511,21 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/[email protected]", "@babel/plugin-transform-destructuring@^7.5.0":
- version "7.5.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz#f6c09fdfe3f94516ff074fe877db7bc9ef05855a"
- integrity sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==
+"@babel/[email protected]", "@babel/plugin-transform-destructuring@^7.5.0", "@babel/plugin-transform-destructuring@^7.6.0":
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6"
+ integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/plugin-transform-dotall-regex@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
- integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==
+"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz#44abb948b88f0199a627024e1508acaf8dc9b2f9"
+ integrity sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/helper-regex" "^7.4.4"
- regexpu-core "^4.5.4"
+ regexpu-core "^4.6.0"
"@babel/plugin-transform-duplicate-keys@^7.5.0":
version "7.5.0"
@@ -525,10 +588,10 @@
"@babel/helper-plugin-utils" "^7.0.0"
babel-plugin-dynamic-import-node "^2.3.0"
-"@babel/plugin-transform-modules-commonjs@^7.5.0":
- version "7.5.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz#425127e6045231360858eeaa47a71d75eded7a74"
- integrity sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==
+"@babel/plugin-transform-modules-commonjs@^7.5.0", "@babel/plugin-transform-modules-commonjs@^7.6.0":
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486"
+ integrity sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==
dependencies:
"@babel/helper-module-transforms" "^7.4.4"
"@babel/helper-plugin-utils" "^7.0.0"
@@ -552,12 +615,12 @@
"@babel/helper-module-transforms" "^7.1.0"
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz#9d269fd28a370258199b4294736813a60bbdd106"
- integrity sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5", "@babel/plugin-transform-named-capturing-groups-regex@^7.6.0", "@babel/plugin-transform-named-capturing-groups-regex@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.2.tgz#c1ca0bb84b94f385ca302c3932e870b0fb0e522b"
+ integrity sha512-xBdB+XOs+lgbZc2/4F5BVDVcDNS4tcSKQc96KmlqLEAwz6tpYPEvPdmDfvVG0Ssn8lAhronaRs6Z6KSexIpK5g==
dependencies:
- regexp-tree "^0.1.6"
+ regexpu-core "^4.6.0"
"@babel/plugin-transform-new-target@^7.4.4":
version "7.4.4"
@@ -591,9 +654,9 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-transform-react-constant-elements@^7.0.0", "@babel/plugin-transform-react-constant-elements@^7.2.0":
- version "7.5.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.5.0.tgz#4d6ae4033bc38f8a65dfca2b6235c44522a422fc"
- integrity sha512-c5Ba8cpybZFp1Izkf2sWGuNjOxoQ32tFgBvvYvwGhi4+9f6vGiSK9Gex4uVuO/Va6YJFu41aAh1MzMjUWkp0IQ==
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.6.0.tgz#13b8434fb817d30feebd811256eb402c9a245c9e"
+ integrity sha512-np/nPuII8DHOZWB3u8u+NSeKlEz0eBrOlnVksIQog4C9NGVzXO+NLxMcXn4Eu4GMFzOw2W6Tyo6L3+Wv8z9Y5w==
dependencies:
"@babel/helper-annotate-as-pure" "^7.0.0"
"@babel/helper-plugin-utils" "^7.0.0"
@@ -644,10 +707,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/[email protected]":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz#a6331afbfc59189d2135b2e09474457a8e3d28bc"
- integrity sha512-6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==
+"@babel/[email protected]":
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.0.tgz#85a3cce402b28586138e368fce20ab3019b9713e"
+ integrity sha512-Da8tMf7uClzwUm/pnJ1S93m/aRXmoYNDD7TkHua8xBDdaAs54uZpTWvEt6NGwmoVMb9mZbntfTqmG2oSzN/7Vg==
dependencies:
"@babel/helper-module-imports" "^7.0.0"
"@babel/helper-plugin-utils" "^7.0.0"
@@ -661,10 +724,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/plugin-transform-spread@^7.2.0":
- version "7.2.2"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
- integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==
+"@babel/plugin-transform-spread@^7.2.0", "@babel/plugin-transform-spread@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz#fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd"
+ integrity sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
@@ -691,25 +754,81 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/plugin-transform-typescript@^7.3.2":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"
- integrity sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==
+"@babel/plugin-transform-typescript@^7.3.2", "@babel/plugin-transform-typescript@^7.6.0":
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.0.tgz#48d78405f1aa856ebeea7288a48a19ed8da377a6"
+ integrity sha512-yzw7EopOOr6saONZ3KA3lpizKnWRTe+rfBqg4AmQbSow7ik7fqmzrfIqt053osLwLE2AaTqGinLM2tl6+M/uog==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.5.5"
+ "@babel/helper-create-class-features-plugin" "^7.6.0"
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-typescript" "^7.2.0"
-"@babel/plugin-transform-unicode-regex@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
- integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==
+"@babel/plugin-transform-unicode-regex@^7.4.4", "@babel/plugin-transform-unicode-regex@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz#b692aad888a7e8d8b1b214be6b9dc03d5031f698"
+ integrity sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/helper-regex" "^7.4.4"
- regexpu-core "^4.5.4"
+ regexpu-core "^4.6.0"
-"@babel/[email protected]", "@babel/preset-env@^7.4.3", "@babel/preset-env@^7.4.5":
+"@babel/[email protected]":
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.0.tgz#aae4141c506100bb2bfaa4ac2a5c12b395619e50"
+ integrity sha512-1efzxFv/TcPsNXlRhMzRnkBFMeIqBBgzwmZwlFDw5Ubj0AGLeufxugirwZmkkX/ayi3owsSqoQ4fw8LkfK9SYg==
+ dependencies:
+ "@babel/helper-module-imports" "^7.0.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
+ "@babel/plugin-proposal-dynamic-import" "^7.5.0"
+ "@babel/plugin-proposal-json-strings" "^7.2.0"
+ "@babel/plugin-proposal-object-rest-spread" "^7.5.5"
+ "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
+ "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+ "@babel/plugin-syntax-async-generators" "^7.2.0"
+ "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+ "@babel/plugin-syntax-json-strings" "^7.2.0"
+ "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+ "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
+ "@babel/plugin-transform-arrow-functions" "^7.2.0"
+ "@babel/plugin-transform-async-to-generator" "^7.5.0"
+ "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
+ "@babel/plugin-transform-block-scoping" "^7.6.0"
+ "@babel/plugin-transform-classes" "^7.5.5"
+ "@babel/plugin-transform-computed-properties" "^7.2.0"
+ "@babel/plugin-transform-destructuring" "^7.6.0"
+ "@babel/plugin-transform-dotall-regex" "^7.4.4"
+ "@babel/plugin-transform-duplicate-keys" "^7.5.0"
+ "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
+ "@babel/plugin-transform-for-of" "^7.4.4"
+ "@babel/plugin-transform-function-name" "^7.4.4"
+ "@babel/plugin-transform-literals" "^7.2.0"
+ "@babel/plugin-transform-member-expression-literals" "^7.2.0"
+ "@babel/plugin-transform-modules-amd" "^7.5.0"
+ "@babel/plugin-transform-modules-commonjs" "^7.6.0"
+ "@babel/plugin-transform-modules-systemjs" "^7.5.0"
+ "@babel/plugin-transform-modules-umd" "^7.2.0"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.0"
+ "@babel/plugin-transform-new-target" "^7.4.4"
+ "@babel/plugin-transform-object-super" "^7.5.5"
+ "@babel/plugin-transform-parameters" "^7.4.4"
+ "@babel/plugin-transform-property-literals" "^7.2.0"
+ "@babel/plugin-transform-regenerator" "^7.4.5"
+ "@babel/plugin-transform-reserved-words" "^7.2.0"
+ "@babel/plugin-transform-shorthand-properties" "^7.2.0"
+ "@babel/plugin-transform-spread" "^7.2.0"
+ "@babel/plugin-transform-sticky-regex" "^7.2.0"
+ "@babel/plugin-transform-template-literals" "^7.4.4"
+ "@babel/plugin-transform-typeof-symbol" "^7.2.0"
+ "@babel/plugin-transform-unicode-regex" "^7.4.4"
+ "@babel/types" "^7.6.0"
+ browserslist "^4.6.0"
+ core-js-compat "^3.1.1"
+ invariant "^2.2.2"
+ js-levenshtein "^1.1.3"
+ semver "^5.5.0"
+
+"@babel/preset-env@^7.4.3":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz#bc470b53acaa48df4b8db24a570d6da1fef53c9a"
integrity sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==
@@ -765,6 +884,62 @@
js-levenshtein "^1.1.3"
semver "^5.5.0"
+"@babel/preset-env@^7.4.5":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.2.tgz#abbb3ed785c7fe4220d4c82a53621d71fc0c75d3"
+ integrity sha512-Ru7+mfzy9M1/YTEtlDS8CD45jd22ngb9tXnn64DvQK3ooyqSw9K4K9DUWmYknTTVk4TqygL9dqCrZgm1HMea/Q==
+ dependencies:
+ "@babel/helper-module-imports" "^7.0.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
+ "@babel/plugin-proposal-dynamic-import" "^7.5.0"
+ "@babel/plugin-proposal-json-strings" "^7.2.0"
+ "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
+ "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
+ "@babel/plugin-proposal-unicode-property-regex" "^7.6.2"
+ "@babel/plugin-syntax-async-generators" "^7.2.0"
+ "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+ "@babel/plugin-syntax-json-strings" "^7.2.0"
+ "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+ "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
+ "@babel/plugin-transform-arrow-functions" "^7.2.0"
+ "@babel/plugin-transform-async-to-generator" "^7.5.0"
+ "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
+ "@babel/plugin-transform-block-scoping" "^7.6.2"
+ "@babel/plugin-transform-classes" "^7.5.5"
+ "@babel/plugin-transform-computed-properties" "^7.2.0"
+ "@babel/plugin-transform-destructuring" "^7.6.0"
+ "@babel/plugin-transform-dotall-regex" "^7.6.2"
+ "@babel/plugin-transform-duplicate-keys" "^7.5.0"
+ "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
+ "@babel/plugin-transform-for-of" "^7.4.4"
+ "@babel/plugin-transform-function-name" "^7.4.4"
+ "@babel/plugin-transform-literals" "^7.2.0"
+ "@babel/plugin-transform-member-expression-literals" "^7.2.0"
+ "@babel/plugin-transform-modules-amd" "^7.5.0"
+ "@babel/plugin-transform-modules-commonjs" "^7.6.0"
+ "@babel/plugin-transform-modules-systemjs" "^7.5.0"
+ "@babel/plugin-transform-modules-umd" "^7.2.0"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.2"
+ "@babel/plugin-transform-new-target" "^7.4.4"
+ "@babel/plugin-transform-object-super" "^7.5.5"
+ "@babel/plugin-transform-parameters" "^7.4.4"
+ "@babel/plugin-transform-property-literals" "^7.2.0"
+ "@babel/plugin-transform-regenerator" "^7.4.5"
+ "@babel/plugin-transform-reserved-words" "^7.2.0"
+ "@babel/plugin-transform-shorthand-properties" "^7.2.0"
+ "@babel/plugin-transform-spread" "^7.6.2"
+ "@babel/plugin-transform-sticky-regex" "^7.2.0"
+ "@babel/plugin-transform-template-literals" "^7.4.4"
+ "@babel/plugin-transform-typeof-symbol" "^7.2.0"
+ "@babel/plugin-transform-unicode-regex" "^7.6.2"
+ "@babel/types" "^7.6.0"
+ browserslist "^4.6.0"
+ core-js-compat "^3.1.1"
+ invariant "^2.2.2"
+ js-levenshtein "^1.1.3"
+ semver "^5.5.0"
+
"@babel/preset-flow@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz#afd764835d9535ec63d8c7d4caf1c06457263da2"
@@ -784,7 +959,15 @@
"@babel/plugin-transform-react-jsx-self" "^7.0.0"
"@babel/plugin-transform-react-jsx-source" "^7.0.0"
-"@babel/[email protected]", "@babel/preset-typescript@^7.3.3":
+"@babel/[email protected]":
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.6.0.tgz#25768cb8830280baf47c45ab1a519a9977498c98"
+ integrity sha512-4xKw3tTcCm0qApyT6PqM9qniseCE79xGHiUnNdKGdxNsGUc2X7WwZybqIpnTmoukg3nhPceI5KPNzNqLNeIJww==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-transform-typescript" "^7.6.0"
+
+"@babel/preset-typescript@^7.3.3":
version "7.3.3"
resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz#88669911053fa16b2b276ea2ede2ca603b3f307a"
integrity sha512-mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg==
@@ -799,14 +982,37 @@
dependencies:
regenerator-runtime "^0.12.0"
-"@babel/[email protected]", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.3", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5":
+"@babel/[email protected]":
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.0.tgz#4fc1d642a9fd0299754e8b5de62c631cf5568205"
+ integrity sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==
+ dependencies:
+ regenerator-runtime "^0.13.2"
+
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
+ integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
+ dependencies:
+ regenerator-runtime "^0.13.2"
+
+"@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"
integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==
dependencies:
regenerator-runtime "^0.13.2"
-"@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4":
+"@babel/template@^7.1.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0":
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6"
+ integrity sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ "@babel/parser" "^7.6.0"
+ "@babel/types" "^7.6.0"
+
+"@babel/template@^7.4.0":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
@@ -815,7 +1021,22 @@
"@babel/parser" "^7.4.4"
"@babel/types" "^7.4.4"
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.0", "@babel/traverse@^7.6.2":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.2.tgz#b0e2bfd401d339ce0e6c05690206d1e11502ce2c"
+ integrity sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==
+ dependencies:
+ "@babel/code-frame" "^7.5.5"
+ "@babel/generator" "^7.6.2"
+ "@babel/helper-function-name" "^7.1.0"
+ "@babel/helper-split-export-declaration" "^7.4.4"
+ "@babel/parser" "^7.6.2"
+ "@babel/types" "^7.6.0"
+ debug "^4.1.0"
+ globals "^11.1.0"
+ lodash "^4.17.13"
+
+"@babel/traverse@^7.4.3":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz#f664f8f368ed32988cd648da9f72d5ca70f165bb"
integrity sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==
@@ -830,7 +1051,16 @@
globals "^11.1.0"
lodash "^4.17.13"
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5":
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0":
+ version "7.6.1"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648"
+ integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==
+ dependencies:
+ esutils "^2.0.2"
+ lodash "^4.17.13"
+ to-fast-properties "^2.0.0"
+
+"@babel/types@^7.4.0":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz#97b9f728e182785909aa4ab56264f090a028d18a"
integrity sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==
@@ -839,6 +1069,11 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"
+"@base2/pretty-print-object@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz#860ce718b0b73f4009e153541faff2cb6b85d047"
+ integrity sha512-4Th98KlMHr5+JkxfcoDT//6vY8vM+iSPrLNpHhRyLx2CFYi8e2RfqPLdpbnpo0Q5lQC5hNB79yes07zb02fvCw==
+
"@cnakazawa/watch@^1.0.3":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -977,41 +1212,29 @@
dependencies:
find-up "^4.0.0"
-"@emotion/babel-utils@^0.6.4":
- version "0.6.10"
- resolved "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz#83dbf3dfa933fae9fc566e54fbb45f14674c6ccc"
- integrity sha512-/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow==
- dependencies:
- "@emotion/hash" "^0.6.6"
- "@emotion/memoize" "^0.6.6"
- "@emotion/serialize" "^0.9.1"
- convert-source-map "^1.5.1"
- find-root "^1.1.0"
- source-map "^0.7.2"
-
-"@emotion/cache@^10.0.15":
- version "10.0.15"
- resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.15.tgz#b81767b48015aae2689c60373992145c67b8de02"
- integrity sha512-8VthgeKhlGeTXSW1JN7I14AnAaiFPbOrqNqg3dPoGCZ3bnMjkrmRU0zrx0BtBw9esBaPaQgDB9y0tVgAGT2Mrg==
+"@emotion/cache@^10.0.17", "@emotion/cache@^10.0.9":
+ version "10.0.19"
+ resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.19.tgz#d258d94d9c707dcadaf1558def968b86bb87ad71"
+ integrity sha512-BoiLlk4vEsGBg2dAqGSJu0vJl/PgVtCYLBFJaEO8RmQzPugXewQCXZJNXTDFaRlfCs0W+quesayav4fvaif5WQ==
dependencies:
"@emotion/sheet" "0.9.3"
"@emotion/stylis" "0.8.4"
"@emotion/utils" "0.11.2"
- "@emotion/weak-memoize" "0.2.3"
+ "@emotion/weak-memoize" "0.2.4"
-"@emotion/core@^10.0.9":
- version "10.0.16"
- resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.16.tgz#e43630b65c84e31e81f34db3286eab584b08cfaa"
- integrity sha512-whbiiA7FfPreBY4BqWky2qRfAZvq+4dKQ1WNJuiYQwPCNmb0pEYDgNheSbZoNKtGTtfPaM28hBbZAKWD5EZXmQ==
+"@emotion/core@^10.0.14", "@emotion/core@^10.0.9":
+ version "10.0.17"
+ resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.17.tgz#3367376709721f4ee2068cff54ba581d362789d8"
+ integrity sha512-gykyjjr0sxzVuZBVTVK4dUmYsorc2qLhdYgSiOVK+m7WXgcYTKZevGWZ7TLAgTZvMelCTvhNq8xnf8FR1IdTbg==
dependencies:
- "@babel/runtime" "^7.4.3"
- "@emotion/cache" "^10.0.15"
+ "@babel/runtime" "^7.5.5"
+ "@emotion/cache" "^10.0.17"
"@emotion/css" "^10.0.14"
- "@emotion/serialize" "^0.11.9"
+ "@emotion/serialize" "^0.11.10"
"@emotion/sheet" "0.9.3"
"@emotion/utils" "0.11.2"
-"@emotion/css@^10.0.14":
+"@emotion/css@^10.0.14", "@emotion/css@^10.0.9":
version "10.0.14"
resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.14.tgz#95dacabdd0e22845d1a1b0b5968d9afa34011139"
integrity sha512-MozgPkBEWvorcdpqHZE5x1D/PLEHUitALQCQYt2wayf4UNhpgQs2tN0UwHYS4FMy5ROBH+0ALyCFVYJ/ywmwlg==
@@ -1020,111 +1243,76 @@
"@emotion/utils" "0.11.2"
babel-plugin-emotion "^10.0.14"
-"@emotion/[email protected]":
- version "0.7.2"
- resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.2.tgz#53211e564604beb9befa7a4400ebf8147473eeef"
- integrity sha512-RMtr1i6E8MXaBWwhXL3yeOU8JXRnz8GNxHvaUfVvwxokvayUY0zoBeWbKw1S9XkufmGEEdQd228pSZXFkAln8Q==
-
-"@emotion/hash@^0.6.2", "@emotion/hash@^0.6.6":
- version "0.6.6"
- resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44"
- integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ==
+"@emotion/[email protected]":
+ version "0.7.3"
+ resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.3.tgz#a166882c81c0c6040975dd30df24fae8549bd96f"
+ integrity sha512-14ZVlsB9akwvydAdaEnVnvqu6J2P6ySv39hYyl/aoB6w/V+bXX0tay8cF6paqbgZsN2n5Xh15uF4pE+GvE+itw==
-"@emotion/[email protected]":
- version "0.8.2"
- resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.2.tgz#b9692080da79041683021fcc32f96b40c54c59dc"
- integrity sha512-ZQIMAA2kLUWiUeMZNJDTeCwYRx1l8SQL0kHktze4COT22occKpDML1GDUXP5/sxhOMrZO8vZw773ni4H5Snrsg==
+"@emotion/[email protected]":
+ version "0.8.3"
+ resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.3.tgz#cbe62ddbea08aa022cdf72da3971570a33190d29"
+ integrity sha512-We7VBiltAJ70KQA0dWkdPMXnYoizlxOXpvtjmu5/MBnExd+u0PGgV27WCYanmLAbCwAU30Le/xA0CQs/F/Otig==
dependencies:
- "@emotion/memoize" "0.7.2"
-
-"@emotion/[email protected]":
- version "0.7.2"
- resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.2.tgz#7f4c71b7654068dfcccad29553520f984cc66b30"
- integrity sha512-hnHhwQzvPCW1QjBWFyBtsETdllOM92BfrKWbUTmh9aeOlcVOiXvlPsK4104xH8NsaKfg86PTFsWkueQeUfMA/w==
+ "@emotion/memoize" "0.7.3"
-"@emotion/memoize@^0.6.1", "@emotion/memoize@^0.6.6":
- version "0.6.6"
- resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b"
- integrity sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ==
+"@emotion/[email protected]":
+ version "0.7.3"
+ resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.3.tgz#5b6b1c11d6a6dddf1f2fc996f74cf3b219644d78"
+ integrity sha512-2Md9mH6mvo+ygq1trTeVp2uzAKwE2P7In0cRpD/M9Q70aH8L+rxMLbb3JCN2JoSWsV2O+DdFjfbbXoMoLBczow==
-"@emotion/serialize@^0.11.8", "@emotion/serialize@^0.11.9":
- version "0.11.9"
- resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.9.tgz#123e0f51d2dee9693fae1057bd7fc27b021d6868"
- integrity sha512-/Cn4V81z3ZyFiDQRw8nhGFaHkxHtmCSSBUit4vgTuLA1BqxfJUYiqSq97tq/vV8z9LfIoqs6a9v6QrUFWZpK7A==
+"@emotion/serialize@^0.11.10", "@emotion/serialize@^0.11.11", "@emotion/serialize@^0.11.8":
+ version "0.11.11"
+ resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.11.tgz#c92a5e5b358070a7242d10508143306524e842a4"
+ integrity sha512-YG8wdCqoWtuoMxhHZCTA+egL0RSGdHEc+YCsmiSBPBEDNuVeMWtjEWtGrhUterSChxzwnWBXvzSxIFQI/3sHLw==
dependencies:
- "@emotion/hash" "0.7.2"
- "@emotion/memoize" "0.7.2"
+ "@emotion/hash" "0.7.3"
+ "@emotion/memoize" "0.7.3"
"@emotion/unitless" "0.7.4"
"@emotion/utils" "0.11.2"
csstype "^2.5.7"
-"@emotion/serialize@^0.9.1":
- version "0.9.1"
- resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz#a494982a6920730dba6303eb018220a2b629c145"
- integrity sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ==
- dependencies:
- "@emotion/hash" "^0.6.6"
- "@emotion/memoize" "^0.6.6"
- "@emotion/unitless" "^0.6.7"
- "@emotion/utils" "^0.8.2"
-
"@emotion/[email protected]":
version "0.9.3"
resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.3.tgz#689f135ecf87d3c650ed0c4f5ddcbe579883564a"
integrity sha512-c3Q6V7Df7jfwSq5AzQWbXHa5soeE4F5cbqi40xn0CzXxWW9/6Mxq48WJEtqfWzbZtW9odZdnRAkwCQwN12ob4A==
-"@emotion/styled-base@^10.0.15":
- version "10.0.15"
- resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.15.tgz#481dbfa5496259c8c64923fa24dfc9f456d83218"
- integrity sha512-u1mtdoEip9uf0Wa/CrgLNFiu5pP6annTHyZGGinBisk/dRGyfq3NB7suum8HeMu26xXk7b5/qseDlrsoHq75KQ==
+"@emotion/styled-base@^10.0.17":
+ version "10.0.19"
+ resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.19.tgz#53655274797194d86453354fdb2c947b46032db6"
+ integrity sha512-Sz6GBHTbOZoeZQKvkE9gQPzaJ6/qtoQ/OPvyG2Z/6NILlYk60Es1cEcTgTkm26H8y7A0GSgp4UmXl+srvsnFPg==
dependencies:
- "@babel/runtime" "^7.4.3"
- "@emotion/is-prop-valid" "0.8.2"
- "@emotion/serialize" "^0.11.9"
+ "@babel/runtime" "^7.5.5"
+ "@emotion/is-prop-valid" "0.8.3"
+ "@emotion/serialize" "^0.11.11"
"@emotion/utils" "0.11.2"
-"@emotion/styled@^10.0.7":
- version "10.0.15"
- resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.15.tgz#bc99b968bdbf491db7bc474bb90c8fcdbe0f2f87"
- integrity sha512-vIKDo/hG741PNRpMnrJ6R8NnnjYfOBw3d6cb3yNckpjcp0NNq3ugE8/EjcYBU1Ke44nx2p00h5uzE396xOLJIg==
+"@emotion/styled@^10.0.14":
+ version "10.0.17"
+ resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.17.tgz#0cd38b8b36259541f2c6717fc22607a120623654"
+ integrity sha512-zHMgWjHDMNjD+ux64POtDnjLAObniu3znxFBLSdV/RiEhSLjHIowfvSbbd/C33/3uwtI6Uzs2KXnRZtka/PpAQ==
dependencies:
- "@emotion/styled-base" "^10.0.15"
- babel-plugin-emotion "^10.0.15"
+ "@emotion/styled-base" "^10.0.17"
+ babel-plugin-emotion "^10.0.17"
"@emotion/[email protected]":
version "0.8.4"
resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.4.tgz#6c51afdf1dd0d73666ba09d2eb6c25c220d6fe4c"
integrity sha512-TLmkCVm8f8gH0oLv+HWKiu7e8xmBIaokhxcEKPh1m8pXiV/akCiq50FvYgOwY42rjejck8nsdQxZlXZ7pmyBUQ==
-"@emotion/stylis@^0.7.0":
- version "0.7.1"
- resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5"
- integrity sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ==
-
"@emotion/[email protected]":
version "0.7.4"
resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.4.tgz#a87b4b04e5ae14a88d48ebef15015f6b7d1f5677"
integrity sha512-kBa+cDHOR9jpRJ+kcGMsysrls0leukrm68DmFQoMIWQcXdr2cZvyvypWuGYT7U+9kAExUE7+T7r6G3C3A6L8MQ==
-"@emotion/unitless@^0.6.2", "@emotion/unitless@^0.6.7":
- version "0.6.7"
- resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz#53e9f1892f725b194d5e6a1684a7b394df592397"
- integrity sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg==
-
"@emotion/[email protected]":
version "0.11.2"
resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.2.tgz#713056bfdffb396b0a14f1c8f18e7b4d0d200183"
integrity sha512-UHX2XklLl3sIaP6oiMmlVzT0J+2ATTVpf0dHQVyPJHTkOITvXfaSqnRk6mdDhV9pR8T/tHc3cex78IKXssmzrA==
-"@emotion/utils@^0.8.2":
- version "0.8.2"
- resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc"
- integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw==
-
-"@emotion/[email protected]":
- version "0.2.3"
- resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.3.tgz#dfa0c92efe44a1d1a7974fb49ffeb40ef2da5a27"
- integrity sha512-zVgvPwGK7c1aVdUVc9Qv7SqepOGRDrqCw7KZPSZziWGxSlbII3gmvGLPzLX4d0n0BMbamBacUrN22zOMyFFEkQ==
+"@emotion/[email protected]":
+ version "0.2.4"
+ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.4.tgz#622a72bebd1e3f48d921563b4b60a762295a81fc"
+ integrity sha512-6PYY5DVdAY1ifaQW6XYTnOMihmBVT27elqSjEoodchsGjzYlEsTQMcEhSud99kVawatyTZRTiVkJ/c6lwbQ7nA==
"@icons/material@^0.2.4":
version "0.2.4"
@@ -1481,20 +1669,20 @@
resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
-"@storybook/addon-actions@^5.1.9":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.1.11.tgz#ebc299b9dfe476b5c65eb5d148c4b064f682ca08"
- integrity sha512-Fp4b8cBYrl9zudvamVYTxE1XK2tzg91hgBDoVxIbDvSMZ2aQXSq8B5OFS4eSdvg+ldEOBbvIgUNS1NIw+FGntQ==
- dependencies:
- "@storybook/addons" "5.1.11"
- "@storybook/api" "5.1.11"
- "@storybook/components" "5.1.11"
- "@storybook/core-events" "5.1.11"
- "@storybook/theming" "5.1.11"
+"@storybook/[email protected]", "@storybook/addon-actions@^5.1.9":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.1.tgz#2096e7f938b289be48af6f0adfd620997e7a420c"
+ integrity sha512-tu4LGeRGAq+sLlsRPE1PzGyYU9JyM3HMLXnOCh5dvRSS8wnoDw1zQ55LPOXH6aoJGdsrvktiw+uTVf4OyN7ryg==
+ dependencies:
+ "@storybook/addons" "5.2.1"
+ "@storybook/api" "5.2.1"
+ "@storybook/client-api" "5.2.1"
+ "@storybook/components" "5.2.1"
+ "@storybook/core-events" "5.2.1"
+ "@storybook/theming" "5.2.1"
core-js "^3.0.1"
fast-deep-equal "^2.0.1"
global "^4.3.2"
- lodash "^4.17.11"
polished "^3.3.1"
prop-types "^15.7.2"
react "^16.8.3"
@@ -1502,42 +1690,43 @@
uuid "^3.3.2"
"@storybook/addon-backgrounds@^5.1.9":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-5.1.11.tgz#c1abfb2b2f8ce5bce616b811fe50afa3442a3a63"
- integrity sha512-+ORh5MEpKAYa77iHjIHjVQgdJg9SiKABm80f+fn6w/nOnWdazmkmNWwt5dVhiX5VdBWI5d/GJUmYanwSX5Dlkg==
- dependencies:
- "@storybook/addons" "5.1.11"
- "@storybook/api" "5.1.11"
- "@storybook/client-logger" "5.1.11"
- "@storybook/components" "5.1.11"
- "@storybook/core-events" "5.1.11"
- "@storybook/theming" "5.1.11"
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-5.2.1.tgz#9f705870faacbc693db7f2d3f08f739e4759026d"
+ integrity sha512-vNNqKvZ+aAf4e6szdMKIXgancu+AzeKXvHtXiAgrMd5ihKAMgDjdy7G13xMpbrYSb5V4luzDsy6pYg3Az7KvLA==
+ dependencies:
+ "@storybook/addons" "5.2.1"
+ "@storybook/api" "5.2.1"
+ "@storybook/client-logger" "5.2.1"
+ "@storybook/components" "5.2.1"
+ "@storybook/core-events" "5.2.1"
+ "@storybook/theming" "5.2.1"
core-js "^3.0.1"
memoizerific "^1.11.3"
react "^16.8.3"
util-deprecate "^1.0.2"
"@storybook/addon-contexts@^5.1.9":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/addon-contexts/-/addon-contexts-5.1.11.tgz#356bd909d1c0cb12879c3e7cf9d2ed835581f884"
- integrity sha512-1htbjhk4yu4CEEFo0Id4pbmk+G27ipTXbsg9OLfcXqh9Qe/KYgcpmTAC8Cmdun7NF8Si61FpKH/aSWx0HQx/9w==
- dependencies:
- "@storybook/addons" "5.1.11"
- "@storybook/api" "5.1.11"
- "@storybook/components" "5.1.11"
- "@storybook/core-events" "5.1.11"
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/addon-contexts/-/addon-contexts-5.2.1.tgz#525962244e33e5228c92fdccebe1eeb6f521d957"
+ integrity sha512-y1LvZWE7FLy03vMCX8wme1fy9hdU3l8K9QleSt1MqYYXtTi4DmhgD8SHoKDN/RmaS28vJQXpecOhUk5ZP920Cw==
+ dependencies:
+ "@storybook/addons" "5.2.1"
+ "@storybook/api" "5.2.1"
+ "@storybook/components" "5.2.1"
+ "@storybook/core-events" "5.2.1"
core-js "^3.0.1"
-"@storybook/addon-knobs@^5.1.9":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-5.1.11.tgz#a7e7d986b45e8addb25151b81008af1648ef1f2a"
- integrity sha512-16GY8IPxVBcmq5TqPtP6254Qw5FvdefDZjIQd+ByJJliQjXZMQKxEl6JhRq98iUfSxEB+6JCPnpKPa666jmCMA==
- dependencies:
- "@storybook/addons" "5.1.11"
- "@storybook/client-api" "5.1.11"
- "@storybook/components" "5.1.11"
- "@storybook/core-events" "5.1.11"
- "@storybook/theming" "5.1.11"
+"@storybook/[email protected]", "@storybook/addon-knobs@^5.1.9":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-5.2.1.tgz#6bc2f7e254ccce09d6f5136e9cce63cd808c9853"
+ integrity sha512-JCSqrGYyVVBNkudhvla7qc9m0/Mn1UMaMzIxH5kewEE1KWZcCkdXD5hDASN39pkn3mX1yyqveP8jiyIL9vVBLg==
+ dependencies:
+ "@storybook/addons" "5.2.1"
+ "@storybook/api" "5.2.1"
+ "@storybook/client-api" "5.2.1"
+ "@storybook/components" "5.2.1"
+ "@storybook/core-events" "5.2.1"
+ "@storybook/theming" "5.2.1"
copy-to-clipboard "^3.0.8"
core-js "^3.0.1"
escape-html "^1.0.3"
@@ -1548,30 +1737,31 @@
qs "^6.6.0"
react-color "^2.17.0"
react-lifecycles-compat "^3.0.4"
- react-select "^2.2.0"
+ react-select "^3.0.0"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.1.11.tgz#27f9cfed8d7f7c8a3fc341cdba3b0bdf608f02aa"
- integrity sha512-714Xg6pX4rjDY1urL94w4oOxIiK6jCFSp4oKvqLj7dli5CG7d34Yt9joyTgOb2pkbrgmbMWAZJq0L0iOjHzpzw==
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.1.tgz#6e52aa1fa2737e170fb675eb1fcceebd0a915a0b"
+ integrity sha512-kdx97tTKsMf/lBlT40uLYsHMF1J71mn2j41RNaCXmWw/PrKCDmiNfinemN2wtbwRSvGqb3q/BAqjKLvUtWynGg==
dependencies:
- "@storybook/api" "5.1.11"
- "@storybook/channels" "5.1.11"
- "@storybook/client-logger" "5.1.11"
+ "@storybook/api" "5.2.1"
+ "@storybook/channels" "5.2.1"
+ "@storybook/client-logger" "5.2.1"
+ "@storybook/core-events" "5.2.1"
core-js "^3.0.1"
global "^4.3.2"
util-deprecate "^1.0.2"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.1.11.tgz#71ef00285cd8602aad24cdb26c60c5d3c76631e5"
- integrity sha512-zzPZM6W67D4YKCbUN4RhC/w+/CtnH/hFbSh/QUBdwXFB1aLh2qA1UTyB8i6m6OA6JgVHBqEkl10KhmeILLv/eA==
- dependencies:
- "@storybook/channels" "5.1.11"
- "@storybook/client-logger" "5.1.11"
- "@storybook/core-events" "5.1.11"
- "@storybook/router" "5.1.11"
- "@storybook/theming" "5.1.11"
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.1.tgz#b9cd6639019e044a8ade6fb358cade79c0e3b5d3"
+ integrity sha512-EXN6sqkGHRuNq0W6BZXOlxe2I2dmN0yUdQLiUOpzH2I3mXnVHpad/0v76dRc9fZbC4LaYUSxR8lBTr0rqIb4mA==
+ dependencies:
+ "@storybook/channels" "5.2.1"
+ "@storybook/client-logger" "5.2.1"
+ "@storybook/core-events" "5.2.1"
+ "@storybook/router" "5.2.1"
+ "@storybook/theming" "5.2.1"
core-js "^3.0.1"
fast-deep-equal "^2.0.1"
global "^4.3.2"
@@ -1582,59 +1772,63 @@
semver "^6.0.0"
shallow-equal "^1.1.0"
store2 "^2.7.1"
- telejson "^2.2.1"
+ telejson "^2.2.2"
util-deprecate "^1.0.2"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.1.11.tgz#e75ab7d59ba19476eb631cdb69ee713c3b956c2b"
- integrity sha512-S7Uq7+c9kOJ9BB4H9Uro2+dVhqoMchYCipQzAkD4jIIwK99RNzGdAaRipDC1k0k/C+v2SOa+D5xBbb3XVYPSrg==
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.1.tgz#85541f926d61eedbe2a687bb394d37fc06252751"
+ integrity sha512-gmnn9qU1iLCpfF6bZuEM3QQOZsAviWeIpiezjrd/qkxatgr3qtbXd4EoZpcVuQw314etarWtNxVpcX6PXcASjQ==
dependencies:
- "@storybook/channels" "5.1.11"
- "@storybook/client-logger" "5.1.11"
+ "@storybook/channels" "5.2.1"
+ "@storybook/client-logger" "5.2.1"
core-js "^3.0.1"
global "^4.3.2"
- telejson "^2.2.1"
+ telejson "^2.2.2"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.1.11.tgz#77ddf9d777891f975ac10095772c840fed4c4620"
- integrity sha512-MlrjVGNvYOnDvv2JDRhr4wikbnZ8HCFCpVsFqKPFxj7I3OYBR417RvFkydX3Rtx4kwB9rmZEgLhfAfsSytkALg==
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.1.tgz#e5e35f6d9fb1b1fba4f18b171f31d5f6540f3bef"
+ integrity sha512-AsF/Hwx91SDOgiOGOBSWS8EJAgqVm939n2nkfdLSJQQmX5EdPRAc3EIE3f13tyQub2yNx0OR4UzQDWgjwfVsEQ==
dependencies:
core-js "^3.0.1"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.1.11.tgz#30d82c09c6c40aa70d932e77b1d1e65526bddc0c"
- integrity sha512-znzSxZ1ZCqtEKrFoW7xT8iBbdiAXaQ8RNxQFKHuYPqWX+RLol6S3duEOxu491X2SzUg0StUmrX5qL9Rnth8dRQ==
- dependencies:
- "@storybook/addons" "5.1.11"
- "@storybook/client-logger" "5.1.11"
- "@storybook/core-events" "5.1.11"
- "@storybook/router" "5.1.11"
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.1.tgz#bdd335187279a4ab45e20d6d5e9131e5f7098acf"
+ integrity sha512-VxexqxrbORCGqwx2j0/91Eu1A/vq+rSVIesWwzIowmoLfBwRwDdskO20Yn9U7iMSpux4RvHGF6y1Q1ZtnXm9aA==
+ dependencies:
+ "@storybook/addons" "5.2.1"
+ "@storybook/channel-postmessage" "5.2.1"
+ "@storybook/channels" "5.2.1"
+ "@storybook/client-logger" "5.2.1"
+ "@storybook/core-events" "5.2.1"
+ "@storybook/router" "5.2.1"
common-tags "^1.8.0"
core-js "^3.0.1"
- eventemitter3 "^3.1.0"
+ eventemitter3 "^4.0.0"
global "^4.3.2"
is-plain-object "^3.0.0"
lodash "^4.17.11"
memoizerific "^1.11.3"
qs "^6.6.0"
+ util-deprecate "^1.0.2"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.1.11.tgz#9509af3021b7a9977f9dba1f2ff038fd3c994437"
- integrity sha512-je4To+9zD3SEJsKe9R4u15N4bdXFBR7pdBToaRIur+XSvvShLFehZGseQi+4uPAj8vyG34quGTCeUC/BKY0LwQ==
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.1.tgz#5c1f122b65386f04a6ad648808dfa89f2d852d7a"
+ integrity sha512-wzxSE9t3DaLCdd/gnGFnjevmYRZ92F3TEwhUP/QDXM9cZkNsRKHkjE61qjiO5aQPaZQG6Ea9ayWEQEMgZXDucg==
dependencies:
core-js "^3.0.1"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.1.11.tgz#da253af0a8cb1b063c5c2e8016c4540c983f717d"
- integrity sha512-EQgD7HL2CWnnY968KrwUSU2dtKFGTGRJVc4vwphYEeZwAI0lX6qbTMuwEP22hDZ2OSRBxcvcXT8cvduDlZlFng==
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.1.tgz#a4519c5d435c2c25c481e2b64a768e1e568a223f"
+ integrity sha512-cik5J/mTm1b1TOI17qM+2Mikk3rjb3SbBD4WlNz3Zvn+Hw0ukgbx6kQwVBgujhMlDtsHreidyEgIg4TM13S0Tg==
dependencies:
- "@storybook/client-logger" "5.1.11"
- "@storybook/theming" "5.1.11"
+ "@storybook/client-logger" "5.2.1"
+ "@storybook/theming" "5.2.1"
+ "@types/react-syntax-highlighter" "10.1.0"
core-js "^3.0.1"
global "^4.3.2"
markdown-to-jsx "^6.9.1"
@@ -1649,39 +1843,39 @@
react-popper-tooltip "^2.8.3"
react-syntax-highlighter "^8.0.1"
react-textarea-autosize "^7.1.0"
- recompose "^0.30.0"
simplebar-react "^1.0.0-alpha.6"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.1.11.tgz#9d00503a936d30398f7a64336eb956303d053765"
- integrity sha512-m+yIFRdB47+IPBFBGS2OUXrSLkoz5iAXvb3c0lGAePf5wSR+o/Ni/9VD5l6xBf+InxHLSc9gcDEJehrT0fJAaQ==
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.1.tgz#bc28d704938d26dd544d0362d38ef08e8cfed916"
+ integrity sha512-AIYV/I+baQ0KxvEM7QAKqUedLn2os0XU9HTdtfZJTC3U9wjmR2ah2ScD6T0n7PBz3MderkvZG6dNjs9h8gRquQ==
dependencies:
core-js "^3.0.1"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.1.11.tgz#d7c4b14b02f74c183ab5baffe9b3e5ec8289b320"
- integrity sha512-LkSoAJlLEtrzFcoINX3dz4oT6xUPEHEp2/WAXLqUFeCnzJHAxIsRvbVxB49Kh/2TrgDFZpL9Or8XXMzZtE6KYw==
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.1.tgz#3aa17c6fa9b02704723501d32884453869e3c06c"
+ integrity sha512-mGGvN3GWeLxZ9lYZ4IuD1IoJD+cn6XXm2Arzw+k6KEtJJDFrC5SjESTDGLVFienX5s2tgH4FjYb9Ps9sKfhHlg==
dependencies:
"@babel/plugin-proposal-class-properties" "^7.3.3"
"@babel/plugin-proposal-object-rest-spread" "^7.3.2"
"@babel/plugin-syntax-dynamic-import" "^7.2.0"
"@babel/plugin-transform-react-constant-elements" "^7.2.0"
"@babel/preset-env" "^7.4.5"
- "@storybook/addons" "5.1.11"
- "@storybook/channel-postmessage" "5.1.11"
- "@storybook/client-api" "5.1.11"
- "@storybook/client-logger" "5.1.11"
- "@storybook/core-events" "5.1.11"
- "@storybook/node-logger" "5.1.11"
- "@storybook/router" "5.1.11"
- "@storybook/theming" "5.1.11"
- "@storybook/ui" "5.1.11"
+ "@storybook/addons" "5.2.1"
+ "@storybook/channel-postmessage" "5.2.1"
+ "@storybook/client-api" "5.2.1"
+ "@storybook/client-logger" "5.2.1"
+ "@storybook/core-events" "5.2.1"
+ "@storybook/node-logger" "5.2.1"
+ "@storybook/router" "5.2.1"
+ "@storybook/theming" "5.2.1"
+ "@storybook/ui" "5.2.1"
airbnb-js-shims "^1 || ^2"
+ ansi-to-html "^0.6.11"
autoprefixer "^9.4.9"
babel-plugin-add-react-displayname "^0.0.5"
- babel-plugin-emotion "^10.0.9"
+ babel-plugin-emotion "^10.0.14"
babel-plugin-macros "^2.4.5"
babel-preset-minify "^0.5.0 || 0.6.0-alpha.5"
boxen "^3.0.0"
@@ -1691,8 +1885,8 @@
commander "^2.19.0"
common-tags "^1.8.0"
core-js "^3.0.1"
- corejs-upgrade-webpack-plugin "^2.0.0"
- css-loader "^2.1.1"
+ corejs-upgrade-webpack-plugin "^2.2.0"
+ css-loader "^3.0.0"
detect-port "^1.3.0"
dotenv-webpack "^1.7.0"
ejs "^2.6.1"
@@ -1707,7 +1901,7 @@
interpret "^1.2.0"
ip "^1.1.5"
json5 "^2.1.0"
- lazy-universal-dotenv "^3.0.0"
+ lazy-universal-dotenv "^3.0.1"
node-fetch "^2.6.0"
open "^6.1.0"
pnp-webpack-plugin "1.4.3"
@@ -1726,16 +1920,16 @@
style-loader "^0.23.1"
terser-webpack-plugin "^1.2.4"
unfetch "^4.1.0"
- url-loader "^1.1.2"
+ url-loader "^2.0.1"
util-deprecate "^1.0.2"
webpack "^4.33.0"
webpack-dev-middleware "^3.7.0"
webpack-hot-middleware "^2.25.0"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.1.11.tgz#bbf5ad0d148e6c9a9b7cf6f62ad4df4e9fa19e5d"
- integrity sha512-LG0KM4lzb9LEffcO3Ps9FcHHsVgQUc/oG+kz3p0u9fljFoL3cJHF1Mb4o+HrSydtdWZs/spwZ/BLEo5n/AByDw==
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.2.1.tgz#00d8c0dc9dfd482e7d1d244a59c46726c6b761d9"
+ integrity sha512-rz+snXZyKwTegKEf15w4uaFWIKpgaWzTw+Ar8mxa+mX7C2DP65TOc+JGYZ7lsXdred+0WP0DhnmhGu2cX8z3lA==
dependencies:
chalk "^2.4.2"
core-js "^3.0.1"
@@ -1744,15 +1938,16 @@
regenerator-runtime "^0.12.1"
"@storybook/react@^5.1.9":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/react/-/react-5.1.11.tgz#227e13670098e52d1537daf9dc349755cea17e0c"
- integrity sha512-y8/L2OWvev3fGREhAmToLVDPf8YEZMs5+vzSdzXlVlPkqHyAmWPtLY4sRB6K+TsEF0gwaC5F2BvMnKxbNYwd/Q==
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/react/-/react-5.2.1.tgz#860970fa8f0d49967862b496af4ef3712f0b96dd"
+ integrity sha512-brUG8iK2+1Fk5VFZWpAoSokCx21MaPX1zSAVA+Z/Ia0I0sFfurhpQgAGlVePTy9r7dtEEEdniZVtJOH/tHqk4Q==
dependencies:
"@babel/plugin-transform-react-constant-elements" "^7.2.0"
"@babel/preset-flow" "^7.0.0"
"@babel/preset-react" "^7.0.0"
- "@storybook/core" "5.1.11"
- "@storybook/node-logger" "5.1.11"
+ "@storybook/addons" "5.2.1"
+ "@storybook/core" "5.2.1"
+ "@storybook/node-logger" "5.2.1"
"@svgr/webpack" "^4.0.3"
babel-plugin-add-react-displayname "^0.0.5"
babel-plugin-named-asset-import "^0.3.1"
@@ -1769,52 +1964,56 @@
semver "^6.0.0"
webpack "^4.33.0"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.1.11.tgz#75089e9e623482e52ed894c3f0cb0fc6a5372da9"
- integrity sha512-Xt7R1IOWLlIxis6VKV9G8F+e/G4G8ng1zXCqoDq+/RlWzlQJ5ccO4bUm2/XGS1rEgY4agMzmzjum18HoATpLGA==
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.1.tgz#9c49df79343d3be10c7f984858fb5c9ae3eb7491"
+ integrity sha512-Mlk275cyPoKtnP4DwQ5D8gTfnaRPL6kDZOSn0wbTMa6pQOfYKgJsa7tjzeAtZuZ/j8hKI4gAfT/auMgH6g+94A==
dependencies:
"@reach/router" "^1.2.1"
+ "@types/reach__router" "^1.2.3"
core-js "^3.0.1"
global "^4.3.2"
+ lodash "^4.17.11"
memoizerific "^1.11.3"
qs "^6.6.0"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.1.11.tgz#0d1af46535f2e601293c999a314905069a93ec3b"
- integrity sha512-PtRPfiAWx5pQbTm45yyPB+CuW/vyDmcmNOt+xnDzK52omeWaSD7XK2RfadN3u4QXCgha7zs35Ppx1htJio2NRA==
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.1.tgz#913e383632e4702035a107c2cc5e5cb27231b389"
+ integrity sha512-lbAfcyI7Tx8swduIPmlu/jdWzqTBN/v82IEQbZbPR4LS5OHRPmhXPNgFGrcH4kFAiD0GoezSsdum1x0ZZpsQUQ==
dependencies:
- "@emotion/core" "^10.0.9"
- "@emotion/styled" "^10.0.7"
- "@storybook/client-logger" "5.1.11"
+ "@emotion/core" "^10.0.14"
+ "@emotion/styled" "^10.0.14"
+ "@storybook/client-logger" "5.2.1"
common-tags "^1.8.0"
core-js "^3.0.1"
deep-object-diff "^1.1.0"
- emotion-theming "^10.0.9"
+ emotion-theming "^10.0.14"
global "^4.3.2"
memoizerific "^1.11.3"
polished "^3.3.1"
prop-types "^15.7.2"
resolve-from "^5.0.0"
-"@storybook/[email protected]":
- version "5.1.11"
- resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.1.11.tgz#02246f7656f644a36908430de12abbdf4e2a8a72"
- integrity sha512-mopuFSwtodvH4HRdaSBlgYxzYca1qyvzZ0BxOPocXhiFfFR+V9NyNJqKKRA3vinWuuZWpYcnPTu3h8skmjMirg==
- dependencies:
- "@storybook/addons" "5.1.11"
- "@storybook/api" "5.1.11"
- "@storybook/channels" "5.1.11"
- "@storybook/client-logger" "5.1.11"
- "@storybook/components" "5.1.11"
- "@storybook/core-events" "5.1.11"
- "@storybook/router" "5.1.11"
- "@storybook/theming" "5.1.11"
+"@storybook/[email protected]":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.1.tgz#ceba1657a232efd10f839027f8ae274e370c89f6"
+ integrity sha512-h6Yf1ro/nZcz4nQAU+eSVPxVmpqv7uT7RMb3Vz+VLTY59IEA/sWcoIgA4MIxwf14nVcWOqSmVBJzNKWwc+NGJw==
+ dependencies:
+ "@storybook/addon-actions" "5.2.1"
+ "@storybook/addon-knobs" "5.2.1"
+ "@storybook/addons" "5.2.1"
+ "@storybook/api" "5.2.1"
+ "@storybook/channels" "5.2.1"
+ "@storybook/client-logger" "5.2.1"
+ "@storybook/components" "5.2.1"
+ "@storybook/core-events" "5.2.1"
+ "@storybook/router" "5.2.1"
+ "@storybook/theming" "5.2.1"
copy-to-clipboard "^3.0.8"
core-js "^3.0.1"
core-js-pure "^3.0.1"
- emotion-theming "^10.0.10"
+ emotion-theming "^10.0.14"
fast-deep-equal "^2.0.1"
fuse.js "^3.4.4"
global "^4.3.2"
@@ -1826,16 +2025,15 @@
qs "^6.6.0"
react "^16.8.3"
react-dom "^16.8.3"
- react-draggable "^3.1.1"
+ react-draggable "^3.3.2"
react-helmet-async "^1.0.2"
react-hotkeys "2.0.0-pre4"
- react-resize-detector "^4.0.5"
- recompose "^0.30.0"
+ react-sizeme "^2.6.7"
regenerator-runtime "^0.13.2"
resolve-from "^5.0.0"
semver "^6.0.0"
store2 "^2.7.1"
- telejson "^2.2.1"
+ telejson "^2.2.2"
util-deprecate "^1.0.2"
"@svgr/babel-plugin-add-jsx-attribute@^4.2.0":
@@ -1858,10 +2056,10 @@
resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-4.2.0.tgz#310ec0775de808a6a2e4fd4268c245fd734c1165"
integrity sha512-U9m870Kqm0ko8beHawRXLGLvSi/ZMrl89gJ5BNcT452fAjtF2p4uRzXkdzvGJJJYBgx7BmqlDjBN/eCp5AAX2w==
-"@svgr/babel-plugin-svg-dynamic-title@^4.3.1":
- version "4.3.1"
- resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.1.tgz#646c2f5b5770c2fe318d6e51492344c3d62ddb63"
- integrity sha512-p6z6JJroP989jHWcuraeWpzdejehTmLUpyC9smhTBWyPN0VVGe2phbYxpPTV7Vh8XzmFrcG55idrnfWn/2oQEw==
+"@svgr/babel-plugin-svg-dynamic-title@^4.3.3":
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.3.tgz#2cdedd747e5b1b29ed4c241e46256aac8110dd93"
+ integrity sha512-w3Be6xUNdwgParsvxkkeZb545VhXEwjGMwExMVBIdPQJeyMQHqm9Msnb2a1teHBqUYL66qtwfhNkbj1iarCG7w==
"@svgr/babel-plugin-svg-em-dimensions@^4.2.0":
version "4.2.0"
@@ -1878,26 +2076,26 @@
resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-4.2.0.tgz#5f1e2f886b2c85c67e76da42f0f6be1b1767b697"
integrity sha512-hYfYuZhQPCBVotABsXKSCfel2slf/yvJY8heTVX1PCTaq/IgASq1IyxPPKJ0chWREEKewIU/JMSsIGBtK1KKxw==
-"@svgr/babel-preset@^4.3.1":
- version "4.3.1"
- resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-4.3.1.tgz#62ffcb85d756580e8ce608e9d2ac3b9063be9e28"
- integrity sha512-rPFKLmyhlh6oeBv3j2vEAj2nd2QbWqpoJLKzBLjwQVt+d9aeXajVaPNEqrES2spjXKR4OxfgSs7U0NtmAEkr0Q==
+"@svgr/babel-preset@^4.3.3":
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-4.3.3.tgz#a75d8c2f202ac0e5774e6bfc165d028b39a1316c"
+ integrity sha512-6PG80tdz4eAlYUN3g5GZiUjg2FMcp+Wn6rtnz5WJG9ITGEF1pmFdzq02597Hn0OmnQuCVaBYQE1OVFAnwOl+0A==
dependencies:
"@svgr/babel-plugin-add-jsx-attribute" "^4.2.0"
"@svgr/babel-plugin-remove-jsx-attribute" "^4.2.0"
"@svgr/babel-plugin-remove-jsx-empty-expression" "^4.2.0"
"@svgr/babel-plugin-replace-jsx-attribute-value" "^4.2.0"
- "@svgr/babel-plugin-svg-dynamic-title" "^4.3.1"
+ "@svgr/babel-plugin-svg-dynamic-title" "^4.3.3"
"@svgr/babel-plugin-svg-em-dimensions" "^4.2.0"
"@svgr/babel-plugin-transform-react-native-svg" "^4.2.0"
"@svgr/babel-plugin-transform-svg-component" "^4.2.0"
-"@svgr/core@^4.3.2":
- version "4.3.2"
- resolved "https://registry.yarnpkg.com/@svgr/core/-/core-4.3.2.tgz#939c89be670ad79b762f4c063f213f0e02535f2e"
- integrity sha512-N+tP5CLFd1hP9RpO83QJPZY3NL8AtrdqNbuhRgBkjE/49RnMrrRsFm1wY8pueUfAGvzn6tSXUq29o6ah8RuR5w==
+"@svgr/core@^4.3.3":
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/@svgr/core/-/core-4.3.3.tgz#b37b89d5b757dc66e8c74156d00c368338d24293"
+ integrity sha512-qNuGF1QON1626UCaZamWt5yedpgOytvLj5BQZe2j1k1B8DUG4OyugZyfEwBeXozCUwhLEpsrgPrE+eCu4fY17w==
dependencies:
- "@svgr/plugin-jsx" "^4.3.2"
+ "@svgr/plugin-jsx" "^4.3.3"
camelcase "^5.3.1"
cosmiconfig "^5.2.1"
@@ -1908,13 +2106,13 @@
dependencies:
"@babel/types" "^7.4.4"
-"@svgr/plugin-jsx@^4.3.2":
- version "4.3.2"
- resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-4.3.2.tgz#ce9ddafc8cdd74da884c9f7af014afcf37f93d3c"
- integrity sha512-+1GW32RvmNmCsOkMoclA/TppNjHPLMnNZG3/Ecscxawp051XJ2MkO09Hn11VcotdC2EPrDfT8pELGRo+kbZ1Eg==
+"@svgr/plugin-jsx@^4.3.3":
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-4.3.3.tgz#e2ba913dbdfbe85252a34db101abc7ebd50992fa"
+ integrity sha512-cLOCSpNWQnDB1/v+SUENHH7a0XY09bfuMKdq9+gYvtuwzC2rU4I0wKGFEp1i24holdQdwodCtDQdFtJiTCWc+w==
dependencies:
"@babel/core" "^7.4.5"
- "@svgr/babel-preset" "^4.3.1"
+ "@svgr/babel-preset" "^4.3.3"
"@svgr/hast-util-to-babel-ast" "^4.3.2"
svg-parser "^2.0.0"
@@ -1928,16 +2126,16 @@
svgo "^1.2.2"
"@svgr/webpack@^4.0.3":
- version "4.3.2"
- resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.2.tgz#319d4471c8f3d5c3af35059274834d9b5b8fb956"
- integrity sha512-F3VE5OvyOWBEd2bF7BdtFRyI6E9it3mN7teDw0JQTlVtc4HZEYiiLSl+Uf9Uub6IYHVGc+qIrxxDyeedkQru2w==
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.3.tgz#13cc2423bf3dff2d494f16b17eb7eacb86895017"
+ integrity sha512-bjnWolZ6KVsHhgyCoYRFmbd26p8XVbulCzSG53BDQqAr+JOAderYK7CuYrB3bDjHJuF6LJ7Wrr42+goLRV9qIg==
dependencies:
"@babel/core" "^7.4.5"
"@babel/plugin-transform-react-constant-elements" "^7.0.0"
"@babel/preset-env" "^7.4.5"
"@babel/preset-react" "^7.0.0"
- "@svgr/core" "^4.3.2"
- "@svgr/plugin-jsx" "^4.3.2"
+ "@svgr/core" "^4.3.3"
+ "@svgr/plugin-jsx" "^4.3.3"
"@svgr/plugin-svgo" "^4.3.1"
loader-utils "^1.2.3"
@@ -2027,6 +2225,11 @@
"@types/minimatch" "*"
"@types/node" "*"
+"@types/history@*":
+ version "4.7.3"
+ resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.3.tgz#856c99cdc1551d22c22b18b5402719affec9839a"
+ integrity sha512-cS5owqtwzLN5kY+l+KgKdRJ/Cee8tlmQoGQuIE9tWnSmS3JMKzmxo2HIAk2wODMifGwO20d62xZQLYz+RLfXmw==
+
"@types/hoist-non-react-statics@^3.3.0":
version "3.3.1"
resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
@@ -2112,6 +2315,14 @@
resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
+"@types/reach__router@^1.2.3":
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.2.5.tgz#add874f43b9733175be2b19de59602b91cc90860"
+ integrity sha512-Lna9cD38dN3deqJ6ThZgMKoAzW1LE3u+uUbPGdHUqquoM/fnZitSV1xfJxHjovu4SsNkpN9udkte3wEyrBPawQ==
+ dependencies:
+ "@types/history" "*"
+ "@types/react" "*"
+
"@types/react-dom@^16.8.4":
version "16.9.0"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.0.tgz#ba6ddb00bf5de700b0eb91daa452081ffccbfdea"
@@ -2143,6 +2354,13 @@
dependencies:
"@types/react" "*"
+"@types/[email protected]":
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-10.1.0.tgz#9c534e29bbe05dba9beae1234f3ae944836685d4"
+ integrity sha512-dF49hC4FZp1dIKyzacOrHvqMUe8U2IXyQCQXOcT1e6n64gLBp+xM6qGtPsThIT9XjiIHSg2W5Jc2V5IqekBfnA==
+ dependencies:
+ "@types/react" "*"
+
"@types/react-textarea-autosize@^4.3.4":
version "4.3.4"
resolved "https://registry.yarnpkg.com/@types/react-textarea-autosize/-/react-textarea-autosize-4.3.4.tgz#9a93f751c91ad5e86387bce75e3b7e11ed195813"
@@ -2524,12 +2742,7 @@ add-dom-event-listener@^1.1.0:
dependencies:
object-assign "4.x"
[email protected]:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/address/-/address-1.1.0.tgz#ef8e047847fcd2c5b6f50c16965f924fd99fe709"
- integrity sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ==
-
-address@^1.0.1:
[email protected], address@^1.0.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
@@ -2631,6 +2844,13 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
dependencies:
color-convert "^1.9.0"
+ansi-to-html@^0.6.11:
+ version "0.6.11"
+ resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.11.tgz#5093fc4962186c0e9343dec572a4f71abdc93439"
+ integrity sha512-88XZtrcwrfkyn6fGstHnkaF1kl7hGtNCYh4vSmItgEV+6JnQHryDBf7udF4f2RhTRQmYvJvPcTtqgaqrxzc9oA==
+ dependencies:
+ entities "^1.1.1"
+
antd@^3.23.1:
version "3.23.1"
resolved "https://registry.yarnpkg.com/antd/-/antd-3.23.1.tgz#a251b0cdc2072a91a8c157f8b31de8ad92ce5d18"
@@ -2771,11 +2991,6 @@ array-equal@^1.0.0:
resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
-array-filter@~0.0.0:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
- integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
-
array-find-index@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -2809,16 +3024,6 @@ array-includes@^3.0.3:
define-properties "^1.1.2"
es-abstract "^1.7.0"
-array-map@~0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
- integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
-
-array-reduce@~0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
- integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
-
array-tree-filter@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz#873ac00fec83749f255ac8dd083814b4f6329190"
@@ -3100,15 +3305,15 @@ [email protected], babel-plugin-dynamic-import-node@^2.3.0:
dependencies:
object.assign "^4.1.0"
-babel-plugin-emotion@^10.0.14, babel-plugin-emotion@^10.0.15, babel-plugin-emotion@^10.0.9:
- version "10.0.16"
- resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.16.tgz#cb306798058b102a634ca80e69b012caa345bb09"
- integrity sha512-a01Xrourr/VRpw4KicX9drDwfVGHmw8HmlQk++N4fv0j73EfHKWC1Ah4Vu8s1cTGVvTiwum+UhVpJenV8j03FQ==
+babel-plugin-emotion@^10.0.14, babel-plugin-emotion@^10.0.17:
+ version "10.0.19"
+ resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.19.tgz#67b9b213f7505c015f163a387a005c12c502b1de"
+ integrity sha512-1pJb5uKN/gx6bi3gGr588Krj49sxARI9KmxhtMUa+NRJb6lR3OfC51mh3NlWRsOqdjWlT4cSjnZpnFq5K3T5ZA==
dependencies:
"@babel/helper-module-imports" "^7.0.0"
- "@emotion/hash" "0.7.2"
- "@emotion/memoize" "0.7.2"
- "@emotion/serialize" "^0.11.9"
+ "@emotion/hash" "0.7.3"
+ "@emotion/memoize" "0.7.3"
+ "@emotion/serialize" "^0.11.11"
babel-plugin-macros "^2.0.0"
babel-plugin-syntax-jsx "^6.18.0"
convert-source-map "^1.5.0"
@@ -3116,24 +3321,6 @@ babel-plugin-emotion@^10.0.14, babel-plugin-emotion@^10.0.15, babel-plugin-emoti
find-root "^1.1.0"
source-map "^0.5.7"
-babel-plugin-emotion@^9.2.11:
- version "9.2.11"
- resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz#319c005a9ee1d15bb447f59fe504c35fd5807728"
- integrity sha512-dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ==
- dependencies:
- "@babel/helper-module-imports" "^7.0.0"
- "@emotion/babel-utils" "^0.6.4"
- "@emotion/hash" "^0.6.2"
- "@emotion/memoize" "^0.6.1"
- "@emotion/stylis" "^0.7.0"
- babel-plugin-macros "^2.0.0"
- babel-plugin-syntax-jsx "^6.18.0"
- convert-source-map "^1.5.0"
- find-root "^1.1.0"
- mkdirp "^0.5.1"
- source-map "^0.5.7"
- touch "^2.0.1"
-
babel-plugin-import@^1.12.1:
version "1.12.1"
resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.12.1.tgz#a63b0a6f8f7484db660c59665185aa3b0c2f9f3f"
@@ -3245,9 +3432,9 @@ babel-plugin-minify-type-constructors@^0.4.3:
babel-helper-is-void-0 "^0.4.3"
babel-plugin-named-asset-import@^0.3.1:
- version "0.3.3"
- resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.3.tgz#9ba2f3ac4dc78b042651654f07e847adfe50667c"
- integrity sha512-1XDRysF4894BUdMChT+2HHbtJYiO7zx5Be7U6bT8dISy7OdyETMGIAQBMPQCsY1YRf0xcubwnKKaDr5bk15JTA==
+ version "0.3.4"
+ resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.4.tgz#4a8fc30e9a3e2b1f5ed36883386ab2d84e1089bd"
+ integrity sha512-S6d+tEzc5Af1tKIMbsf2QirCcPdQ+mKUCY2H1nJj1DyA1ShwpsoxEOAwbWsG5gcXNV/olpvQd9vrUWRx4bnhpw==
babel-plugin-react-docgen@^3.0.0:
version "3.1.0"
@@ -3374,23 +3561,23 @@ babel-preset-jest@^24.9.0:
lodash "^4.17.11"
babel-preset-react-app@^9.0.0:
- version "9.0.1"
- resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.0.1.tgz#16a2cf84363045b530b6a03460527a5c6eac42ba"
- integrity sha512-v7MeY+QxdBhM9oU5uOQCIHLsErYkEbbjctXsb10II+KAnttbe0rvprvP785dRxfa9dI4ZbsGXsRU07Qdi5BtOw==
+ version "9.0.2"
+ resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.0.2.tgz#247d37e883d6d6f4b4691e5f23711bb2dd80567d"
+ integrity sha512-aXD+CTH8Chn8sNJr4tO/trWKqe5sSE4hdO76j9fhVezJSzmpWYWUSc5JoPmdSxADwef5kQFNGKXd433vvkd2VQ==
dependencies:
- "@babel/core" "7.5.5"
+ "@babel/core" "7.6.0"
"@babel/plugin-proposal-class-properties" "7.5.5"
- "@babel/plugin-proposal-decorators" "7.4.4"
+ "@babel/plugin-proposal-decorators" "7.6.0"
"@babel/plugin-proposal-object-rest-spread" "7.5.5"
"@babel/plugin-syntax-dynamic-import" "7.2.0"
- "@babel/plugin-transform-destructuring" "7.5.0"
+ "@babel/plugin-transform-destructuring" "7.6.0"
"@babel/plugin-transform-flow-strip-types" "7.4.4"
"@babel/plugin-transform-react-display-name" "7.2.0"
- "@babel/plugin-transform-runtime" "7.5.5"
- "@babel/preset-env" "7.5.5"
+ "@babel/plugin-transform-runtime" "7.6.0"
+ "@babel/preset-env" "7.6.0"
"@babel/preset-react" "7.0.0"
- "@babel/preset-typescript" "7.3.3"
- "@babel/runtime" "7.5.5"
+ "@babel/preset-typescript" "7.6.0"
+ "@babel/runtime" "7.6.0"
babel-plugin-dynamic-import-node "2.3.0"
babel-plugin-macros "2.6.1"
babel-plugin-transform-react-remove-prop-types "0.4.24"
@@ -3426,6 +3613,11 @@ base@^0.11.1:
mixin-deep "^1.2.0"
pascalcase "^0.1.1"
+batch-processor@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8"
+ integrity sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg=
+
[email protected]:
version "0.6.1"
resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -3636,14 +3828,14 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
[email protected], browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6.6:
- version "4.6.6"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz#6e4bf467cde520bc9dbdf3747dafa03531cec453"
- integrity sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==
[email protected], browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6.6:
+ version "4.7.0"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17"
+ integrity sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==
dependencies:
- caniuse-lite "^1.0.30000984"
- electron-to-chromium "^1.3.191"
- node-releases "^1.1.25"
+ caniuse-lite "^1.0.30000989"
+ electron-to-chromium "^1.3.247"
+ node-releases "^1.1.29"
bser@^2.0.0:
version "2.1.0"
@@ -3844,10 +4036,10 @@ can-use-dom@^0.1.0:
resolved "https://registry.yarnpkg.com/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a"
integrity sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=
-caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000984:
- version "1.0.30000989"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9"
- integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==
+caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000989:
+ version "1.0.30000997"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000997.tgz#ba44a606804f8680894b7042612c2c7f65685b7e"
+ integrity sha512-BQLFPIdj2ntgBNWp9Q64LGUIEmvhKkzzHhUHR3CD5A9Lb7ZKF20/+sgadhFap69lk5XmK1fTUleDclaRFvgVUA==
capture-exit@^2.0.0:
version "2.0.0"
@@ -3895,11 +4087,6 @@ chalk@^1.1.1, chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
-change-emitter@^0.1.2:
- version "0.1.6"
- resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
- integrity sha1-6LL+PX8at9aaMhma/5HqaTFAlRU=
-
character-entities-legacy@^1.0.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz#3c729991d9293da0ede6dddcaf1f2ce1009ee8b4"
@@ -3945,9 +4132,9 @@ chokidar@^2.0.2, chokidar@^2.0.4, chokidar@^2.1.6:
fsevents "^1.2.7"
chownr@^1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
- integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
+ integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
chrome-trace-event@^1.0.2:
version "1.0.2"
@@ -4134,9 +4321,9 @@ [email protected]:
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
colors@^1.1.2:
- version "1.3.3"
- resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
- integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+ integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
combined-stream@^1.0.6, combined-stream@~1.0.6:
version "1.0.8"
@@ -4512,7 +4699,7 @@ [email protected]:
meow "^4.0.0"
q "^1.5.1"
-convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
+convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
@@ -4604,7 +4791,7 @@ [email protected], core-util-is@~1.0.0:
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-corejs-upgrade-webpack-plugin@^2.0.0:
+corejs-upgrade-webpack-plugin@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/corejs-upgrade-webpack-plugin/-/corejs-upgrade-webpack-plugin-2.2.0.tgz#503293bf1fdcb104918eb40d0294e4776ad6923a"
integrity sha512-J0QMp9GNoiw91Kj/dkIQFZeiCXgXoja/Wlht1SPybxerBWh4NCmb0pOgCv61lrlQZETwvVVfAFAA3IqoEO9aqQ==
@@ -4645,19 +4832,6 @@ create-ecdh@^4.0.0:
bn.js "^4.1.0"
elliptic "^6.0.0"
-create-emotion@^9.2.12:
- version "9.2.12"
- resolved "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.12.tgz#0fc8e7f92c4f8bb924b0fef6781f66b1d07cb26f"
- integrity sha512-P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA==
- dependencies:
- "@emotion/hash" "^0.6.2"
- "@emotion/memoize" "^0.6.1"
- "@emotion/stylis" "^0.7.0"
- "@emotion/unitless" "^0.6.2"
- csstype "^2.5.2"
- stylis "^3.5.0"
- stylis-rule-sheet "^0.0.10"
-
create-hash@^1.1.0, create-hash@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
@@ -4797,6 +4971,24 @@ css-loader@^2.1.1:
postcss-value-parser "^3.3.0"
schema-utils "^1.0.0"
+css-loader@^3.0.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.2.0.tgz#bb570d89c194f763627fcf1f80059c6832d009b2"
+ integrity sha512-QTF3Ud5H7DaZotgdcJjGMvyDj5F3Pn1j/sC6VBEOVp94cbwqyIBdcs/quzj4MC1BKQSrTpQznegH/5giYbhnCQ==
+ dependencies:
+ camelcase "^5.3.1"
+ cssesc "^3.0.0"
+ icss-utils "^4.1.1"
+ loader-utils "^1.2.3"
+ normalize-path "^3.0.0"
+ postcss "^7.0.17"
+ postcss-modules-extract-imports "^2.0.0"
+ postcss-modules-local-by-default "^3.0.2"
+ postcss-modules-scope "^2.1.0"
+ postcss-modules-values "^3.0.0"
+ postcss-value-parser "^4.0.0"
+ schema-utils "^2.0.0"
+
css-select-base-adapter@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
@@ -4875,7 +5067,7 @@ cssstyle@^1.0.0:
dependencies:
cssom "0.3.x"
-csstype@^2.2.0, csstype@^2.5.2, csstype@^2.5.5, csstype@^2.5.7:
+csstype@^2.2.0, csstype@^2.5.5, csstype@^2.5.7:
version "2.6.6"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.6.tgz#c34f8226a94bbb10c32cc0d714afdf942291fc41"
integrity sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg==
@@ -4887,10 +5079,10 @@ currently-unhandled@^0.4.1:
dependencies:
array-find-index "^1.0.1"
-cyclist@~0.2.2:
- version "0.2.2"
- resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
- integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
+cyclist@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+ integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
[email protected], cz-conventional-changelog@^2.1.0:
version "2.1.0"
@@ -5443,19 +5635,26 @@ [email protected]:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
ejs@^2.6.1:
- version "2.6.2"
- resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6"
- integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.1.tgz#5b5ab57f718b79d4aca9254457afecd36fa80228"
+ integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==
-electron-to-chromium@^1.3.191:
- version "1.3.241"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.241.tgz#859dc49ab7f90773ed698767372d384190f60cb1"
- integrity sha512-Gb9E6nWZlbgjDDNe5cAvMJixtn79krNJ70EDpq/M10lkGo7PGtBUe7Y0CYVHsBScRwi6ybCS+YetXAN9ysAHDg==
+electron-to-chromium@^1.3.247:
+ version "1.3.267"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.267.tgz#7745ff9d447fd2a9802e1c6dfa518631e0cf5357"
+ integrity sha512-9Q2ixAJC+oHjWNtJV0MQ4vJMCWSowIrC6V6vcr+bwPddTDHj2ddv9xxXCzf4jT/fy6HP7maPoW0gifXkRxCttQ==
+
+element-resize-detector@^1.1.15:
+ version "1.1.15"
+ resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.1.15.tgz#48eba1a2eaa26969a4c998d972171128c971d8d2"
+ integrity sha512-16/5avDegXlUxytGgaumhjyQoM6hpp5j3+L79sYq5hlXfTNRy5WMMuTVWkZU3egp/CokCmTmvf18P3KeB57Iog==
+ dependencies:
+ batch-processor "^1.0.0"
elliptic@^6.0.0:
- version "6.5.0"
- resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.0.tgz#2b8ed4c891b7de3200e14412a5b8248c7af505ca"
- integrity sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==
+ version "6.5.1"
+ resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz#c380f5f909bf1b9b4428d028cd18d3b0efd6b52b"
+ integrity sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==
dependencies:
bn.js "^4.4.0"
brorand "^1.0.1"
@@ -5475,23 +5674,15 @@ emojis-list@^2.0.0:
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-emotion-theming@^10.0.10, emotion-theming@^10.0.9:
- version "10.0.14"
- resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.0.14.tgz#e548d388493d07bedbb0d9d3bbe221766174b1f4"
- integrity sha512-zMGhPSYz48AAR6DYjQVaZHeO42cYKPq4VyB1XjxzgR62/NmO99679fx8qDDB1QZVYGkRWZtsOe+zJE/e30XdbA==
+emotion-theming@^10.0.14:
+ version "10.0.19"
+ resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.0.19.tgz#66d13db74fccaefad71ba57c915b306cf2250295"
+ integrity sha512-dQRBPLAAQ6eA8JKhkLCIWC8fdjPbiNC1zNTdFF292h9amhZXofcNGUP7axHoHX4XesqQESYwZrXp53OPInMrKw==
dependencies:
- "@babel/runtime" "^7.4.3"
- "@emotion/weak-memoize" "0.2.3"
+ "@babel/runtime" "^7.5.5"
+ "@emotion/weak-memoize" "0.2.4"
hoist-non-react-statics "^3.3.0"
-emotion@^9.1.2:
- version "9.2.12"
- resolved "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz#53925aaa005614e65c6e43db8243c843574d1ea9"
- integrity sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ==
- dependencies:
- babel-plugin-emotion "^9.2.11"
- create-emotion "^9.2.12"
-
encodeurl@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -5504,7 +5695,14 @@ encoding@^0.1.11:
dependencies:
iconv-lite "~0.4.13"
-end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+ version "1.4.4"
+ resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+ integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+ dependencies:
+ once "^1.4.0"
+
+end-of-stream@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
@@ -5557,16 +5755,20 @@ error-stack-parser@^2.0.1:
stackframe "^1.0.4"
es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.13.0, es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.7.0:
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
- integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+ version "1.14.2"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.14.2.tgz#7ce108fad83068c8783c3cdf62e504e084d8c497"
+ integrity sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==
dependencies:
es-to-primitive "^1.2.0"
function-bind "^1.1.1"
has "^1.0.3"
+ has-symbols "^1.0.0"
is-callable "^1.1.4"
is-regex "^1.0.4"
- object-keys "^1.0.12"
+ object-inspect "^1.6.0"
+ object-keys "^1.1.1"
+ string.prototype.trimleft "^2.0.0"
+ string.prototype.trimright "^2.0.0"
es-to-primitive@^1.2.0:
version "1.2.0"
@@ -5871,11 +6073,16 @@ etag@~1.8.1:
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
-eventemitter3@^3.0.0, eventemitter3@^3.1.0:
+eventemitter3@^3.0.0:
version "3.1.2"
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
+eventemitter3@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
+ integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+
[email protected]:
version "0.0.1"
resolved "https://registry.yarnpkg.com/eventlistener/-/eventlistener-0.0.1.tgz#ed2baabb852227af2bcf889152c72c63ca532eb8"
@@ -6152,7 +6359,7 @@ fb-watchman@^2.0.0:
dependencies:
bser "^2.0.0"
-fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.15, fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
+fbjs@^0.8.0, fbjs@^0.8.15, fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
version "0.8.17"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
@@ -6481,11 +6688,11 @@ fs-extra@^8.0.1:
universalify "^0.1.0"
fs-minipass@^1.2.5:
- version "1.2.6"
- resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
- integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+ integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
dependencies:
- minipass "^2.2.1"
+ minipass "^2.6.0"
fs-write-stream-atomic@^1.0.8:
version "1.0.10"
@@ -6581,11 +6788,6 @@ get-caller-file@^2.0.1:
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-get-own-enumerable-property-symbols@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
- integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
-
get-pkg-repo@^1.0.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
@@ -7283,7 +7485,7 @@ icss-replace-symbols@^1.1.0:
resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
-icss-utils@^4.1.0:
+icss-utils@^4.0.0, icss-utils@^4.1.0, icss-utils@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==
@@ -7301,9 +7503,9 @@ iferr@^0.1.5:
integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
ignore-walk@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
- integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.2.tgz#99d83a246c196ea5c93ef9315ad7b0819c35069b"
+ integrity sha512-EXyErtpHbn75ZTsOADsfx6J/FPo6/5cjev46PXrcTpd8z3BoRkXgYu9/JVqrI7tusjmwCZutGeRJeU0Wo1e4Cw==
dependencies:
minimatch "^3.0.4"
@@ -7748,7 +7950,7 @@ is-number@^7.0.0:
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-is-obj@^1.0.0, is-obj@^1.0.1:
+is-obj@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
@@ -7808,11 +8010,6 @@ is-regex@^1.0.4:
dependencies:
has "^1.0.1"
-is-regexp@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
- integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
-
[email protected]:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
@@ -8487,11 +8684,6 @@ jsonfile@^4.0.0:
optionalDependencies:
graceful-fs "^4.1.6"
-jsonify@~0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
- integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
-
jsonparse@^1.2.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -8578,7 +8770,7 @@ lazy-cache@^1.0.3:
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
-lazy-universal-dotenv@^3.0.0:
+lazy-universal-dotenv@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz#a6c8938414bca426ab8c9463940da451a911db38"
integrity sha512-prXSYk799h3GY3iOWnC6ZigYzMPjxN2svgjJ9shk7oMadSNX3wXy0B6F32PMJv7qtMnrIbUxoEHzbutvxR2LBQ==
@@ -8711,11 +8903,6 @@ locate-path@^5.0.0:
dependencies:
p-locate "^4.1.0"
-lodash-es@^4.17.11:
- version "4.17.15"
- resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
- integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
-
lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
@@ -9125,9 +9312,9 @@ merge-stream@^2.0.0:
integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
merge2@^1.2.3:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz#c9269589e6885a60cf80605d9522d4b67ca646e3"
- integrity sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
+ integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
merge@^1.2.1:
version "1.2.1"
@@ -9196,7 +9383,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-mime@^2.0.3, mime@^2.4.2:
+mime@^2.0.3, mime@^2.4.4:
version "2.4.4"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
@@ -9288,20 +9475,28 @@ minimist@~0.0.1:
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-minipass@^2.2.1, minipass@^2.3.5:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.4.0.tgz#38f0af94f42fb6f34d3d7d82a90e2c99cd3ff485"
- integrity sha512-6PmOuSP4NnZXzs2z6rbwzLJu/c5gdzYg1mRI/WIYdx45iiX7T+a4esOzavD6V/KmBzAaopFSTZPZcUx73bqKWA==
+minipass@^2.6.0, minipass@^2.8.6:
+ version "2.8.6"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.8.6.tgz#620d889ace26356391d010ecb9458749df9b6db5"
+ integrity sha512-lFG7d6g3+/UaFDCOtqPiKAC9zngWWsQZl1g5q6gaONqrjq61SX2xFqXMleQiFVyDpYwa018E9hmlAFY22PCb+A==
+ dependencies:
+ safe-buffer "^5.1.2"
+ yallist "^3.0.0"
+
+minipass@^2.9.0:
+ version "2.9.0"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+ integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
dependencies:
safe-buffer "^5.1.2"
yallist "^3.0.0"
minizlib@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
- integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.2.tgz#5d24764998f98112586f7e566bd4c0999769dad4"
+ integrity sha512-lsNFqSHdJ21EwKzCp12HHJGxSMtHkCW1EMA9cceG3MkMNARjuWotZnMe3NKNshAvFXpm4loZqmYsCmRwhS2JMw==
dependencies:
- minipass "^2.2.1"
+ minipass "^2.9.0"
mississippi@^3.0.0:
version "3.0.0"
@@ -9632,10 +9827,10 @@ node-pre-gyp@^0.12.0:
semver "^5.3.0"
tar "^4"
-node-releases@^1.1.25:
- version "1.1.28"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.28.tgz#503c3c70d0e4732b84e7aaa2925fbdde10482d4a"
- integrity sha512-AQw4emh6iSXnCpDiFe0phYcThiccmkNWMZnFZ+lDJjAP8J0m2fVd59duvUUyuTirQOhIAajTFkzG6FHCLBO59g==
+node-releases@^1.1.29:
+ version "1.1.32"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.32.tgz#485b35c1bf9b4d8baa105d782f8ca731e518276e"
+ integrity sha512-VhVknkitq8dqtWoluagsGPn3dxTvN9fwgR59fV3D7sLBHe0JfDramsMI8n8mY//ccq/Kkrf8ZRHRpsyVZ3qw1A==
dependencies:
semver "^5.3.0"
@@ -9677,13 +9872,6 @@ nopt@^4.0.1, nopt@~4.0.1:
abbrev "1"
osenv "^0.1.4"
-nopt@~1.0.10:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
- integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=
- dependencies:
- abbrev "1"
-
normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -9811,7 +9999,12 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"
-object-keys@^1.0.11, object-keys@^1.0.12:
+object-inspect@^1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
+ integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -10103,11 +10296,11 @@ pako@^1.0.10, pako@~1.0.5:
integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
parallel-transform@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
- integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+ integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
dependencies:
- cyclist "~0.2.2"
+ cyclist "^1.0.1"
inherits "^2.0.3"
readable-stream "^2.1.5"
@@ -10126,9 +10319,9 @@ parent-module@^1.0.0:
callsites "^3.0.0"
parse-asn1@^5.0.0:
- version "5.1.4"
- resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
- integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
+ integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
dependencies:
asn1.js "^4.0.0"
browserify-aes "^1.0.0"
@@ -10455,6 +10648,16 @@ postcss-modules-local-by-default@^2.0.6:
postcss-selector-parser "^6.0.0"
postcss-value-parser "^3.3.1"
+postcss-modules-local-by-default@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
+ integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
+ dependencies:
+ icss-utils "^4.1.1"
+ postcss "^7.0.16"
+ postcss-selector-parser "^6.0.2"
+ postcss-value-parser "^4.0.0"
+
postcss-modules-scope@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz#ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"
@@ -10471,7 +10674,15 @@ postcss-modules-values@^2.0.0:
icss-replace-symbols "^1.1.0"
postcss "^7.0.6"
-postcss-selector-parser@^6.0.0:
+postcss-modules-values@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10"
+ integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==
+ dependencies:
+ icss-utils "^4.0.0"
+ postcss "^7.0.6"
+
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
@@ -10490,10 +10701,10 @@ postcss-value-parser@^4.0.0:
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
-postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.5, postcss@^7.0.6:
- version "7.0.17"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
- integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
+postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.5, postcss@^7.0.6:
+ version "7.0.18"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
+ integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
dependencies:
chalk "^2.4.2"
source-map "^0.6.1"
@@ -10739,9 +10950,9 @@ [email protected]:
integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
qs@^6.6.0:
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.8.0.tgz#87b763f0d37ca54200334cd57bb2ef8f68a1d081"
- integrity sha512-tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w==
+ version "6.9.0"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.0.tgz#d1297e2a049c53119cb49cca366adbbacc80b409"
+ integrity sha512-27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA==
qs@~6.5.2:
version "6.5.2"
@@ -10785,11 +10996,6 @@ quick-lru@^1.0.0:
resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
-raf-schd@^4.0.0:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.2.tgz#bd44c708188f2e84c810bf55fcea9231bcaed8a0"
- integrity sha512-VhlMZmGy6A6hrkJWHLNTGl5gtgMUm+xfGza6wbwnE914yeQ5Ybm18vgM734RZhMgfw4tacUrWseGZlpUrrakEQ==
-
raf@^3.4.0, raf@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
@@ -11330,13 +11536,13 @@ react-color@^2.17.0:
tinycolor2 "^1.4.1"
react-dev-utils@^9.0.0:
- version "9.0.3"
- resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.0.3.tgz#7607455587abb84599451460eb37cef0b684131a"
- integrity sha512-OyInhcwsvycQ3Zr2pQN+HV4gtRXrky5mJXIy4HnqrWa+mI624xfYfqGuC9dYbxp4Qq3YZzP8GSGQjv0AgNU15w==
+ version "9.0.4"
+ resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.0.4.tgz#5c71a8e8afdec0232c44d4e049d21baa437a92af"
+ integrity sha512-VwR+mBUXPLdYk/rOz6s6qpasIFGd7GW0KXd/3bih+/qGcMQvPG19XxtjDMtiAg0zWiFwp1ugCzAjLThbzFjVqw==
dependencies:
"@babel/code-frame" "7.5.5"
- address "1.1.0"
- browserslist "4.6.6"
+ address "1.1.2"
+ browserslist "4.7.0"
chalk "2.4.2"
cross-spawn "6.0.5"
detect-port-alt "1.1.6"
@@ -11353,10 +11559,10 @@ react-dev-utils@^9.0.0:
loader-utils "1.2.3"
open "^6.3.0"
pkg-up "2.0.0"
- react-error-overlay "^6.0.1"
+ react-error-overlay "^6.0.2"
recursive-readdir "2.2.2"
- shell-quote "1.6.1"
- sockjs-client "1.3.0"
+ shell-quote "1.7.2"
+ sockjs-client "1.4.0"
strip-ansi "5.2.0"
text-table "0.2.0"
@@ -11387,7 +11593,7 @@ react-docgen@^4.1.0:
node-dir "^0.1.10"
recast "^0.17.3"
-react-dom@^16.10.0:
+react-dom@^16.10.0, react-dom@^16.8.3:
version "16.10.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.10.0.tgz#319356767b5c044f3c016eef28518ef7726dce84"
integrity sha512-0QJQUFrKG04hB/1lWyUs/FOd1qNseKGRQI+JBRsADIqVAFxYObhZ2zsVQKjt+nVSCmi8KA0sL52RLwwWuXQtOw==
@@ -11397,17 +11603,7 @@ react-dom@^16.10.0:
prop-types "^15.6.2"
scheduler "^0.16.0"
-react-dom@^16.8.3:
- version "16.9.0"
- resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
- integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==
- dependencies:
- loose-envify "^1.1.0"
- object-assign "^4.1.1"
- prop-types "^15.6.2"
- scheduler "^0.15.0"
-
-react-draggable@^3.1.1:
+react-draggable@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.3.2.tgz#966ef1d90f2387af3c2d8bd3516f601ea42ca359"
integrity sha512-oaz8a6enjbPtx5qb0oDWxtDNuybOylvto1QLydsXgKmwT7e3GXC2eMVDwEMIUYJIFqVG72XpOv673UuuAq6LhA==
@@ -11416,17 +11612,17 @@ react-draggable@^3.1.1:
prop-types "^15.6.0"
react-element-to-jsx-string@^14.0.3:
- version "14.0.3"
- resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-14.0.3.tgz#64f50fdbf6ba154d6439da3d7307f79069b94d58"
- integrity sha512-ziZAm7OwEfFtyhCmQiFNI87KFu+G9EP8qVW4XtDHdKNqqprYifLzqXkzHqC1vnVsPhyp2znoPm0bJHAf1mUBZA==
+ version "14.1.0"
+ resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-14.1.0.tgz#31fcc3a82459d5e57ef852aa6879bcd0a578a8cb"
+ integrity sha512-uvfAsY6bn2c8HMBkxwj+2MMXcvNIkKDl0aZg2Jhzp+c096hZaXUNivVCP2H4RBtmGSSJcfMqQA5oPk8YdqFOVw==
dependencies:
+ "@base2/pretty-print-object" "^1.0.0"
is-plain-object "3.0.0"
- stringify-object "3.3.0"
-react-error-overlay@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.1.tgz#b8d3cf9bb991c02883225c48044cb3ee20413e0f"
- integrity sha512-V9yoTr6MeZXPPd4nV/05eCBvGH9cGzc52FN8fs0O0TVQ3HYYf1n7EgZVtHbldRq5xU9zEzoXIITjYNIfxDDdUw==
+react-error-overlay@^6.0.2:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.2.tgz#642bd6157c6a4b6e9ca4a816f7ed30b868c47f81"
+ integrity sha512-DHRuRk3K4Lg9obI6J4Y+nKvtwjasYRU9CFL3ud42x9YJG1HbQjSNublapC/WBJOA726gNUbqbj0U2df9+uzspQ==
[email protected], react-fast-compare@^2.0.4:
version "2.0.4"
@@ -11444,9 +11640,9 @@ react-focus-lock@^1.18.3:
react-clientside-effect "^1.2.0"
react-helmet-async@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.0.2.tgz#bb55dd8268f7b15aac69c6b22e2f950abda8cc44"
- integrity sha512-qzzchrM/ibHuPS/60ief8jaibPunuRdeta4iBDQV+ri2SFKwOV+X2NlEpvevZOauhmHrH/I6dI4E90EPVfJBBg==
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.0.3.tgz#68a176dd266c2caf63762879c573a866b89a2098"
+ integrity sha512-hthnzAPasSX0ZU0adR1YW51xtMhwQuMwxtyjb/OeS2Gu2bzqFnCtt2h93nENE0+97NPeUS0+YHOriEMX8j/W0w==
dependencies:
"@babel/runtime" "7.3.4"
invariant "2.2.4"
@@ -11499,7 +11695,12 @@ react-inspector@^3.0.2:
is-dom "^1.0.9"
prop-types "^15.6.1"
-react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.9.0:
+react-is@^16.7.0, react-is@^16.8.1:
+ version "16.10.0"
+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.10.0.tgz#3d6a031e57fff73c3cfa0347feb3e8f40c5141e5"
+ integrity sha512-WRki2sBb7MTpYp7FtDEmSeGKX2vamYyq3rc9o7fKUG+/DHVyJu69NnvJsiSwwhh2Tt8XN40MQHkDBEXwyfxncQ==
+
+react-is@^16.8.4, react-is@^16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==
@@ -11560,29 +11761,21 @@ react-redux@^7.1.0:
prop-types "^15.7.2"
react-is "^16.9.0"
-react-resize-detector@^4.0.5:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-4.2.0.tgz#b87aee6b37c9e8a52daca8736b3230cf6a2a8647"
- integrity sha512-AtOaNIxs0ydua7tEoglXR3902/EdlIj9PXDu1Zj0ug2VAUnkSQjguLGzaG/N6CXLOhJSccTsUCZxjLayQ1mE9Q==
- dependencies:
- lodash "^4.17.11"
- lodash-es "^4.17.11"
- prop-types "^15.7.2"
- raf-schd "^4.0.0"
- resize-observer-polyfill "^1.5.1"
-
react-resize-reporter@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/react-resize-reporter/-/react-resize-reporter-1.0.0.tgz#d572a66eea1e8bc22c7ce86d6a184557729601e4"
integrity sha512-/Qx3zH/0IXVxHY8FCsKgxOq2hCjPRFolD6PAqiWvkwFlmIwVlB8RQbcXq2gQOnpO8fm1fODLKnoOnb9l2fDsag==
-react-select@^2.2.0:
- version "2.4.4"
- resolved "https://registry.yarnpkg.com/react-select/-/react-select-2.4.4.tgz#ba72468ef1060c7d46fbb862b0748f96491f1f73"
- integrity sha512-C4QPLgy9h42J/KkdrpVxNmkY6p4lb49fsrbDk/hRcZpX7JvZPNb6mGj+c5SzyEtBv1DmQ9oPH4NmhAFvCrg8Jw==
+react-select@^3.0.0:
+ version "3.0.5"
+ resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.0.5.tgz#f2810e63fa8a6be375b3fa6f390284e9e33c9573"
+ integrity sha512-2tBXZ1XSqbk2boMUzSmKXwGl/6W46VkSMSLMy+ShccOVyD1kDTLPwLX7lugISkRMmL0v5BcLtriXOLfYwO0otw==
dependencies:
+ "@babel/runtime" "^7.4.4"
+ "@emotion/cache" "^10.0.9"
+ "@emotion/core" "^10.0.9"
+ "@emotion/css" "^10.0.9"
classnames "^2.2.5"
- emotion "^9.1.2"
memoize-one "^5.0.0"
prop-types "^15.6.0"
raf "^3.4.0"
@@ -11596,6 +11789,16 @@ react-shadow@^17.1.1:
dependencies:
humps "^2.0.1"
+react-sizeme@^2.6.7:
+ version "2.6.7"
+ resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-2.6.7.tgz#231339ce8821ac2c26424c791e0027f89dae3e90"
+ integrity sha512-xCjPoBP5jmeW58TxIkcviMZqabZis7tTvDFWf0/Wa5XCgVWQTIe74NQBes2N1Kmp64GRLkpm60BaP0kk+v8aCQ==
+ dependencies:
+ element-resize-detector "^1.1.15"
+ invariant "^2.2.4"
+ shallowequal "^1.1.0"
+ throttle-debounce "^2.1.0"
+
react-slick@~0.25.2:
version "0.25.2"
resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.25.2.tgz#56331b67d47d8bcfe2dceb6acab1c8fd5bd1f6bc"
@@ -11675,7 +11878,7 @@ react-wait@^0.3.0:
resolved "https://registry.yarnpkg.com/react-wait/-/react-wait-0.3.0.tgz#0cdd4d919012451a5bc3ab0a16d00c6fd9a8c10b"
integrity sha512-kB5x/kMKWcn0uVr9gBdNz21/oGbQwEQnF3P9p6E9yLfJ9DRcKS0fagbgYMFI0YFOoyKDj+2q6Rwax0kTYJF37g==
-react@^16.10.0:
+react@^16.10.0, react@^16.8.3:
version "16.10.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.10.0.tgz#95c41e8fc1c706e174deef54b663b5ab94c8ee32"
integrity sha512-lc37bD3j6ZWJRso/a1rrFu6CO1qOf30ZadUDBi1c5RHA1lBSWA8x2MGABB6Oikk+RfmgC+kAT+XegL0eD1ecKg==
@@ -11684,15 +11887,6 @@ react@^16.10.0:
object-assign "^4.1.1"
prop-types "^15.6.2"
-react@^16.8.3:
- version "16.9.0"
- resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
- integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==
- dependencies:
- loose-envify "^1.1.0"
- object-assign "^4.1.1"
- prop-types "^15.6.2"
-
reactcss@^1.2.0:
version "1.2.3"
resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
@@ -11844,18 +12038,6 @@ rechoir@^0.6.2:
dependencies:
resolve "^1.1.6"
-recompose@^0.30.0:
- version "0.30.0"
- resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.30.0.tgz#82773641b3927e8c7d24a0d87d65aeeba18aabd0"
- integrity sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==
- dependencies:
- "@babel/runtime" "^7.0.0"
- change-emitter "^0.1.2"
- fbjs "^0.8.1"
- hoist-non-react-statics "^2.3.1"
- react-lifecycles-compat "^3.0.2"
- symbol-observable "^1.0.4"
-
[email protected]:
version "2.2.2"
resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
@@ -11953,11 +12135,6 @@ regex-not@^1.0.0, regex-not@^1.0.2:
extend-shallow "^3.0.2"
safe-regex "^1.1.0"
-regexp-tree@^0.1.6:
- version "0.1.12"
- resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.12.tgz#28eaaa6e66eeb3527c15108a3ff740d9e574e420"
- integrity sha512-TsXZ8+cv2uxMEkLfgwO0E068gsNMLfuYwMMhiUxf0Kw2Vcgzq93vgl6wIlIYuPmfMqMjfQ9zAporiozqCnwLuQ==
-
regexp.prototype.flags@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
@@ -11970,10 +12147,10 @@ regexpp@^2.0.1:
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-regexpu-core@^4.5.4:
- version "4.5.5"
- resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.5.tgz#aaffe61c2af58269b3e516b61a73790376326411"
- integrity sha512-FpI67+ky9J+cDizQUJlIlNZFKual/lUkFr1AG6zOCpwZ9cLrg8UUVakyUQJD7fCDIe9Z2nwTQJNPyonatNmDFQ==
+regexpu-core@^4.6.0:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
+ integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
dependencies:
regenerate "^1.4.0"
regenerate-unicode-properties "^8.1.0"
@@ -12247,13 +12424,20 @@ run-queue@^1.0.0, run-queue@^1.0.3:
dependencies:
aproba "^1.1.1"
-rxjs@^6.1.0, rxjs@^6.4.0, rxjs@^6.5.2:
+rxjs@^6.1.0, rxjs@^6.5.2:
version "6.5.2"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
dependencies:
tslib "^1.9.0"
+rxjs@^6.4.0:
+ version "6.5.3"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
+ integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
+ dependencies:
+ tslib "^1.9.0"
+
[email protected]:
version "5.1.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -12327,14 +12511,6 @@ sax@^1.2.4, sax@~1.2.4:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-scheduler@^0.15.0:
- version "0.15.0"
- resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e"
- integrity sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==
- dependencies:
- loose-envify "^1.1.0"
- object-assign "^4.1.1"
-
scheduler@^0.16.0:
version "0.16.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.0.tgz#cc8914b79c5c1cfa16714cb1ddc4cbd2c7513efa"
@@ -12352,6 +12528,14 @@ schema-utils@^1.0.0:
ajv-errors "^1.0.0"
ajv-keywords "^3.1.0"
+schema-utils@^2.0.0:
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.4.1.tgz#e89ade5d056dc8bcaca377574bb4a9c4e1b8be56"
+ integrity sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==
+ dependencies:
+ ajv "^6.10.2"
+ ajv-keywords "^3.4.1"
+
schema-utils@^2.0.1:
version "2.1.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.1.0.tgz#940363b6b1ec407800a22951bdcc23363c039393"
@@ -12445,9 +12629,9 @@ [email protected]:
statuses "~1.5.0"
serialize-javascript@^1.7.0:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.8.0.tgz#9515fc687232e2321aea1ca7a529476eb34bb480"
- integrity sha512-3tHgtF4OzDmeKYj6V9nSyceRS0UJ3C7VqyD2Yj28vC/z2j6jG5FmFGahOKMD9CrglxTm3tETr87jEypaYV8DUg==
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
+ integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
serve-favicon@^2.5.0:
version "2.5.0"
@@ -12572,15 +12756,10 @@ shebang-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
[email protected]:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
- integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
- dependencies:
- array-filter "~0.0.0"
- array-map "~0.0.0"
- array-reduce "~0.0.0"
- jsonify "~0.0.0"
[email protected]:
+ version "1.7.2"
+ resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
+ integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
[email protected]:
version "0.7.6"
@@ -12616,17 +12795,17 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
simplebar-react@^1.0.0-alpha.6:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/simplebar-react/-/simplebar-react-1.1.0.tgz#9241817265aee28b40abced66d6a2663e046d721"
- integrity sha512-0nbUpoB5Gq3z2dbhRjPxwTLlscgFjCw8vKQRmbXIr47JMc5BeHj/WbZdVAESuKAvua7ESh6mkxbzywMNgRdbCw==
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/simplebar-react/-/simplebar-react-1.2.3.tgz#bd81fa9827628470e9470d06caef6ece15e1c882"
+ integrity sha512-1EOWJzFC7eqHUp1igD1/tb8GBv5aPQA5ZMvpeDnVkpNJ3jAuvmrL2kir3HuijlxhG7njvw9ssxjjBa89E5DrJg==
dependencies:
prop-types "^15.6.1"
- simplebar "^4.1.0"
+ simplebar "^4.2.3"
-simplebar@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-4.1.0.tgz#c4b78b278dd0ce41ed70a71473bfad8132a6260f"
- integrity sha512-kX+CsWbWLeufIsqJl8xg5J4WbYMyq5NONR/aTaehN8XLQxOthSgRT/uAXsqX9Yrw3iiGxD9PPwM1PmEJfWAdcg==
+simplebar@^4.2.3:
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-4.2.3.tgz#dac40aced299c17928329eab3d5e6e795fafc10c"
+ integrity sha512-9no0pK7/1y+8/oTF3sy/+kx0PjQ3uk4cYwld5F1CJGk2gx+prRyUq8GRfvcVLq5niYWSozZdX73a2wIr1o9l/g==
dependencies:
can-use-dom "^0.1.0"
core-js "^3.0.1"
@@ -12750,6 +12929,18 @@ [email protected]:
json3 "^3.3.2"
url-parse "^1.4.3"
[email protected]:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
+ integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==
+ dependencies:
+ debug "^3.2.5"
+ eventsource "^1.0.7"
+ faye-websocket "~0.11.1"
+ inherits "^2.0.3"
+ json3 "^3.3.2"
+ url-parse "^1.4.3"
+
[email protected]:
version "0.3.19"
resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
@@ -12828,7 +13019,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-source-map@^0.7.2, source-map@^0.7.3:
+source-map@^0.7.3:
version "0.7.3"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -13025,14 +13216,14 @@ stealthy-require@^1.1.1:
integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
store2@^2.7.1:
- version "2.9.0"
- resolved "https://registry.yarnpkg.com/store2/-/store2-2.9.0.tgz#9987e3cf491b8163fd6197c42bab7d71c58c179b"
- integrity sha512-JmK+95jLX2zAP75DVAJ1HAziQ6f+f495h4P9ez2qbmxazN6fE7doWlitqx9hj2YohH3kOi6RVksJe1UH0sJfPw==
+ version "2.10.0"
+ resolved "https://registry.yarnpkg.com/store2/-/store2-2.10.0.tgz#46b82bb91878daf1b0d56dec2f1d41e54d5103cf"
+ integrity sha512-tWEpK0snS2RPUq1i3R6OahfJNjWCQYNxq0+by1amCSuw0mXtymJpzmZIeYpA1UAa+7B0grCpNYIbDcd7AgTbFg==
storybook-addon-jsx@^7.1.5:
- version "7.1.5"
- resolved "https://registry.yarnpkg.com/storybook-addon-jsx/-/storybook-addon-jsx-7.1.5.tgz#f57b4fdc7da5d07b85b1da6a9425207bffbc2fb1"
- integrity sha512-OU3JcBYGmFHeZjkvG6nbEOKy8AesURi+s7CcT7Ud68adAP8cJEDNxL6DUXWdJyt5DUKUivxewRmyQT8B9v8qWw==
+ version "7.1.6"
+ resolved "https://registry.yarnpkg.com/storybook-addon-jsx/-/storybook-addon-jsx-7.1.6.tgz#56177cc0c98d836fcec837c8bb2f7e2c64838f7f"
+ integrity sha512-1aCF4xFYImjwJDJhI9f7l8PEt1ScCNfkgvofFRB7CwxFf4chepM5HirH4wc2kSWhFcBRoQhx/Y0cNxnlsJAN4A==
dependencies:
copy-to-clipboard "^3.0.8"
js-beautify "^1.8.8"
@@ -13040,9 +13231,9 @@ storybook-addon-jsx@^7.1.5:
react-element-to-jsx-string "^14.0.3"
storybook-addon-react-docgen@^1.2.2:
- version "1.2.6"
- resolved "https://registry.yarnpkg.com/storybook-addon-react-docgen/-/storybook-addon-react-docgen-1.2.6.tgz#48308879ca2837b70d28edf92069d76bafa718f4"
- integrity sha512-F1MzrgXQ0RjsxdfEvjlnKgGObM5ZY8vDWMqiFCHxcT48U79INBXgRtvoZ1SPjmcH/lNTQKKBFEY835J3R4KHAA==
+ version "1.2.21"
+ resolved "https://registry.yarnpkg.com/storybook-addon-react-docgen/-/storybook-addon-react-docgen-1.2.21.tgz#8f6be006429e7b96a2cc820136dcf6fcc19acd3b"
+ integrity sha512-/JXh1r0U3R4eyn+VQIZky7nkmJwg19yhk/I5bb3UYvrx8fsOUloYbrqH4KrTj/CUohFcM2VPjXGkfB3zPb2X0A==
dependencies:
nested-object-assign "^1.0.3"
prop-types "^15.6.2"
@@ -13154,6 +13345,22 @@ string.prototype.padstart@^3.0.0:
es-abstract "^1.4.3"
function-bind "^1.0.2"
+string.prototype.trimleft@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
+ integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
+ dependencies:
+ define-properties "^1.1.3"
+ function-bind "^1.1.1"
+
+string.prototype.trimright@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
+ integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
+ dependencies:
+ define-properties "^1.1.3"
+ function-bind "^1.1.1"
+
string_decoder@^1.0.0, string_decoder@^1.1.1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -13168,15 +13375,6 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"
[email protected]:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
- integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
- dependencies:
- get-own-enumerable-property-symbols "^3.0.0"
- is-obj "^1.0.1"
- is-regexp "^1.0.0"
-
[email protected]:
version "1.0.0"
resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
@@ -13250,21 +13448,11 @@ style-loader@^0.23.1:
loader-utils "^1.1.0"
schema-utils "^1.0.0"
-stylis-rule-sheet@^0.0.10:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430"
- integrity sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==
-
[email protected]:
version "3.5.0"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1"
integrity sha512-pP7yXN6dwMzAR29Q0mBrabPCe0/mNO1MSr93bhay+hcZondvMMTpeGyd8nbhYJdyperNT2DRxONQuUGcJr5iPw==
-stylis@^3.5.0:
- version "3.5.4"
- resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"
- integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==
-
[email protected], supports-color@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
@@ -13308,7 +13496,7 @@ svgo@^1.2.2:
unquote "~1.1.1"
util.promisify "~1.0.0"
-symbol-observable@^1.0.4, symbol-observable@^1.2.0:
+symbol-observable@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
@@ -13361,19 +13549,19 @@ tar@^2.0.0:
inherits "2"
tar@^4:
- version "4.4.10"
- resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
- integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
+ version "4.4.13"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+ integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
dependencies:
chownr "^1.1.1"
fs-minipass "^1.2.5"
- minipass "^2.3.5"
+ minipass "^2.8.6"
minizlib "^1.2.1"
mkdirp "^0.5.0"
safe-buffer "^5.1.2"
yallist "^3.0.3"
-telejson@^2.2.1:
+telejson@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/telejson/-/telejson-2.2.2.tgz#d61d721d21849a6e4070d547aab302a9bd22c720"
integrity sha512-YyNwnKY0ilabOwYgC/J754En1xOe5PBIUIw+C9e0+5HjVVcnQE5/gdu2yET2pmSbp5bxIDqYNjvndj2PUkIiYA==
@@ -13409,9 +13597,9 @@ terser-webpack-plugin@^1.2.4, terser-webpack-plugin@^1.4.1:
worker-farm "^1.7.0"
terser@^4.1.2:
- version "4.2.1"
- resolved "https://registry.yarnpkg.com/terser/-/terser-4.2.1.tgz#1052cfe17576c66e7bc70fcc7119f22b155bdac1"
- integrity sha512-cGbc5utAcX4a9+2GGVX4DsenG6v0x3glnDi5hx8816X1McEAwPlPgRtXPJzSBsbpILxZ8MQMT0KvArLuE0HP5A==
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.3.tgz#f626c6779cadd60a3018e072fedeceabe4769db1"
+ integrity sha512-Nzr7dpRjSzMEUS+z2UYQBtzE0LDm5k0Yy8RgLRPy85QUo1TjU5lIOBwzS5/FVAMaVyHZ3WTTU2BuQcMn8KXnNQ==
dependencies:
commander "^2.20.0"
source-map "~0.6.1"
@@ -13447,7 +13635,7 @@ throat@^4.0.0:
resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
-throttle-debounce@^2.0.1:
+throttle-debounce@^2.0.1, throttle-debounce@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz#257e648f0a56bd9e54fe0f132c4ab8611df4e1d5"
integrity sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg==
@@ -13565,13 +13753,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-touch@^2.0.1:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz#ca0b2a3ae3211246a61b16ba9e6cbf1596287164"
- integrity sha512-qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A==
- dependencies:
- nopt "~1.0.10"
-
tough-cookie@^2.3.3, tough-cookie@^2.3.4:
version "2.5.0"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -13628,9 +13809,9 @@ ts-easing@^0.2.0:
integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==
ts-pnp@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.2.tgz#be8e4bfce5d00f0f58e0666a82260c34a57af552"
- integrity sha512-f5Knjh7XCyRIzoC/z1Su1yLLRrPrFCgtUAh/9fCSP6NKbATwpOL1+idQVXQokK9GRFURn/jYPGPfegIctwunoA==
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.4.tgz#ae27126960ebaefb874c6d7fa4729729ab200d90"
+ integrity sha512-1J/vefLC+BWSo+qe8OnJQfWTYRS6ingxjwqmHMqaMxXMj7kFtKLgAaYW3JeX3mktjgUL+etlU8/B4VUAUI9QGw==
tslib@^1.8.1, tslib@^1.9.0:
version "1.10.0"
@@ -13813,9 +13994,9 @@ unset-value@^1.0.0:
isobject "^3.0.0"
upath@^1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
- integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+ integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
upper-case@^1.1.1:
version "1.1.3"
@@ -13848,6 +14029,15 @@ url-loader@^1.1.2:
mime "^2.0.3"
schema-utils "^1.0.0"
+url-loader@^2.0.1:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz#bcc1ecabbd197e913eca23f5e0378e24b4412961"
+ integrity sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A==
+ dependencies:
+ loader-utils "^1.2.3"
+ mime "^2.4.4"
+ schema-utils "^2.0.0"
+
url-parse@^1.4.3:
version "1.4.7"
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
@@ -14051,12 +14241,13 @@ webpack-cli@^3:
yargs "13.2.4"
webpack-dev-middleware@^3.7.0:
- version "3.7.0"
- resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
- integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
+ version "3.7.1"
+ resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz#1167aea02afa034489869b8368fe9fed1aea7d09"
+ integrity sha512-5MWu9SH1z3hY7oHOV6Kbkz5x7hXbxK56mGHNqHTe6d+ewxOwKUxoUJBs7QIaJb33lPjl9bJZ3X0vCoooUzC36A==
dependencies:
memory-fs "^0.4.1"
- mime "^2.4.2"
+ mime "^2.4.4"
+ mkdirp "^0.5.1"
range-parser "^1.2.1"
webpack-log "^2.0.0"
@@ -14135,7 +14326,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
source-list-map "^2.0.0"
source-map "~0.6.1"
-webpack@^4, webpack@^4.33.0, webpack@^4.38.0:
+webpack@^4:
version "4.39.2"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.2.tgz#c9aa5c1776d7c309d1b3911764f0288c8c2816aa"
integrity sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==
@@ -14164,6 +14355,35 @@ webpack@^4, webpack@^4.33.0, webpack@^4.38.0:
watchpack "^1.6.0"
webpack-sources "^1.4.1"
+webpack@^4.33.0, webpack@^4.38.0:
+ version "4.41.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.0.tgz#db6a254bde671769f7c14e90a1a55e73602fc70b"
+ integrity sha512-yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g==
+ dependencies:
+ "@webassemblyjs/ast" "1.8.5"
+ "@webassemblyjs/helper-module-context" "1.8.5"
+ "@webassemblyjs/wasm-edit" "1.8.5"
+ "@webassemblyjs/wasm-parser" "1.8.5"
+ acorn "^6.2.1"
+ ajv "^6.10.2"
+ ajv-keywords "^3.4.1"
+ chrome-trace-event "^1.0.2"
+ enhanced-resolve "^4.1.0"
+ eslint-scope "^4.0.3"
+ json-parse-better-errors "^1.0.2"
+ loader-runner "^2.4.0"
+ loader-utils "^1.2.3"
+ memory-fs "^0.4.1"
+ micromatch "^3.1.10"
+ mkdirp "^0.5.1"
+ neo-async "^2.6.1"
+ node-libs-browser "^2.2.1"
+ schema-utils "^1.0.0"
+ tapable "^1.1.3"
+ terser-webpack-plugin "^1.4.1"
+ watchpack "^1.6.0"
+ webpack-sources "^1.4.1"
+
websocket-driver@>=0.5.1:
version "0.7.3"
resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
@@ -14356,9 +14576,9 @@ yallist@^2.1.2:
integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
- integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.0.tgz#906cc2100972dc2625ae78f566a2577230a1d6f7"
+ integrity sha512-6gpP93MR+VOOehKbCPchro3wFZNSNmek8A2kbkOAZLIZAYx1KP/zAqwO0sOHi3xJEb+UBz8NaYt/17UNit1Q9w==
yargs-parser@^10.0.0:
version "10.1.0"
|
chore
|
upgrade storybook
|
96664f5f8588973ebdb4b37f7776baba78dc1157
|
2019-09-28 14:54:23
|
crimx
|
refactor(profiles): add nihongo locales
| false
|
diff --git a/src/_locales/en/common.ts b/src/_locales/en/common.ts
index 43005e0e5..b0706f601 100644
--- a/src/_locales/en/common.ts
+++ b/src/_locales/en/common.ts
@@ -63,6 +63,7 @@ export const locale: typeof _locale = {
sentence: 'Sentence Mode',
default: 'Default Mode',
scholar: 'Scholar Mode',
- translation: 'Translation Mode'
+ translation: 'Translation Mode',
+ nihongo: 'Japanese Mode'
}
}
diff --git a/src/_locales/zh-CN/common.ts b/src/_locales/zh-CN/common.ts
index 7b93daa7e..14adfc73a 100644
--- a/src/_locales/zh-CN/common.ts
+++ b/src/_locales/zh-CN/common.ts
@@ -61,6 +61,7 @@ export const locale = {
sentence: '句库模式',
default: '默认模式',
scholar: '学术模式',
- translation: '翻译模式'
+ translation: '翻译模式',
+ nihongo: '日语模式'
}
}
diff --git a/src/_locales/zh-TW/common.ts b/src/_locales/zh-TW/common.ts
index ec28593b6..653f735ca 100644
--- a/src/_locales/zh-TW/common.ts
+++ b/src/_locales/zh-TW/common.ts
@@ -63,6 +63,7 @@ export const locale: typeof _locale = {
sentence: '句庫模式',
default: '預設模式',
scholar: '學術模式',
- translation: '翻譯模式'
+ translation: '翻譯模式',
+ nihongo: '日語模式'
}
}
|
refactor
|
add nihongo locales
|
bb1f772f8a3273011ae3a4a6f19c4b076fb6ca67
|
2019-09-04 17:51:04
|
crimx
|
refactor: add message response generic
| false
|
diff --git a/src/_helpers/browser-api.ts b/src/_helpers/browser-api.ts
index e191d0ff7..380d6cdbe 100644
--- a/src/_helpers/browser-api.ts
+++ b/src/_helpers/browser-api.ts
@@ -302,13 +302,13 @@ function storageCreateStream<T = any>(
\* --------------------------------------- */
type MessageThis = typeof message | typeof message.self
-function messageSend<T extends MsgType>(
+function messageSend<T extends MsgType, R = MessageResponse<T>>(
message: Message<T>
-): Promise<MessageResponse<T>>
-function messageSend<T extends MsgType>(
+): Promise<R>
+function messageSend<T extends MsgType, R = MessageResponse<T>>(
tabId: number,
message: Message<T>
-): Promise<MessageResponse<T>>
+): Promise<R>
function messageSend<T extends MsgType>(
...args: [Message<T>] | [number, Message<T>]
): Promise<any> {
|
refactor
|
add message response generic
|
ce7ba09cf34ac0ff3af8ba9f441a564925c70062
|
2019-02-12 17:56:59
|
CRIMX
|
refactor(panel): disable fav icon only if search text is empty
| false
|
diff --git a/src/content/components/MenuBar/index.tsx b/src/content/components/MenuBar/index.tsx
index 6be98909a..6b3a5fe5f 100644
--- a/src/content/components/MenuBar/index.tsx
+++ b/src/content/components/MenuBar/index.tsx
@@ -492,7 +492,7 @@ export default class MenuBar extends React.PureComponent<MenuBarProps, MenuBarSt
<button className='panel-MenuBar_Btn'
onMouseDown={this.handleIconFavMouseDown}
onClick={this.handleIconFavClick}
- disabled={isSaladictOptionsPage || searchHistory.length <= 0}
+ disabled={Boolean(searchBox.text)}
>
<svg
className={`panel-MenuBar_Icon-fav ${isFav ? 'isActive' : ''}`}
|
refactor
|
disable fav icon only if search text is empty
|
19f0399767c50f100b6e8aacd2ed9b2295cb7de4
|
2020-04-23 11:16:58
|
crimx
|
refactor(panel): do not open DictAuth on popup page
| false
|
diff --git a/src/content/components/MenuBar/MenuBar.container.tsx b/src/content/components/MenuBar/MenuBar.container.tsx
index 5b3ab75ba..52cdf9323 100644
--- a/src/content/components/MenuBar/MenuBar.container.tsx
+++ b/src/content/components/MenuBar/MenuBar.container.tsx
@@ -6,7 +6,7 @@ import {
} from 'react-retux'
import { StoreState, StoreDispatch } from '@/content/redux/modules'
import { updateActiveProfileID } from '@/_helpers/profile-manager'
-import { isStandalonePage } from '@/_helpers/saladict'
+import { isStandalonePage, isPopupPage } from '@/_helpers/saladict'
import { newWord } from '@/_helpers/record-manager'
import { message } from '@/_helpers/browser-api'
import { MenuBar, MenuBarProps } from './MenuBar'
@@ -119,7 +119,8 @@ const mapDispatchToProps: MapDispatchToPropsFunction<
const state = getState()
const { showedDictAuth, dictAuth } = state.config
- if (!showedDictAuth) {
+ // no jumping on popup page which breaks user flow
+ if (!showedDictAuth && !isPopupPage()) {
await updateConfig({
...state.config,
showedDictAuth: true
|
refactor
|
do not open DictAuth on popup page
|
6098e34cf9066032d0237f711e7061336b002c47
|
2019-01-07 10:47:40
|
CRIMX
|
fix: encode uri
| false
|
diff --git a/src/background/context-menus.ts b/src/background/context-menus.ts
index 19c97c0e7..3003aa7fc 100644
--- a/src/background/context-menus.ts
+++ b/src/background/context-menus.ts
@@ -140,7 +140,7 @@ export async function openPDF (url?: string, force?: boolean) {
const tabs = await browser.tabs.query({ active: true, currentWindow: true })
if (tabs.length > 0 && tabs[0].url) {
if (/pdf$/i.test(tabs[0].url as string) || force) {
- return openURL(pdfURL + '?file=' + encodeURIComponent(tabs[0].url))
+ return openURL(pdfURL + '?file=' + encodeURIComponent((tabs[0].url as string)))
}
}
return openURL(pdfURL)
|
fix
|
encode uri
|
aac184cd9d9ddb035f8331457baf8b0a160a3224
|
2020-08-06 18:53:48
|
crimx
|
fix(dicts): replace cambridge amp-audio
| false
|
diff --git a/src/components/dictionaries/cambridge/engine.ts b/src/components/dictionaries/cambridge/engine.ts
index 481b83547..fdd22302e 100644
--- a/src/components/dictionaries/cambridge/engine.ts
+++ b/src/components/dictionaries/cambridge/engine.ts
@@ -119,30 +119,7 @@ function handleDOM(
removeChild($posHeader, '.share')
}
- // expand button
- $entry.querySelectorAll('.daccord_h').forEach($btn => {
- $btn.parentElement!.classList.add('amp-accordion')
- })
-
- // replace amp-img
- $entry.querySelectorAll('amp-img').forEach($ampImg => {
- const $img = doc.createElement('img')
-
- $img.setAttribute('src', getFullLink(HOST, $ampImg, 'src'))
-
- const attrs = ['width', 'height', 'title']
- for (const attr of attrs) {
- const val = $ampImg.getAttribute(attr)
- if (val) {
- $img.setAttribute(attr, val)
- }
- }
-
- $ampImg.replaceWith($img)
- })
-
- // See more results
- $entry.querySelectorAll<HTMLAnchorElement>('a.had').forEach(externalLink)
+ sanitizeEntry($entry)
const entryId = `d-cambridge-entry${i}`
@@ -165,13 +142,7 @@ function handleDOM(
if ($idiom) {
removeChild($idiom, '.bb.hax')
- // expand button
- $idiom.querySelectorAll('.daccord_h').forEach($btn => {
- $btn.parentElement!.classList.add('amp-accordion')
- })
-
- // See more results
- $idiom.querySelectorAll<HTMLAnchorElement>('a.had').forEach(externalLink)
+ sanitizeEntry($idiom)
result.push({
id: '`d-cambridge-entry-idiom',
@@ -186,3 +157,45 @@ function handleDOM(
return handleNoResult()
}
+
+function sanitizeEntry<E extends Element>($entry: E): E {
+ // expand button
+ $entry.querySelectorAll('.daccord_h').forEach($btn => {
+ $btn.parentElement!.classList.add('amp-accordion')
+ })
+
+ // replace amp-img
+ $entry.querySelectorAll('amp-img').forEach($ampImg => {
+ const $img = document.createElement('img')
+
+ $img.setAttribute('src', getFullLink(HOST, $ampImg, 'src'))
+
+ const attrs = ['width', 'height', 'title']
+ for (const attr of attrs) {
+ const val = $ampImg.getAttribute(attr)
+ if (val) {
+ $img.setAttribute(attr, val)
+ }
+ }
+
+ $ampImg.replaceWith($img)
+ })
+
+ // replace amp-audio
+ $entry.querySelectorAll('amp-audio').forEach($ampAudio => {
+ const $source = $ampAudio.querySelector('source')
+ if ($source) {
+ const src = getFullLink(HOST, $source, 'src')
+ if (src) {
+ $ampAudio.replaceWith(getStaticSpeaker(src))
+ return
+ }
+ }
+ $ampAudio.remove()
+ })
+
+ // See more results
+ $entry.querySelectorAll<HTMLAnchorElement>('a.had').forEach(externalLink)
+
+ return $entry
+}
|
fix
|
replace cambridge amp-audio
|
dfc46a0378b3c71bbc9f0febf5d2b0058fdb3826
|
2021-10-16 21:55:38
|
crimx
|
fix(selecion): check range count before getting range
| false
|
diff --git a/src/selection/index.ts b/src/selection/index.ts
index eb5f0447..5da46a59 100644
--- a/src/selection/index.ts
+++ b/src/selection/index.ts
@@ -50,7 +50,7 @@ if (!window.__SALADICT_SELECTION_LOADED__) {
*/
message.createStream('EMIT_SELECTION').subscribe(async () => {
const selection = window.getSelection()
- if (selection) {
+ if (selection && selection.rangeCount > 0) {
const text = getTextFromSelection(selection)
const rect = selection.getRangeAt(0).getBoundingClientRect()
if (text) {
diff --git a/src/selection/select-text.ts b/src/selection/select-text.ts
index e5d9f5ad..7fedd13c 100644
--- a/src/selection/select-text.ts
+++ b/src/selection/select-text.ts
@@ -77,7 +77,9 @@ function withTouchMode(config: AppConfig) {
map(([, isWithMouse]) => [window.getSelection(), isWithMouse] as const),
filter(
(args): args is [Selection, boolean] =>
- !!args[0] && !isInSaladictExternal(args[0].anchorNode)
+ !!args[0] &&
+ args[0].rangeCount > 0 &&
+ !isInSaladictExternal(args[0].anchorNode)
),
withLatestFrom(mouseup$, mousedown$, clickPeriodCount$),
map(([[selection, isWithMouse], mouseup, mousedown, clickPeriodCount]) => {
|
fix
|
check range count before getting range
|
0645047d34c4f5d225f348a57a79c4d25725b69d
|
2021-09-26 07:01:48
|
yipanhuasheng
|
refactor(dicts): update naver dict (#1483)
| false
|
diff --git a/src/components/dictionaries/naver/View.tsx b/src/components/dictionaries/naver/View.tsx
index 60d6bc6cf..db14b0a73 100644
--- a/src/components/dictionaries/naver/View.tsx
+++ b/src/components/dictionaries/naver/View.tsx
@@ -1,30 +1,256 @@
import React, { FC } from 'react'
+import Speaker from '@/components/Speaker'
import { NaverResult } from './engine'
import { ViewPorps } from '@/components/dictionaries/helpers'
-export const DictNaver: FC<ViewPorps<NaverResult>> = props => (
- <>
- <select
- onChange={e =>
- props.searchText({
- id: 'naver',
- payload: { lang: e.target.value }
- })
- }
- value={props.result.lang}
- >
- <option key="zh" value="zh">
- 中韩
- </option>
- <option key="ja" value="ja">
- 日韓
- </option>
- </select>
- <div
- className={`dictNaver-Entry-${props.result.lang}`}
- dangerouslySetInnerHTML={{ __html: props.result.entry }}
- />
- </>
-)
+export const DictNaver: FC<ViewPorps<NaverResult>> = props => {
+ const ListMap = props.result.entry
+
+ return (
+ <>
+ <select
+ onChange={e =>
+ props.searchText({
+ id: 'naver',
+ payload: { lang: e.target.value }
+ })
+ }
+ value={props.result.lang}
+ >
+ <option key="zh" value="zh">
+ 中韩
+ </option>
+ <option key="ja" value="ja">
+ 日韓
+ </option>
+ </select>
+
+ {/* entry */}
+ {!!ListMap?.WORD?.items?.length && (
+ <div className={'dictNaver-EntryBox'}>
+ <span className={'dictNaver-EntryBoxTitle'}>单词</span>
+
+ {ListMap.WORD.items.map((word, wordI) => {
+ return (
+ <div className={'dictNaver-Entry'} key={wordI}>
+ <h3
+ className={'dictNaver-EntryTitle'}
+ dangerouslySetInnerHTML={{ __html: word.expEntry }}
+ />
+ {word.expEntrySuperscript && (
+ <sup className={'dictNaver-EntrySup'}>
+ {word.expEntrySuperscript}
+ </sup>
+ )}
+ {word.expKanji && (
+ <>
+ [
+ <span
+ className={'dictNaver-EntryKanji'}
+ dangerouslySetInnerHTML={{ __html: word.expKanji }}
+ ></span>
+ ]
+ </>
+ )}
+
+ <div className={'dictNaver-EntryPron'}>
+ {!!word?.searchPhoneticSymbolList?.length && (
+ <>
+ {word.searchPhoneticSymbolList[0].phoneticSymbol && (
+ <span>
+ [{word.searchPhoneticSymbolList[0].phoneticSymbol}]
+ </span>
+ )}
+ {word?.searchPhoneticSymbolList[0]
+ ?.phoneticSymbolPath && (
+ <Speaker
+ src={
+ word.searchPhoneticSymbolList[0]?.phoneticSymbolPath?.split(
+ '|'
+ ).length > 1
+ ? word.searchPhoneticSymbolList[0]?.phoneticSymbolPath?.split(
+ '|'
+ )[0]
+ : word.searchPhoneticSymbolList[0]
+ .phoneticSymbolPath
+ }
+ />
+ )}
+ </>
+ )}
+
+ {word?.frequencyAdd?.split('^').map(wordF => (
+ <span key={wordF} className={'dictNaver-EntryPronFa'}>
+ {wordF}
+ </span>
+ ))}
+ </div>
+
+ <div className={'dictNaver-EntryExp'}>
+ {word?.meansCollector?.map((wordMc, wordMcI) => {
+ return (
+ <ul key={wordMcI}>
+ {wordMc.means.map((m, mI) => (
+ <li key={mI}>
+ {m.order && <span>{m.order}.</span>}
+ {wordMc.partOfSpeech2 && (
+ <span className={'dictNaver-EntryExpPos'}>
+ {wordMc.partOfSpeech2}
+ </span>
+ )}
+ {m.subjectGroup && <span>{m.subjectGroup}</span>}
+ <span
+ dangerouslySetInnerHTML={{ __html: m.value }}
+ ></span>
+ </li>
+ ))}
+ </ul>
+ )
+ })}
+ </div>
+
+ <a
+ className={'dictNaver-EntrySource'}
+ href={word.sourceDictnameLink}
+ >
+ {word.sourceDictnameOri}
+ </a>
+ </div>
+ )
+ })}
+ </div>
+ )}
+
+ {/* mean */}
+ {!!ListMap?.MEANING?.items?.length && (
+ <div className={'dictNaver-MeanBox'}>
+ <span className={'dictNaver-MeanBoxTitle'}>释义</span>
+
+ {ListMap.MEANING.items.map((meaning, meaningI) => {
+ return (
+ <div className={'dictNaver-Mean'} key={meaningI}>
+ <h3
+ className={'dictNaver-MeanTitle'}
+ dangerouslySetInnerHTML={{ __html: meaning.expEntry }}
+ />
+ {meaning.expEntrySuperscript && (
+ <sup className={'dictNaver-MeanSup'}>
+ {meaning.expEntrySuperscript}
+ </sup>
+ )}
+
+ {!!meaning?.expAliasGeneralAlwaysList?.length && (
+ <span
+ className={'dictNaver-MeanAlias'}
+ dangerouslySetInnerHTML={{
+ __html:
+ meaning.expAliasGeneralAlwaysList[0].originLanguageValue
+ }}
+ ></span>
+ )}
+
+ <div className={'dictNaver-MeanPron'}>
+ {!!meaning?.searchPhoneticSymbolList?.length && (
+ <>
+ <span>
+ [{meaning.searchPhoneticSymbolList[0].phoneticSymbol}]
+ </span>
+ <Speaker
+ src={
+ meaning.searchPhoneticSymbolList[0].phoneticSymbolPath
+ }
+ />
+ </>
+ )}
+ </div>
+
+ <div className={'dictNaver-MeanExp'}>
+ {meaning?.meansCollector?.map((meaningMc, meaningMcI) => {
+ return (
+ <ul key={meaningMcI}>
+ {meaningMc?.means.map((m, mI) => (
+ <li key={mI}>
+ {m.order && <span>{m.order}.</span>}
+ {meaningMc.partOfSpeech2 && (
+ <span className={'dictNaver-MeanExpPos'}>
+ {meaningMc.partOfSpeech2}
+ </span>
+ )}
+ {m.subjectGroup && <span>{m.subjectGroup}</span>}
+ {m.languageGroup && (
+ <span className={'dictNaver-MeanExpLg'}>
+ {m.languageGroup}
+ </span>
+ )}
+ <span
+ dangerouslySetInnerHTML={{ __html: m.value }}
+ ></span>
+ </li>
+ ))}
+ </ul>
+ )
+ })}
+ </div>
+
+ <a
+ className={'dictNaver-MeanSource'}
+ href={meaning.sourceDictnameLink}
+ >
+ {meaning.sourceDictnameOri}
+ </a>
+ </div>
+ )
+ })}
+ </div>
+ )}
+
+ {/* example */}
+ {!!ListMap?.EXAMPLE?.items?.length && (
+ <div className={'dictNaver-ExampleBox'}>
+ <span className={'dictNaver-ExampleBoxTitle'}>例句</span>
+
+ {ListMap.EXAMPLE.items.map((example, exampleI) => {
+ return (
+ <div className={'dictNaver-Example'} key={exampleI}>
+ <h3
+ className={'dictNaver-ExampleTitle'}
+ dangerouslySetInnerHTML={{ __html: example.expExample1 }}
+ />
+
+ <div className={'dictNaver-ExamplePron'}>
+ <Speaker
+ src={
+ props.result.lang === 'ja'
+ ? `https://ja.dict.naver.com/api/nvoice?speaker=yuri&service=dictionary&speech_fmt=mp3&text=${example.exampleEncode}`
+ : `https://zh.dict.naver.com/tts?service=zhkodict&from=pc&speaker=zh_cn&text=${example.exampleEncode}`
+ }
+ />
+ </div>
+
+ <div className={'dictNaver-ExamplePronun'}>
+ {example.expExample1Pronun}
+ </div>
+
+ <div
+ className={'dictNaver-ExampleExtra'}
+ dangerouslySetInnerHTML={{ __html: example.expExample2 }}
+ ></div>
+
+ <div>
+ <a
+ className={'dictNaver-ExampleSource'}
+ href={example.sourceDictnameURL}
+ >
+ {example.sourceDictnameOri}
+ </a>
+ </div>
+ </div>
+ )
+ })}
+ </div>
+ )}
+ </>
+ )
+}
export default DictNaver
diff --git a/src/components/dictionaries/naver/_style.shadow.scss b/src/components/dictionaries/naver/_style.shadow.scss
index b347dd404..ec6c0a377 100644
--- a/src/components/dictionaries/naver/_style.shadow.scss
+++ b/src/components/dictionaries/naver/_style.shadow.scss
@@ -1,10458 +1,176 @@
-@import '@/_sass_shared/_reset.scss';
-
-.dictNaver-Entry-zh {
- .info_box {
- position: relative;
- background-color: #fff;
- }
-
- .info_tit {
- position: relative;
- z-index: 50;
- height: 31px;
- border-top: 1px solid #cacaca;
- border-bottom: 1px solid #cacaca;
- line-height: 2.06;
- padding-left: 10px;
- font-size: 1.15em;
- background-position: 0 0;
- letter-spacing: -1px;
- }
-
- .info_tit .en {
- font-family: arial,Helvetica,sans-serif;
- font-size: 1.31em;
- letter-spacing: 0;
- }
-
- .info_tit .feature {
- position: absolute;
- top: -2px;
- right: 5px;
- }
-
- .info_tit a.btn_class_word {
- height: 24px;
- margin-right: 4px;
- padding: 0 5px;
- font-size: 0.92em;
- line-height: 1.69;
- color: #4b4b4b;
- text-align: center;
- letter-spacing: -1px;
- border: 1px solid #b4b4b4;
- border-radius: 3px;
- border-color: #b4b4b4 #a3a3a3 #909090;
- background: #f9f9f9;
- background: gradient(linear,0 0,0 100%,color-stop(0,#f9f9f9),color-stop(100%,#e7e7e7));
- box-shadow: 0 1px 0 0 #f6f6f6;
- box-shadow: 0 1px 0 0 #f6f6f6;
- }
-
- .info_tit a.btn_refresh {
- overflow: hidden;
- width: 32px;
- height: 27px;
- background-position: -100px 0;
- text-indent: -9999px;
- }
-
- .info_tit a.ico_help {
- overflow: hidden;
- width: 22px;
- height: 22px;
- margin: -4px 0 0 6px;
- background-position: 0 0;
- }
-
- .info_tit .help_dsc {
- position: absolute;
- top: 31px;
- right: 0;
- left: 0;
- z-index: 60;
- padding: 12px 52px 10px 14px;
- border: 1px solid #a1afbd;
- background-color: #f4f8fb;
- }
-
- .info_tit .help_dsc p {
- font-size: 1.08em;
- line-height: 1.00;
- letter-spacing: 0;
- }
-
- .info_tit .help_dsc p em {
- color: #4c5461;
- }
-
- .info_tit .help_dsc p strong {
- display: block;
- padding-top: 5px;
- font-size: 1.00em;
- font-weight: 400;
- color: var(--color-font-grey);
- }
-
- .dic_lk .colb2,.info_tit .help_dsc p strong span {
- font-weight: 700;
- }
-
- .info_tit .help_dsc .btn_clse {
- position: absolute;
- top: 10px;
- right: 10px;
- width: 17px;
- height: 17px;
- background-position: 0 0;
- cursor: pointer;
- }
-
- .info_tit .help_dsc .effect {
- display: none;
- position: absolute;
- top: -4px;
- left: 120px;
- width: 8px;
- height: 4px;
- background-position: 0 0;
- }
-
- .info_box .no_data {
- padding: 12px 0 13px 10px;
- font-size: 1.15em;
- color: var(--color-font-grey);
- }
-
- .info_box .no_data strong {
- font-weight: 400;
- }
-
- .info_box .player {
- top: 0;
- }
-
- .info_box:first-child .info_tit,.word_srch_area .info_tit {
- border-top: 0;
- }
-
- .info_box:first-child .btn_all_del,.word_srch_area .btn_all_del {
- position: absolute;
- top: 0;
- right: 0;
- z-index: 50;
- height: 32px;
- padding-right: 8px;
- font-size: 1.00em;
- color: #999;
- line-height: 2.00;
- text-align: right;
- border-left: 1px solid #cacaca;
- letter-spacing: -1px;
- white-space: nowrap;
- }
-
- .dt li a,.ly_wrap,.u_pg2 {
- text-align: center;
- }
-
- .myw_lst {
- display: block;
- width: 100%;
- overflow: hidden;
- margin-bottom: -1px;
- }
-
- .myw_li {
- width: 50%;
- float: left;
- position: relative;
- border-bottom: 1px solid #eaeaea;
- }
-
- .myw_txt {
- display: block;
- height: 47px;
- padding: 0 0 0 10px;
- margin-right: 33px;
- line-height: 2.94;
- overflow: hidden;
- white-space: nowrap;
- font-size: 1.31em;
- color: #333;
- }
-
- .myw_txt sup {
- position: relative;
- top: -4px;
- font-size: 0.92em;
- vertical-align: 2px;
- margin-left: 2px;
- }
-
- .myw_li:nth-child(2n) .myw_txt {
- border-left: 1px solid #eaeaea;
- }
-
- .myw_noti {
- padding: 13px 10px;
- font-size: 1.15em;
- color: var(--color-font-grey);
- }
-
- .ico_x {
- float: left;
- height: 11px;
- width: 10px;
- margin: 11px 2px 0 8px;
- background-position: -130px -45px;
- }
-
- .ico_x2 {
- position: absolute;
- right: 7px;
- top: 50%;
- margin-top: -10px;
- height: 20px;
- width: 26px;
- background-position: -122px -40px;
- }
-
- .today_cvr {
- padding: 12px 10px 14px;
- }
-
- .today_cvr>span:first-child {
- color: var(--color-brand);
- }
-
- .today_cvr .jp {
- font-size: 1.38em;
- color: var(--color-brand);
- letter-spacing: -2px;
- }
-
- .dic_lk .td_txt,.s.s2 .today_cvr .bnr a {
- letter-spacing: -1px;
- }
-
- .today_cvr .jp rt {
- font-weight: 400;
- font-size: 0.92em;
- color: #3f4245;
- }
-
- .today_cvr .td_txt {
- overflow: hidden;
- font-size: 1.15em;
- white-space: nowrap;
- }
-
- .today_cvr .player {
- top: -2px;
- margin-left: 4px;
- }
-
- .today_cvr .bnr {
- position: relative;
- min-height: 58px;
- margin-top: 20px;
- border-radius: 3px;
- background-position: 0 0;
- }
-
- .today_cvr .bnr a {
- display: block;
- min-width: 230px;
- min-height: 32px;
- margin: 0 auto;
- padding: 13px 0 13px 55px;
- background-position: 17px 50%;
- font-weight: 700;
- color: #404040;
- text-shadow: 0 1px #ebf0f6;
- font-size: 1.15em;
- }
-
- .today_cvr .bnr .cnr_lt,.today_cvr .bnr .cnr_rt {
- position: absolute;
- top: 0;
- width: 4px;
- height: 53px;
- background-position: 0 0;
- }
-
- .today_cvr .bnr a strong {
- color: #5c667a;
- }
-
- .today_cvr .bnr a span {
- display: block;
- color: #848ea0;
- font-size: 0.85em;
- }
-
- .today_cvr .bnr .cnr_lt {
- left: 0;
- }
-
- .today_cvr .bnr .cnr_rt {
- right: 0;
- }
-
- .dtr_area .td_li {
- padding: 0;
- }
-
- .dic_lk {
- position: relative;
- display: table;
- width: 100%;
- height: 86px;
- }
-
- .dic_lk .thumb {
- position: absolute;
- left: 20px;
- top: 50%;
- }
-
- .dic_lk .thumb.th_jap {
- width: 60px;
- height: 54px;
- margin-top: -27px;
- background-position: 0 -30px;
- }
-
- .dic_lk .thumb.th_voice {
- width: 54px;
- height: 58px;
- margin-top: -29px;
- background-position: -60px -30px;
- }
-
- .dic_lk .td_txt {
- display: table-cell;
- padding: 10px 5px 10px 100px;
- font-size: 1.23em;
- line-height: 1.2;
- vertical-align: middle;
- white-space: normal;
- }
-
- .dic_lk .ico_arr,.main_offer .main_h4,.u_pg2 .arr_ico,.u_pg2_btn,.u_pg2_next,.u_pg2_pg,.u_pg2_prev {
- display: inline-block;
- }
-
- .dic_lk .ico_arr {
- vertical-align: middle;
- position: relative;
- top: -1px;
- height: 10px;
- width: 4px;
- margin-left: 5px;
- background-position: -164px -25px;
- }
-
- .dic_lk .colb2 {
- color: #2f7bd6;
- }
-
- .main_offer {
- background: #fff;
- border-top: 1px solid #e5e5e7;
- }
-
- .main_offer .main_h4 {
- padding: 13px 10px 12px;
- font-weight: 400;
- font-size: 1.00em;
- color: #999;
- }
-
- .u_pg2 {
- padding: 15px 0 35px;
- font-size: .86em;
- white-space: nowrap;
- border-top: 1px solid #eaeaea;
- }
-
- .u_pg2_btn {
- padding: .42em .86em;
- border: 1px solid #bcbcbc;
- border-radius: 3px;
- background: #f1f1f1;
- background: gradient(linear,0 0,0 100%,from(#fff),color-stop(.05,#fbfbfb),to(#f1f1f1));
- color: var(--color-font-grey);
- vertical-align: 1px;
- }
-
- .u_pg2_btn.uc_vh {
- visibility: hidden;
- }
-
- .u_pg2_prev {
- padding-left: .86em;
- background-position: 0 4px;
- }
-
- .u_pg2_next {
- padding-right: .86em;
- background-position: 100% -35px;
- }
-
- .u_pg2_pg {
- padding: 0 5px;
- font-weight: 700;
- color: #32a800;
- line-height: 1.69;
- }
-
- .u_pg2_total {
- color: #999;
- }
-
- .u_pg2 .pad_wid {
- padding: 0;
- margin: 0 1px;
- }
-
- .u_pg2 .arr_ico {
- width: 36px;
- height: 25px;
- vertical-align: middle;
- }
-
- .u_pg2 .arr_ico.lft {
- background-position: -13px -53px;
- }
-
- .u_pg2 .arr_ico.lft2 {
- background-position: -23px -480px;
- }
-
- .u_pg2 .arr_ico.rgt {
- background-position: -36px -53px;
- }
-
- .u_pg2 .arr_ico.rgt2 {
- background-position: -47px -480px;
- }
-
- .dl_list {
- overflow: hidden;
- max-height: 41px;
- padding: 8px 14px 10px 11px;
- border-bottom: 2px solid #b8b8b8;
- }
-
- .dl_list dd,.dl_list dt {
- display: inline;
- }
-
- .dl_list dt {
- padding: 0 0 0 4px;
- border: 1px solid #d8d8d8;
- background-color: #f7f8f9;
- }
-
- .dl_list dt>.blind {
- visibility: visible;
- overflow: hidden;
- position: static;
- width: auto;
- height: auto;
- font-size: 1.00em;
- color: #6c6c6c;
- }
-
- .dl_list .jp,.dl_list dd a {
- font-size: 1.15em;
- }
-
- .dl_list dd {
- margin-left: 5px;
- line-height: 1.31;
- }
-
- .dl_list dd a {
- color: var(--color-brand);
- white-space: nowrap;
- }
-
- .ft_big,.ft_small {
- display: inline-block;
- width: 33px;
- height: 29px;
- margin: 0 0 0 4px;
- vertical-align: middle;
- }
-
- .a .btn_txt_style1.expand_all_exam_bt,.a .btn_txt_style1.info_userent,.a .ft_big,.a .ft_small {
- margin-top: -3px;
- }
-
- .a .btn_txt_style1.info_userent {
- padding: 6px 0 4px;
- }
-
- .ft_small {
- background-position: 0 -152px;
- }
-
- .ft_small.on {
- background-position: -69px -152px;
- }
-
- .ft_big {
- margin-left: -5px;
- background-position: -102px -152px;
- }
-
- :root .ft_big {
- margin-left: -4px;
- }
-
- .ft_big.on {
- background-position: -33px -152px;
- }
-
- .btn_txt_style1.expand_all_exam_bt {
- margin-left: 4px;
- }
-
- .section_box h5 {
- font-size: 1.54em;
- }
-
- .detail_hj .section_box h5,.detail_jpkr .section_box h5,.detail_krjp .section_box h5 {
- font-size: 1.54em;
- padding-left: 10px;
- padding-bottom: 18px;
- color: currentColor;
- }
-
- .section_box h6 {
- margin: 5px 0 15px;
- padding-left: 11px;
- font-size: 1.38em;
- }
-
- .section_box h6 .kor_link {
- color: currentColor;
- }
-
- .section_box h6 a {
- color: #0068b1;
- }
-
- .section_box .pin {
- display: block;
- margin: 8px 0;
- }
-
- .section_box .lst li {
- font-size: 1.23em;
- line-height: 1.38;
- }
-
- .section_box .lst li .lst_txt {
- font-size: 1.38em;
- }
-
- .section_box .lst li .roman {
- display: block;
- }
-
- .section_box .lst li .jp {
- font-size: 1.31em;
- }
-
- .section_box .player {
- margin-top: -5px;
- }
-
- .detail_hj .section_box .lst li .lst_txt,.detail_jpkr .section_box .lst li .lst_txt,.detail_krjp .section_box .lst li .lst_txt {
- display: block;
- padding-bottom: 5px;
- }
-
- .ft_mod_sm h5 {
- font-size: 1.38em;
- }
-
- .ft_mod_sm .pin,.ft_mod_sm h6 {
- font-size: 1.08em;
- }
-
- .ft_mod_sm .lst li {
- font-size: 1.08em;
- line-height: 1.19;
- }
-
- .detail_hj .ft_mod .section.section_phonetic h5,.ft_mod h5 {
- font-size: 1.85em;
- }
-
- .ft_mod .srch_box .srch_top .entry {
- font-size: 1.69em;
- line-height: 1.69;
- }
-
- .ft_mod .srch_box .srch_top .entry .jp {
- font-size: 1.77em;
- }
-
- .ft_mod .section_article .entry .sw,.ft_mod .section_word .entry .sw {
- font-size: 1.69em;
- }
-
- .ft_mod .pin,.ft_mod h6,.ft_mod.section_box .lst li .lst_txt {
- font-size: 1.54em;
- }
-
- .ft_mod .lst li {
- font-size: 1.54em;
- line-height: 1.56;
- }
-
- .ft_mod .lst li .jp {
- font-size: 1.62em;
- line-height: 1.56;
- }
-
- .ft_mod .top_dn dd,.ft_mod .top_dn dd .jp,.ft_mod .top_dn dt,.ft_mod .top_dn dt .jp {
- font-size: 1.54em;
- }
-
- .ft_mod.srch_result .top_dn_v2 .ft_col3 {
- top: 0;
- vertical-align: top;
- }
-
- .ft_mod .section_example .lst .pin {
- font-size: 1.46em;
- }
-
- .ft_mod .section {
- font-size: 1.54em;
- line-height: 1.50;
- }
-
- .ft_mod .section .jp {
- font-size: 1.54em;
- }
-
- .ft_mod .section h4 {
- line-height: 1.13;
- }
-
- .ft_mod .srch_box .pin .img_info_wrap .info {
- font-size: 1.23em;
- line-height: 1.31;
- }
-
- .ft_mod.section_box.kor_food .food_desc .mean_wrap .mean {
- font-size: 1.31em;
- line-height: 1.50;
- }
-
- .ft_mod.section_box.kor_food .food_desc .mean_wrap .mean[lang=ja] {
- margin-top: 17px;
- font-size: 1.54em;
- line-height: 1.69;
- }
-
- .ft_mod2 h5 {
- font-size: 2.00em;
- }
-
- .ft_mod2 .pin,.ft_mod2 h6 {
- font-size: 1.69em;
- }
-
- .ft_mod2 .lst li {
- font-size: 1.69em;
- line-height: 1.69;
- }
-
- .ft_mod3 h5 {
- font-size: 2.15em;
- }
-
- .ft_mod3 .pin,.ft_mod3 h6 {
- font-size: 1.85em;
- }
-
- .ft_mod3 .lst li {
- font-size: 1.85em;
- line-height: 1.81;
- }
-
- .srch_result .mw,.srch_result .player,.srch_result .sw {
- margin-right: 2px;
- }
-
- .section_word .srch_box .lst li {
- padding-bottom: 5px;
- }
-
- .section_word .entry .sw {
- margin-left: 3px;
- font-size: 1.23em;
- color: var(--color-font-grey);
- vertical-align: middle;
- }
-
- .section_word .lst {
- list-style: decimal;
- margin: 0;
- }
-
- .section_word dd {
- line-height: 1.2;
- }
-
- .section_word .srch_box .pin {
- padding-bottom: 4px;
- }
-
- .section_word .srch_box .pin:last-child {
- padding-bottom: 11px;
- }
-
- .section_word .srch_box .lst_p {
- padding-bottom: 10px;
- }
-
- .section_word .top_dn {
- margin-top: 0;
- padding-top: 1px;
- }
-
- .section_article .srch_box {
- padding-bottom: 20px;
- }
-
- .section_article .entry .sw {
- margin-left: 3px;
- font-size: 1.08em;
- color: var(--color-font-grey);
- vertical-align: middle;
- }
-
- .section_article .lst p {
- margin-top: 10px;
- }
-
- .detail_hj .section_article .lst p,.detail_jpkr .section_article .lst p,.detail_krjp .section_article .lst p {
- margin-top: 3px;
- padding-bottom: 5px;
- }
-
- .detail_hj .section_article .lst p .ico_bl+span,.detail_hj .section_article .lst p .kor+span,.detail_jpkr .section_article .lst p .ico_bl+span,.detail_jpkr .section_article .lst p .kor+span,.detail_krjp .section_article .lst p .ico_bl+span,.detail_krjp .section_article .lst p .kor+span {
- margin-right: 10px;
- }
-
- .detail_hj .section_article .lst p .player,.detail_jpkr .section_article .lst p .player,.detail_krjp .section_article .lst p .player {
- position: relative;
- margin-left: -5px;
- }
-
- .detail_hj .section_article .lst p .kor,.detail_jpkr .section_article .lst p .kor,.detail_krjp .section_article .lst p .kor {
- display: block;
- margin-top: -3px;
- color: var(--color-font-grey);
- }
-
- .detail_hj .section_article .lst p .kor .kor_link,.detail_jpkr .section_article .lst p .kor .kor_link,.detail_krjp .section_article .lst p .kor .kor_link {
- color: var(--color-font-grey);
- }
-
- .detail_hj .section_article ul.lst,.detail_jpkr .section_article ul.lst,.detail_krjp .section_article ul.lst {
- padding-left: 10px;
- margin-left: 16px;
- }
-
- .section_example .lst li {
- margin-bottom: 0.8em;
- }
-
- .section_example .lst li:last-child {
- margin-bottom: 0.8em;
- }
-
- .section_example .lst p {
- color: currentColor;
- }
-
- .section_example .lst .jp {
- font-size: 1.38em;
- }
-
- .section_example .lst .pin {
- position: relative;
- top: -2px;
- font-size: 1.31em;
- }
-
- .section_example .cen_box2 {
- margin-left: 10px;
- }
-
- .section_expression .player,.section_proverb .player {
- margin-left: 5px;
- }
-
- .detail_krjp .tc-panels .section.section_proverb {
- padding: 0 0 13px;
- }
-
- .section_proverb h4 {
- padding-top: 30px;
- }
-
- .section_proverb .lst {
- padding: 5px 10px 0 27px;
- }
-
- .section_proverb .lst .kor {
- display: block;
- color: var(--color-font-grey);
- }
-
- .section_proverb .lst .kor .kor_link {
- color: var(--color-font-grey);
- }
-
- .section_compound .lst .kor_link,.section_compound .lst_txt a,.section_expression .lst .kor_link,.section_expression .lst_txt a {
- color: currentColor;
- }
-
- .section_proverb .lst p {
- padding-bottom: 10px;
- }
-
- .section_expression {
- padding: 0!important;
- }
-
- .section_expression h4 {
- padding-top: 30px;
- }
-
- .section_compound {
- padding: 0!important;
- }
-
- .section_compound h4 {
- padding-top: 30px;
- }
-
- .section_relhanja {
- padding: 0!important;
- }
-
- .section_relhanja h6 {
- margin: 0 10px;
- }
-
- .section_relhanja .top_dn {
- padding-left: 10px;
- }
-
- .section_relhanja .top_dt2 {
- clear: none;
- margin-left: 10px;
- }
-
- .section_relhanja .top_dn.top_dn_v2 {
- padding-bottom: 20px;
- }
-
- .section_relhanja.section.idiom .entry2 .jp {
- font-size: 1.38em;
- line-height: 1.25;
- }
-
- .section_relhanja.section.idiom .entry2 a.jp {
- vertical-align: middle;
- }
-
- .tc-panels .section.section_ideographic,.tc-panels .section.section_phonetic {
- padding-top: 30px;
- }
-
- .srch_result .section_sptrans {
- margin-top: 0;
- }
-
- .section_sptrans.section h4 {
- margin-bottom: 0;
- padding-bottom: 6px;
- border: 0;
- }
-
- .lst2 li .lst_p .jap_ico,.section_sptrans .srch_box .lst_p .jap_ico {
- padding-right: 8px;
- margin-right: 5px;
- background-position: 100% 6px;
- }
-
- .detail_hj .section.section_phonetic h5 {
- font-size: 1.62em;
- color: currentColor;
- }
-
- .section_phonetic .entry {
- margin-bottom: 0;
- font-weight: 400;
- }
-
- .section.section_phonetic .pin {
- margin: 4px 0 4px 10px;
- color: var(--color-font-grey);
- }
-
- .section_ideographic .lst .lst_txt .pin,.section_phonetic .lst .lst_txt .pin {
- display: inline;
- margin-right: 4px;
- vertical-align: 0;
- }
-
- .section_phonetic .lst.lst_v3 {
- margin-left: 10px;
- padding-bottom: 10px;
- }
-
- .section_phonetic ol.lst.lst_v3 {
- margin-left: 22px;
- }
-
- .section_phonetic ol.lst.lst_v3 li,.section_phonetic ol.lst.lst_v3 li .lst_txt {
- padding-bottom: 0;
- }
-
- .section_phonetic .lst .inner_lst {
- padding-left: 0;
- padding-bottom: 0;
- }
-
- .section_phonetic .lst .lst_txt .pin {
- margin-left: 0;
- }
-
- .detail_hj .section.section_ideographic h5 {
- font-size: 1.62em;
- color: currentColor;
- }
-
- .section_ideographic .entry {
- margin-bottom: 0;
- font-weight: 400;
- }
-
- .section_ideographic .lst.lst_v3 {
- padding-bottom: 13px;
- }
-
- .section_ideographic .lst.lst_v3 .inner_lst,.section_ideographic .lst.lst_v3 .inner_lst .lst_txt {
- padding-bottom: 0;
- }
-
- .section_ideographic .lst.lst_v2.lst_v3 {
- margin-left: 10px;
- padding-bottom: 10px;
- }
-
- .section_ideographic .lst.lst_v2.lst_v3 .inner_lst {
- padding-left: 0;
- }
-
- .section_box .section_ideographic .pin {
- color: var(--color-font-grey);
- margin: 1px 0 3px 10px;
- }
-
- .top_dn {
- padding-top: 4px;
- zoom: 1;
- }
-
- .top_dn:after {
- display: block;
- height: 0;
- visibility: hidden;
- clear: both;
- }
-
- .top_dn dd,.top_dn dt {
- float: left;
- font-size: 1em;
- line-height: 1.19;
- }
-
- .top_dn dt {
- margin: 0 5px 8px 0;
- padding: 0 4px;
- border: 1px solid #d8dfef;
- border-radius: 1px;
- background-color: #fafbfd;
- line-height: 0.88;
- }
-
- .top_dn dt .blind {
- visibility: visible;
- position: static;
- width: auto;
- height: auto;
- color: #778cab;
- }
-
- .top_dn dd .jp,.top_dn dt .jp {
- font-size: 1.23em;
- }
-
- .top_dn.top_dn_v2 {
- clear: both;
- padding-top: 0;
- }
-
- .top_dn.top_dn_v2 dd {
- color: #777;
- }
-
- .top_dn .top_dt4 {
- margin-left: 14px;
- }
-
- .top_dt,.top_dt2,.top_dt3,.top_dt4 {
- position: relative;
- top: -1px;
- display: inline-block;
- min-width: 21px;
- min-height: 13px;
- text-align: center;
- }
-
- .top_dt2 {
- clear: both;
- }
-
- .top_dn .top_dt3,.top_dn .top_dt4 {
- border-color: #ededed;
- background-color: #fff;
- }
-
- .top_dn .top_dt3 .blind,.top_dn .top_dt4 .blind {
- color: #9da1a8;
- }
-
- .top_dn .bar {
- margin: 0 4px;
- }
-
- .srch_box .top_dn:last-child {
- padding-bottom: 10px;
- }
-
- .srch_box .srch_top .entry .jp {
- font-size: 1.46em;
- letter-spacing: -1px;
- }
-
- .srch_result .top_dn dd {
- overflow: hidden;
- position: relative;
- top: -2px;
- max-width: 85%;
- white-space: nowrap;
- }
-
- .srch_result .top_dn_v2 dd {
- top: 0;
- }
-
- .spot_area .top_dn.top_dn_v2 dd em.ps2 {
- display: inline-block;
- margin-left: 7px;
- }
-
- .srch_result .top_dn_v2 .ft_col3 {
- top: -2px;
- }
-
- .dt {
- margin: 0 10px;
- border: 1px solid #ebebeb;
- background-color: #f7f7f7;
- }
-
- .dt .wh,.dt li:first-child {
- background: 0 0;
- }
-
- .dt .tb {
- display: table;
- width: 100%;
- overflow: hidden;
- }
-
- .dt li {
- display: table-cell;
- width: 33%;
- }
-
- .dt .wh {
- width: 100%;
- }
-
- .dt li a {
- display: inline-block;
- width: 100%;
- padding: .6em 0 .5em;
- color: var(--color-font-grey);
- font-size: 1.23em;
- }
-
- .dt li a em {
- font-size: .89em;
- }
-
- .dt li .on {
- color: currentColor;
- font-weight: 700;
- }
-
- .dt li .on em {
- color: #e51313;
- }
-
- .spi_wrap {
- margin: 0 auto;
- padding: 20px 0 0;
- }
-
- .detail_hj .spi_wrap,.detail_jpkr .spi_wrap,.detail_krjp .spi_wrap {
- padding: 10px 0;
- }
-
- .module_handwriting_wrap {
- position: fixed;
- z-index: 50000;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- font-size: 1.00em;
- line-height: normal;
- }
-
- .module_handwriting_content {
- position: absolute;
- z-index: 10;
- left: 0;
- right: 0;
- bottom: 0;
- }
-
- .module_handwriting_ico {
- display: inline-block;
- overflow: hidden;
- color: transparent;
- vertical-align: top;
- font-size: 0;
- text-indent: -100px;
- background-repeat: no-repeat;
- background-size: 50px 20px;
- }
-
- .module_handwriting_top {
- position: relative;
- height: 39px;
- padding-left: 15px;
- border-top: 1px solid rgba(0,0,0,.15);
- background: rgba(0,0,0,.5);
- }
-
- .module_handwriting_close {
- display: inline-block;
- height: 39px;
- padding: 0 3px;
- border: 0;
- background: 0 0;
- color: #fff;
- line-height: 2.44;
- font-size: 1.15em;
- }
-
- .module_handwriting_selector {
- position: absolute;
- top: 0;
- right: 18px;
- bottom: 0;
- padding-right: 14px;
- }
-
- .module_handwriting_selector>select {
- height: 39px;
- padding: 0;
- border: 0;
- background: 0 0;
- color: #00d741;
- vertical-align: top;
- font-size: 1.15em;
- appearance: none;
- }
-
- .module_handwriting_selector>select::-ms-expand {
- display: none;
- }
-
- .module_handwriting_selector .module_handwriting_ico {
- position: absolute;
- top: 16px;
- right: 0;
- width: 10px;
- height: 7px;
- background-position: -30px -13px;
- }
-
- .srch_nodata .top_area h4 {
- padding: 12px 10px;
- border-bottom: 1px solid #f9f9f9;
- font-size: 1.31em;
- color: currentColor;
- font-weight: 400;
- }
-
- .srch_nodata .top_area .jp {
- font-size: 1.15em;
- }
-
- .srch_nodata .top_area p {
- padding: 12px 10px 25px;
- font-size: 1.15em;
- }
-
- .srch_nodata .top_area p>a {
- display: block;
- width: auto;
- min-width: 10px;
- margin-top: 5px;
- color: #2173c8;
- text-decoration: underline;
- }
-
- .srch_nodata .view_ctrl {
- padding-bottom: 32px;
- }
-
- .srch_nodata .top_h {
- font-size: 1.15em;
- padding: 0 0 11px 10px;
- }
-
- .srch_nodata .top_h2 {
- padding: 18px 0 9px 10px;
- border-top: 2px solid #b8b8b8;
- font-size: 1.15em;
- }
-
- .srch_nodata .txt_info {
- margin: 0 11px;
- background: #f7f7f7;
- }
-
- .srch_nodata .txt_info .srch_box {
- padding: 12px 10px 11px 14px;
- }
-
- .srch_nodata .resize p.text {
- display: none;
- }
-
- .srch_nodata .srch_box .pin {
- padding-bottom: 3px;
- }
-
- .srch_nodata .srch_box .pin .lst_txt {
- position: relative;
- top: 0;
- margin-left: 5px;
- }
-
- .srch_nodata .srch_box dt {
- font-size: 1.38em;
- }
-
- .srch_nodata .srch_box dt .jp {
- font-size: 1.46em;
- }
-
- .srch_nodata .srch_box dl a {
- color: #005fca;
- }
-
- .srch_nodata .srch_box dd {
- margin-top: 3px;
- font-size: 1.15em;
- line-height: 1.13;
- color: currentColor;
- }
-
- .srch_nodata .srch_box .origin2 {
- margin-left: 4px;
- font-size: 1.15em;
- color: #888;
- }
-
- .srch_nodata .entry strong {
- font-weight: 400;
- }
-
- .srch_nodata .section_sptrans h4 .blind {
- font-size: 1.23em;
- }
-
- .srch_nodata .more_list {
- padding: 12px 10px 11px 14px;
- }
-
- .srch_nodata .srch_box+.more_list {
- border-top: 1px solid #eaeaea;
- }
-
- .srch_nodata .tbl_lst li {
- overflow: hidden;
- margin-bottom: 2px;
- font-size: 1.23em;
- white-space: nowrap;
- }
-
- .srch_nodata .tbl_lst li>span:first-child {
- margin-right: 5px;
- }
-
- .srch_nodata .tbl_lst a {
- color: var(--color-brand);
- }
-
- .srch_nodata .tbl_lst .jp {
- font-size: 1.31em;
- }
-
- .srch_nodata .srch_box ol {
- list-style: decimal;
- margin-left: 16px;
- }
-
- .srch_nodata .srch_box>ol {
- margin-left: 22px;
- }
-
- .srch_nodata .srch_box ol>li {
- margin-bottom: 3px;
- text-indent: -6px;
- line-height: 1.13;
- }
-
- .tts_wrap {
- display: inline-block;
- line-height: 0;
- }
-
- .btn_tts {
- padding: 0 5px 0 6px;
- background: #fff;
- border: 1px solid #d8d8d8;
- font-size: 1.00em;
- color: #6c6c6c;
- line-height: 1.19;
- }
-
- .ly_wrap {
- position: absolute;
- left: 0;
- right: 0;
- }
-
- .ly_tts_desc {
- position: relative;
- display: inline-block;
- padding: 8px 12px;
- background: #fffef0;
- border: 1px solid #c3c1a2;
- text-align: left;
- z-index: 50;
- }
-
- .ly_tts_desc .title {
- display: block;
- font-size: 1.08em;
- line-height: 0.94;
- font-weight: 700;
- color: #11c948;
- }
-
- .ly_tts_desc .text {
- margin-top: 3px;
- padding: 0;
- font-size: 1.15em;
- line-height: 1.13;
- letter-spacing: -.075em;
- color: currentColor;
- }
-
- .tts_wrap .btn_close {
- position: absolute;
- overflow: hidden;
- top: 0;
- right: 0;
- width: 29px;
- height: 29px;
- background-size: 29px auto;
- border: 0;
- font-size: 0;
- color: transparent;
- }
-
- .txt_origin,.txt_origin a {
- color: #767676;
- }
-
- .srch_box .srch_top .tts_wrap {
- line-height: 0;
- }
-
- .txt_origin {
- padding: 0 10px 10px 0;
- text-align: right;
- font-size: 1.08em;
- }
-
- .container {
- background-color: #e6e6e6;
- }
-
- .btn_txt_style1.info_userent {
- padding: 5px 0;
- line-height: 1.00;
- }
-
- .btn_txt_style1.info_userent .ico {
- padding-left: 6px;
- background-position: 6px -18px;
- }
-
- .userentry_word .con_clt .ask .pop_clt {
- left: -68px;
- }
-
- .userentry_word .entry_dn {
- display: block;
- position: relative;
- min-height: 40px;
- overflow: hidden;
- }
-
- .userentry_word .entry_opendic li.first {
- border-top: none;
- }
-
- .userentry_word .mean {
- font-weight: 700;
- color: currentColor;
- }
-
- .userentry_word .exam {
- font-size: 1.15em;
- line-height: 1.75;
- color: #777;
- }
-
- .userentry_word .exam .player {
- vertical-align: top;
- }
-
- .userentry_word .vota .like {
- margin-right: 5px;
- color: #3882cf;
- }
-
- .userentry_word span.num {
- padding-right: 4px;
- font-weight: 700;
- word-wrap: break-word;
- }
-
- .btn_regist {
- display: inline-block;
- position: relative;
- height: 27px;
- padding: 0 20px 0 12px;
- border: 1px solid #3a3f4c;
- border-radius: 5px;
- font-size: 1.00em;
- line-height: 1.69;
- color: #2a303b;
- background: #fff;
- background: gradient(linear,0 0,0 100%,from(#fdfdfd),to(#f2f2f2));
- }
-
- .btn_regist .ico {
- position: absolute;
- top: 50%;
- right: 8px;
- width: 6px;
- height: 10px;
- margin-top: -5px;
- background-position: -45px -31px;
- }
-
- .usen_another .usen_all {
- padding: 0;
- }
-
- .usen_another .usen_all .ab,.usen_another .usen_all .more_ico.userentry {
- position: relative;
- display: inline-block;
- }
-
- .usen_another .usen_all .ab {
- padding-right: 4px;
- }
-
- .openword_none,.usen_all {
- padding: 0 14px;
- }
-
- .usen_another .usen_all .more_ico.userentry {
- right: 0;
- }
-
- .usen_another .more_ico {
- display: inline-block;
- width: 6px;
- height: 10px;
- margin: -2px 0 0 4px;
- background-position: -44px 0;
- vertical-align: middle;
- }
-
- .userentry_section {
- border-bottom: 1px solid #ccc;
- }
-
- .quiz_cont {
- z-index: 70;
- }
-
- .shortcut_ico2 {
- margin-left: 7px;
- }
-
- .section_banner {
- margin-top: 10px;
- }
-
- .banner_opendic {
- padding: 10px 0;
- background: #e7e7e7;
- margin-top: -1px;
- z-index: 1;
- position: relative;
- }
-
- .banner_opendic .inner {
- display: block;
- padding: 17px 0 0 11px;
- box-sizing: border-box;
- color: #fff;
- height: 145px;
- background-size: cover;
- }
-
- .banner_opendic .inner .cont_wrap {
- position: relative;
- display: block;
- max-width: 320px;
- margin: 0 auto;
- }
-
- .section_box.kor_food .food_desc .image_wrap img,.section_box.kor_food .section .image_wrap img {
- max-width: 100%;
- max-height: 400px;
- vertical-align: top;
- }
-
- .banner_opendic .inner .tit {
- font-size: 1.38em;
- font-weight: 500;
- letter-spacing: -1px;
- line-height: 1.50;
- }
-
- .banner_opendic .inner .tit em {
- display: inline-block;
- background: #44d26d;
- padding: 0 2px;
- line-height: 1.25;
- }
-
- .banner_opendic .inner .dsc {
- display: block;
- font-size: 1.00em;
- color: #e9e8e8;
- letter-spacing: -1px;
- margin-top: 6px;
- }
-
- .banner_opendic .inner .logo {
- width: 60px;
- height: 60px;
- position: absolute;
- right: 10px;
- top: 6px;
- }
-
- .banner_opendic .btn_openbanner {
- width: 100%;
- position: absolute;
- left: 0;
- bottom: 10px;
- }
-
- .banner_opendic .btn_openbanner:after {
- display: block;
- clear: both;
- }
-
- .banner_opendic .btn_openbanner a {
- display: block;
- width: 50%;
- color: #fff;
- float: left;
- height: 40px;
- line-height: 2.50;
- font-size: 1.00em;
- text-align: center;
- }
-
- .banner_opendic .btn_openbanner .btn_view {
- overflow: hidden;
- }
-
- .section_box.kor_food .section {
- padding: 30px 0 10px;
- border-bottom: 1px solid #d5d5d5;
- }
-
- .section_box.kor_food .section .image_wrap {
- position: relative;
- padding: 15px 15px 5px;
- }
-
- .section_box.kor_food .section .image_wrap .image_area {
- text-align: center;
- }
-
- .section_box.kor_food+.userentry_section {
- border-top: none;
- }
-
- .section_box.kor_food ul.lst .inner_lst {
- padding: 0 15px;
- }
-
- .section_box.kor_food ol.lst .inner_lst {
- padding: 0 15px 0 0;
- }
-
- .section_box.kor_food .lst li .lst_txt {
- font-size: 1.23em;
- }
-
- .section_box.kor_food .lst li .lst_txt+p {
- margin-top: 20px;
- }
-
- .section_box.kor_food .lst li>p {
- margin-top: 10px;
- padding-bottom: 12px;
- }
-
- .section_box.kor_food .lst li>p .ico_bl+span {
- margin-right: 10px;
- }
-
- .section_box.kor_food .lst li>p .player {
- position: relative;
- margin-left: -5px;
- }
-
- .section_box.kor_food .lst li>p .kor {
- display: block;
- margin-top: -3px;
- color: var(--color-font-grey);
- }
-
- .detail_jpkr .section_box.kor_food ol.lst li .cen_box2 {
- margin: 17px 0 0 -15px;
- }
-
- .section_box .section .source {
- display: block;
- padding: 8px 15px 20px;
- font-size: 0.92em;
- text-align: right;
- color: #aaa;
- word-wrap: normal;
- }
-
- .section_box .section .source a {
- color: #aaa;
- }
-
- .section_box.kor_food .food_desc {
- border-top: 9px solid #f0f0f0;
- border-bottom: 9px solid #f0f0f0;
- }
-
- .section_box.kor_food .food_desc .section_tit {
- height: 40px;
- padding: 0 12px;
- border-bottom: 1px solid #ebebeb;
- line-height: 2.56;
- font-size: 1.23em;
- color: #444;
- }
-
- .section_box.kor_food .food_desc .image_wrap {
- position: relative;
- padding: 20px 15px 15px;
- }
-
- .section_box.kor_food .food_desc .image_wrap:after {
- display: block;
- position: absolute;
- bottom: 0;
- left: 3px;
- right: 2px;
- content: '';
- height: 1px;
- background-size: 4px 1px;
- background-size: 4px 1px;
- background-repeat: repeat-x;
- }
-
- .section_box.kor_food .food_desc .image_wrap .image_area {
- position: relative;
- text-align: center;
- }
-
- .blind,.u_hc,.u_skip {
- position: absolute;
- overflow: hidden;
- }
-
- .section_box.kor_food .food_desc .mean_wrap {
- padding: 19px 14px 0;
- border-bottom: 1px solid #e5e5e5;
- }
-
- .section_box.kor_food .food_desc .mean_wrap .mean {
- font-size: 1.15em;
- line-height: 1.25;
- }
-
- .section_box.kor_food .food_desc .mean_wrap .mean+.mean {
- margin-top: 13px;
- }
-
- .section_box.kor_food .food_desc .mean_wrap .mean[lang=ja] {
- font-size: 1.31em;
- line-height: 1.38;
- }
-
- .section_box.kor_food .food_desc .mean_wrap .source {
- display: block;
- padding: 15px 0 20px;
- font-size: 0.92em;
- text-align: right;
- color: #aaa;
- }
-
- .sc2,.ts {
- text-align: center;
- }
-
- .section_box.kor_food .food_desc .mean_wrap .source a {
- color: #aaa;
- }
-
- .ts,.ts a {
- color: #fff;
- }
-
- .u_hc,.u_skip {
- visibility: hidden;
- left: -999em;
- width: 0;
- height: 0;
- font-size: 0;
- line-height: 0;
- }
-
- #ct:after,.blind,.hc {
- height: 1px;
- }
-
- .blind {
- width: 1px;
- margin: -1px;
- }
-
- .writer_content {
- min-height: 100%;
- position: relative;
- }
-
- .writer_header.totop {
- margin-top: -44px;
- }
-
- #ct {
- clear: both;
- width: 100%;
- background-color: #fff;
- }
-
- #ct:after {
- display: block;
- clear: both;
- margin-top: -1px;
- }
-
- #ct.main {
- background-color: #f2f2f2;
- }
-
- #ct.drawing {
- position: fixed!important;
- bottom: 0;
- }
-
- .hc {
- overflow: hidden;
- position: absolute;
- width: 1px;
- margin: -1px;
- }
-
- #ct,.lg,.ts {
- position: relative;
- }
-
- .sc,.sc2 .it,.ts {
- width: 100%;
- }
-
- .a .bgselected,.a strong {
- font-weight: 700;
- }
-
- .nc {
- display: none;
- }
-
- input[type=search]::search-cancel-button {
- display: none;
- }
-
- .ts {
- z-index: 110;
- height: 44px;
- border-bottom: 1px solid #01af34;
- background-color: #03c73c;
- }
-
- .lg {
- line-height: 0.63;
- }
-
- #ct,.lg {
- z-index: 70;
- }
-
- .sc,.sc2 {
- position: relative;
- z-index: 1;
- }
-
- .ts .h_a {
- position: relative;
- }
-
- .ts .h_a:first-child {
- vertical-align: -1px;
- }
-
- .sc2 {
- height: 35px;
- padding: 8px 91px 8px 10px;
- background: #01b536;
- transform: none;
- }
-
- .sc2 .sc_box,.sc2 .sc_box2 {
- display: block;
- overflow: hidden;
- height: 35px;
- padding: 1px 30px 1px 6px;
- background-color: #fff;
- box-sizing: border-box;
- box-sizing: border-box;
- }
-
- .sc2 .sc_box2 {
- margin: 0 44px 0 5px;
- text-align: left;
- }
-
- .sc2 .it {
- border: 0;
- font-size: 1.38em;
- line-height: 2.06;
- border-radius: 0;
- appearance: none;
- }
-
- .sbt3 {
- position: absolute;
- top: 13px;
- right: 96px;
- z-index: 99;
- width: 22px;
- height: 22px;
- background-position: -7px -117px;
- border: none;
- }
-
- .m_tab,.m_tab_l,.m_tab_l .tab_lb {
- position: relative;
- }
-
- .m_tab {
- display: table;
- width: 100%;
- background: #f9f9f9;
- text-align: center;
- border-bottom: 1px solid #e0e0e0;
- }
-
- .m_tab_l {
- display: table-cell;
- width: 20%;
- vertical-align: top;
- }
-
- .m_tab_l .tab_lb {
- display: inline-block;
- vertical-align: middle;
- min-width: 25px;
- max-width: 150px;
- padding: 12px 3px 8px;
- font-size: 1.08em;
- line-height: 1.06;
- color: #444;
- word-wrap: break-word;
- }
-
- .m_tab_on .tab_lb,.m_tab_on2 .tab_lb:after {
- color: #01b536;
- }
-
- .m_tab_on .tab_lb:after,.m_tab_on2 .tab_lb:after {
- display: block;
- position: absolute;
- left: 0;
- right: 0;
- bottom: -1px;
- height: 2px;
- background-color: #03c73c;
- }
-
- .m_tab_a {
- display: block;
- height: 100%;
- }
-
- .write_lst2,.write_lst2 a {
- height: 30px;
- letter-spacing: -1px;
- }
-
- .m_tab_on2 .m_tab_a {
- background-position: 50% -360px;
- }
-
- .m_tab_l:first-child .m_tab_a:after {
- display: none;
- }
-
- .write_lstw2,.write_lstw3 {
- width: 100%;
- margin: 0;
- background: #fff;
- }
-
- .write_lstw3 .write_lst2 {
- float: left;
- width: 50%;
- margin-left: -1px;
- border-right: 1px solid #e9e9e9;
- }
-
- .write_lst2 {
- border-bottom: 1px solid #e9e9e9;
- background-color: #fff;
- font-size: 1.23em;
- line-height: 1.88;
- }
-
- .write_lst2:nth-child(2n) {
- margin-left: 0;
- border-right: 0;
- }
-
- .write_lst2 a {
- display: block;
- overflow: hidden;
- padding: 0 12px;
- white-space: nowrap;
- }
-
- .write_closew {
- clear: both;
- top: -1px;
- height: 35px;
- padding: 0 10px;
- border-top: 1px solid #e9e9e9;
- border-bottom: 1px solid var(--color-font-grey);
- background-color: #f0f0f0;
- font-size: 1.15em;
- line-height: 2.19;
- text-align: right;
- }
-
- .write_close {
- padding-right: 13px;
- color: var(--color-font-grey);
- }
-
- .recent_searches {
- position: relative;
- z-index: 1;
- background: #fff;
- }
-
- .recent_searches h2 {
- padding: 0 15px;
- height: 39px;
- border-bottom: 1px solid #f9f9f9;
- line-height: 2.44;
- font-size: 1.08em;
- color: #7f8498;
- }
-
- .recent_searches .btn_wrap {
- overflow: hidden;
- padding: 0 0 0 14px;
- background: #fcfcfc;
- border-top: 1px solid #e9edef;
- border-bottom: 1px solid #e9edef;
- }
-
- .recent_item .add_word select,.recent_searches .btn_wrap .btn_all_save select {
- border: 0;
- z-index: 10;
- text-indent: -999em;
- vertical-align: top;
- appearance: none;
- }
-
- .recent_searches .btn_wrap [class^=btn_] {
- position: relative;
- float: left;
- line-height: 2.44;
- font-size: 1.00em;
- color: #828a93;
- }
-
- .recent_searches .btn_wrap .btn_all_del:after {
- display: inline-block;
- margin: 13px 10px 0;
- width: 1px;
- height: 12px;
- background-color: #e6e7e7;
- vertical-align: top;
- }
-
- .recent_searches .btn_wrap .btn_all_save select {
- position: absolute;
- left: 0;
- right: 0;
- top: 0;
- bottom: 0;
- display: inline-block;
- background: 0 0;
- border-radius: 0;
- }
-
- .recent_searches .btn_wrap .btn_cls {
- float: right;
- position: relative;
- padding: 0 14px;
- border: none;
- border-left: 1px solid #f1f4f5;
- background: 0 0;
- }
-
- .recent_searches .no_item {
- width: 100%;
- line-height: 1.31;
- padding-bottom: 31px;
- font-size: 1.15em;
- color: #bfc6d4;
- text-align: center;
- }
-
- .recent_searches .no_item:before {
- display: block;
- width: 50px;
- height: 50px;
- margin: 30px auto 9px;
- background-position: -45px -45px;
- }
-
- .recent_list {
- overflow: hidden;
- position: relative;
- background-color: #fff;
- }
-
- .recent_item {
- display: block;
- position: relative;
- min-height: 26px;
- line-height: 1.63;
- padding: 6px 32px 6px 14px;
- border-top: 1px solid #f9f9f9;
- }
-
- .recent_item .add_word,.recent_item .btn_cls {
- position: absolute;
- top: 7px;
- width: 25px;
- height: 25px;
- }
-
- .recent_item:first-child {
- border-top: none;
- }
-
- .recent_item .recent_word a {
- color: #0361c2;
- font-size: 1.23em;
- }
-
- .recent_item .recent_word[lnag=zh] a {
- font-size: 1.38em;
- }
-
- .recent_item .add_word {
- right: 40px;
- background-position: -20px -45px;
- }
-
- .recent_item .add_word select {
- display: inline-block;
- width: 25px;
- height: 25px;
- background: 0 0;
- border-radius: 0;
- }
-
- .ly_alert,.recent_item.added .add_word {
- display: none;
- }
-
- .recent_item .btn_cls {
- right: 9px;
- border: 0;
- background-position: -20px -20px;
- cursor: pointer;
- }
-
- .recent_item.added .recent_word a {
- color: currentColor;
- word-wrap: break-word;
- }
-
- .h3w,.h_word,.h_word_dd {
- position: relative;
- }
-
- .alert_add_word p {
- width: 100%;
- height: 37px;
- line-height: 2.31;
- border-radius: 1px;
- background-color: rgba(0,0,0,.8);
- font-size: 1.08em;
- color: #fff;
- text-align: center;
- }
-
- .btn,.h_word {
- background: #f6f6f6;
- }
-
- .st1 {
- color: #ed1b23;
- }
-
- .st2 {
- color: #1172b6;
- }
-
- .st3 {
- color: #32a800;
- }
-
- .tx1 {
- color: currentColor;
- }
-
- .tx2 {
- color: var(--color-font-grey);
- }
-
- .tx3 {
- color: #909090;
- }
-
- .tx4,.tx4 a {
- color: #fff;
- }
-
- .tx5 {
- color: #333;
- }
-
- .tx6,.tx6 a {
- color: #0068b1;
- }
-
- .tx7 {
- color: #888;
- }
-
- .tx8 {
- color: #999;
- }
-
- .fz11 {
- font-size: 0.85em;
- }
-
- .fz12 {
- font-size: 0.92em;
- }
-
- .fz13 {
- font-size: 1.00em;
- }
-
- .fz14 {
- font-size: 1.08em;
- }
-
- .fz15 {
- font-size: 1.15em;
- }
-
- .fz16 {
- font-size: 1.23em;
- }
-
- .fz17 {
- font-size: 1.31em;
- }
-
- .fz22 {
- font-size: 1.69em;
- }
-
- .fz24 {
- font-size: 1.85em;
- }
-
- .fwn {
- font-weight: 400;
- }
-
- .h_word {
- clear: both;
- padding: 25px 10px 30px;
- border-bottom: 1px solid #e3e3e3;
- zoom: 1;
- }
-
- .h_word2 {
- float: left;
- width: 100%;
- margin-top: -1px;
- margin-bottom: 2px;
- }
-
- .h_word3 {
- display: table;
- table-layout: fixed;
- width: 100%;
- }
-
- .h_word:after {
- display: block;
- height: 0;
- font-size: 0;
- visibility: hidden;
- clear: both;
- }
-
- .h_word_dt {
- padding: 0 2px 4px 0;
- font-size: 2.69em;
- line-height: 3.13;
- }
-
- .h_word_dt a {
- display: inline-block;
- font-weight: 700;
- }
-
- .h_word_dt2 {
- display: table-cell;
- overflow: hidden;
- font-size: 3.08em;
- font-weight: 700;
- line-height: 2.88;
- }
-
- .col4,.col5,.h_word_cht,.more_b,.more_b2,.sc_e_h,.word_h3,.word_h4,.word_w4 strong {
- font-weight: 400;
- }
-
- .h_word_dd {
- top: 2px;
- padding-right: 10px;
- font-size: 1.38em;
- line-height: 1.94;
- letter-spacing: -1px;
- vertical-align: super;
- }
-
- .h_word_cht,.read {
- vertical-align: top;
- }
-
- .h_word_dd2 {
- overflow: hidden;
- margin-right: 5px;
- font-size: 1.23em;
- color: var(--color-font-grey);
- }
-
- .h_word_cht {
- font-size: 2.69em;
- color: var(--color-font-grey);
- }
-
- .btn {
- margin: 4px 0;
- }
-
- .btn_a {
- display: inline-block;
- height: 14px;
- margin: 0 3px 0 0;
- padding: 0 3px;
- border: 1px solid #e5e4e4;
- background: #e3e3e3;
- font-size: 0.85em;
- line-height: 0.94;
- color: var(--color-font-grey);
- }
-
- .p_read {
- display: block;
- margin: 10px 36px 0 0;
- word-break: break-all;
- }
-
- .listen_area,.read {
- display: inline-block;
- }
-
- .p_read .dicsp {
- margin-left: -2px;
- }
-
- .read {
- height: 21px;
- margin-left: 7px;
- color: var(--color-font-grey);
- }
-
- .ir_v1 {
- background-position: 100% -460px;
- }
-
- .dicl,.dicl_repeat,.dicl_tts {
- display: inline-block;
- vertical-align: top;
- overflow: hidden;
- width: 20px;
- height: 19px;
- background-position: 0 0;
- white-space: nowrap;
- text-indent: 100%;
- color: transparent;
- }
-
- .dicl_tts {
- background-position-x: -25px;
- }
-
- .dicl.dicl_v2 {
- background-size: 100px 100px;
- background-size: 100px 100px;
- }
-
- .listen_area {
- vertical-align: middle;
- background: #fff;
- border: 1px solid #e6e6e6;
- }
-
- .listen_area .btn_listen:before,.listen_area:after {
- display: block;
- content: '';
- }
-
- .listen_area:after {
- clear: both;
- }
-
- .listen_area .btn_listen:before {
- position: absolute;
- width: 1px;
- height: 9px;
- top: 50%;
- left: 0;
- background: #e6e6e6;
- transform: translate(0,-50%);
- }
-
- .dicl.on,.dicl_repeat.on,.dicl_tts.on,.exap .btn_listen .dicl.on,.exap .btn_listen .dicl_repeat.on,.exap .btn_listen .dicl_tts.on {
- background-position-y: -25px;
- }
-
- .listen_area .btn_listen:first-child:before {
- display: none;
- }
-
- .listen_area .btn_listen {
- position: relative;
- float: left;
- }
-
- .h_word .btn_listen {
- padding: 5px 9px;
- }
-
- .h_word .btn_listen:first-child {
- padding-right: 10px;
- }
-
- .h_word .dicl,.h_word .dicl_repeat,.h_word .dicl_tts {
- width: 20px;
- height: 17px;
- background-position: -50px 0;
- }
-
- .h_word .dicl_tts {
- background-position-x: -75px;
- }
-
- .h_word .dicl_repeat {
- background-position-x: -100px;
- }
-
- .exap .listen_area {
- margin-left: 10px;
- }
-
- .exap .btn_listen {
- padding: 4px 9px 4px 10px;
- line-height: 0.75;
- }
-
- .exap .btn_listen:first-child {
- padding-left: 11px;
- }
-
- .exap .btn_listen:last-child {
- padding-right: 11px;
- }
-
- .exap .btn_listen .dicl,.exap .btn_listen .dicl_repeat,.exap .btn_listen .dicl_tts {
- width: 14px;
- height: 12px;
- background-position: -125px 0;
- }
-
- .exap .btn_listen .dicl_tts {
- background-position-x: -150px;
- }
-
- .exap .btn_listen .dicl_repeat {
- background-position-x: -175px;
- }
-
- .exap .btn_listen .dicl.loading,.exap .btn_listen .dicl_repeat.loading,.exap .btn_listen .dicl_tts.loading {
- background-size: 16px auto;
- background-size: 16px auto;
- width: 16px;
- margin: 0 -1px;
- }
-
- .exap .read {
- margin-left: 10px;
- }
-
- .dicl.loading,.dicl_repeat.loading,.dicl_tts.loading {
- background-size: 16px auto;
- background-size: 16px auto;
- }
-
- .pron_wrap {
- position: relative;
- }
-
- .listen_info {
- position: absolute;
- top: 0;
- right: 0;
- }
-
- .btn_listen_info {
- position: absolute;
- overflow: hidden;
- top: 0;
- right: -4px;
- padding: 7px;
- background: 0 0;
- border: 0;
- }
-
- .btn_listen_info:before {
- display: block;
- width: 18px;
- height: 18px;
- background-size: 188px auto;
- background-size: 188px auto;
- content: '';
- }
-
- .ly_listen_info {
- position: absolute;
- top: 30px;
- right: -5px;
- width: 184px;
- padding: 15px 18px 12px;
- background: #fffef1;
- border: 1px solid #c3c1a4;
- font-size: 1.08em;
- line-height: 1.13;
- color: #222;
- z-index: 30;
- }
-
- .ly_listen_info .dicl,.ly_listen_info .dicl_tts {
- margin-bottom: 8px;
- }
-
- .ly_listen_info .dicl_tts {
- margin-top: 17px;
- }
-
- .listen_info .btn_close {
- position: absolute;
- overflow: hidden;
- top: 0;
- right: 0;
- padding: 10px;
- border: 0;
- background: 0 0;
- font-size: 0;
- line-height: 0;
- color: transparent;
- }
-
- .listen_info .btn_close:before {
- width: 12px;
- height: 12px;
- display: block;
- background-size: 188px auto;
- background-size: 188px auto;
- content: '';
- }
-
- .p_read .read_word {
- margin-right: 4px;
- font-size: 1.38em;
- color: var(--color-font-grey);
- vertical-align: middle;
- }
-
- .word_a,.word_r,.word_w {
- vertical-align: top;
- }
-
- .p_read span:first-child {
- margin-left: 0;
- }
-
- .ic_close,.ic_op {
- padding-right: 15px;
- }
-
- .word_fs {
- font-size: 2.86em;
- }
-
- .word_fs2 {
- padding-top: 23px;
- font-size: 2.5em;
- line-height: 2.50;
- }
-
- .word_fs3 {
- font-size: 1.08em;
- }
-
- .word_olst {
- clear: both;
- position: relative;
- border-top: 1px solid #e2e2e2;
- padding: 25px 0;
- }
-
- .word_olst:first-child {
- border-top: none;
- }
-
- .word_h {
- font-size: 1.23em;
- line-height: 1.44;
- letter-spacing: -1px;
- }
-
- .word_olw .words {
- display: block;
- line-height: 1.31;
- }
-
- .word_olw .exp {
- display: block;
- margin-top: 8px;
- font-size: 1.08em;
- line-height: 1.19;
- color: var(--color-font-grey);
- letter-spacing: -1px;
- }
-
- .word_olw .exp .dicsp {
- margin-left: -2px;
- }
-
- .word_olw .exp>span {
- position: relative;
- top: -2px;
- }
-
- .word_l {
- display: block;
- float: left;
- margin: 4px 8px 0 0;
- font-size: 1.23em;
- }
-
- .word_a,.word_btn,.word_r2,.word_w2 {
- display: inline-block;
- }
-
- .word_bd {
- border-bottom: 1px solid #e7e7e7;
- }
-
- .word {
- clear: both;
- padding: 0 13px;
- letter-spacing: -1px;
- border-top: 1px solid #e7e7e7;
- }
-
- .userentry_word .word {
- border-top: 0;
- }
-
- .word_h3 {
- padding: 32px 0 22px;
- font-size: 1.38em;
- letter-spacing: -1px;
- }
-
- .word_h4 {
- padding: 0 0 8px;
- font-size: 1.23em;
- line-height: 1.13;
- color: currentColor;
- }
-
- .word_p {
- overflow: hidden;
- clear: both;
- margin: 0 0 24px;
- }
-
- .word_w {
- font-size: 1.54em;
- line-height: 1;
- color: #0068b1;
- }
-
- .word_r {
- width: auto;
- overflow: hidden;
- }
-
- .word_w2 {
- font-size: 1.1em;
- line-height: 1.5;
- color: var(--color-brand);
- vertical-align: baseline;
- }
-
- .word_yiti {
- font-size: 1.08em;
- color: currentColor;
- }
-
- .word_w3 {
- font-size: 1.2em;
- }
-
- .word_w4 {
- font-size: 1.23em;
- color: #0068b1;
- }
-
- .word_w5 {
- font-size: 1.38em;
- color: #0068b1;
- }
-
- .word_r2 {
- font-size: 1.1em;
- vertical-align: top;
- }
-
- .word_dv {
- margin: 0 6px;
- font-size: 1.54em;
- color: #ccc;
- }
-
- .word_o_lst,.word_otr_h2 {
- color: var(--color-font-grey);
- display: block;
- }
-
- .word_btn {
- position: absolute;
- top: 30px;
- right: 0;
- width: auto;
- height: 1.36em;
- padding-left: .45em;
- border: 1px solid #bcbcbc;
- font-size: .93em;
- line-height: 1.36em;
- }
-
- .word_lst {
- margin-bottom: 1em;
- }
-
- .word_lst .dicsp {
- margin-left: -2px;
- }
-
- .word_o {
- margin: 0;
- padding: 0 0 0 1em;
- }
-
- .word_o_lst {
- position: relative;
- margin-bottom: 2px;
- padding-left: 15px;
- line-height: 1.25;
- font-size: 1.08em;
- }
-
- .word_o_l {
- display: block;
- position: absolute;
- top: 0;
- left: 0;
- }
-
- .word_otr_h2 {
- margin-bottom: 5px;
- font-size: 1.00em;
- }
-
- .word_dv2,.word_k2 {
- display: inline-block;
- }
-
- .word_oa_kr {
- font-size: 1.08em;
- }
-
- .word_lstw2 li,.word_lstw4 li,.word_oa_zh {
- font-size: 1.23em;
- }
-
- .word_lstw2 {
- overflow: hidden;
- clear: both;
- margin: -1px 0 16px;
- }
-
- .word_lstw2 li {
- float: left;
- width: 50%;
- margin-bottom: 11px;
- line-height: 1.4em;
- }
-
- .word_lstw2 li:nth-child(2n+1) {
- overflow: hidden;
- clear: both;
- }
-
- .word_lstw4 {
- overflow: hidden;
- clear: both;
- margin: -1px 0 16px;
- }
-
- .word_lstw4 li {
- float: left;
- width: 33%;
- margin-bottom: 11px;
- line-height: 1.4em;
- }
-
- .word_k {
- font-size: 1.08em;
- }
-
- .word_k2 {
- margin-bottom: 6px;
- font-size: 1.29em;
- color: #0068b1;
- }
-
- .more,.more2 {
- font-size: 1.00em;
- }
-
- .word_lstw3 {
- padding: 2px 0 15px;
- }
-
- .word_lstw3 li {
- position: relative;
- margin-bottom: 16px;
- }
-
- .word_dv2 {
- margin: 0 8px;
- color: #ccc;
- }
-
- .more,.more2,.word_mg2,.word_mg3 {
- display: block;
- }
-
- .word_mg {
- position: relative;
- top: 1px;
- vertical-align: baseline;
- }
-
- .word_mg2 {
- margin-right: 10px;
- }
-
- .word_mg3 {
- margin-left: 10px;
- }
-
- .word_mg4 {
- margin-bottom: 5px;
- }
-
- .more {
- text-align: right;
- margin: 0;
- }
-
- .more2 {
- width: 100%;
- min-height: 45px;
- background: #eeeff0;
- line-height: 2.81;
- text-align: center;
- }
-
- .more:first-of-type {
- margin-top: -5px;
- }
-
- .more_b {
- font-size: 1.15em;
- color: currentColor;
- }
-
- .more_b2 {
- font-size: 1.23em;
- color: #0068b1;
- }
-
- .more_c {
- padding: 18px 10px 15px;
- }
-
- .more_a,.more_d {
- text-align: right;
- }
-
- .main_p3,.more2 .more_a,.ts .lk {
- text-align: center;
- }
-
- .more_a .txt,.more_d .txt,.more_ico {
- display: inline-block;
- vertical-align: middle;
- }
-
- .more_d .more_ico,.more_d .txt,.word_h2_h,.word_h2_h strong {
- vertical-align: top;
- }
-
- .more_a .txt,.more_d .txt {
- margin-right: 5px;
- color: #888;
- }
-
- .more_d .more_ico {
- margin-top: 3px;
- }
-
- .more_d .txt.b {
- color: var(--color-brand);
- }
-
- .more_a .txt {
- color: currentColor;
- }
-
- .more_ico {
- width: 6px;
- height: 9px;
- background-position: 0 -60px;
- }
-
- .more2 .more_a {
- display: table;
- width: 100%;
- height: 45px;
- line-height: 1.13;
- }
-
- .more2 .more_a .txt {
- display: table-cell;
- padding: 5px;
- margin: 0;
- word-break: break-word;
- word-wrap: break-word;
- }
-
- .sc_e_a,.sc_r,.word_h2_h,.word_p4 .word_w2 {
- display: inline-block;
- }
-
- .more2 .more_a .more_ico {
- vertical-align: top;
- margin: 5px 0 0 5px;
- }
-
- .word_h2w,.word_h2w2 {
- position: relative;
- overflow: hidden;
- clear: both;
- padding: 6px 11px 6px 0;
- font-size: 1.2em;
- line-height: 1.50;
- letter-spacing: -1px;
- }
-
- .word_h2w {
- margin-bottom: 0.5em;
- border-bottom: 1px solid #b8b8b8;
- }
-
- .word_h2_h {
- margin-left: 3px;
- font-size: 1.08em;
- color: var(--color-font-grey);
- }
-
- .btnw {
- margin: 0;
- padding: 0 0 0 6px;
- }
-
- .word2 {
- clear: both;
- padding: 0 5px;
- letter-spacing: -1px;
- }
-
- .word2.conjugate .word_bd2 {
- padding-bottom: 15px;
- border-bottom: 1px solid #e7e7e7;
- }
-
- .word_bd4 {
- margin-bottom: -40px;
- padding-bottom: 0;
- }
-
- .word_bd5 {
- margin-bottom: 15px;
- padding-bottom: 28px;
- }
-
- .word_bd6 {
- border-top: 1px solid #e7e7e7;
- }
-
- .word_p3 {
- padding: 5px 0 0;
- }
-
- .word_grey {
- color: var(--color-font-grey);
- letter-spacing: -1px;
- }
-
- .word_p4 {
- padding-left: 10px;
- font-size: 1.23em;
- overflow: hidden;
- }
-
- .word_p4 a {
- float: left;
- height: 39px;
- margin: 0 10px 15px 0;
- }
-
- .word_p4 .word_w2 {
- margin-bottom: 5px;
- }
-
- .word_p2 {
- margin: 0;
- padding-left: 1em;
- font-size: 1em;
- color: var(--color-font-grey);
- line-height: 1.5;
- }
-
- .auto_link,.col5,.sc_e_p {
- font-size: 1em;
- }
-
- .col4,.col4 a {
- color: #f91207;
- }
-
- .sc_e {
- padding: 0 10px 27px;
- }
-
- .sc_e_p {
- padding-top: 29px;
- padding-bottom: 8px;
- letter-spacing: -1px;
- }
-
- .col4 {
- word-break: break-all;
- }
-
- .sc_e2_h,.sc_e_p2 {
- color: var(--color-font-grey);
- letter-spacing: -1px;
- }
-
- .sc_e_p2 {
- padding-top: 5px;
- }
-
- .sc_e2 {
- padding: 19px 10px 28px;
- }
-
- .sc_e2_h {
- padding-bottom: 4px;
- }
-
- .col5 {
- color: currentColor;
- word-break: break-all;
- }
-
- .sc_a,.sc_e_a {
- color: #0068b1;
- }
-
- .sc_e2_a,.sc_e2_a2 {
- padding-right: 10px;
- padding-left: 10px;
- color: #0068b1;
- letter-spacing: -1px;
- }
-
- .sc_e2_a2 {
- padding-left: 0;
- background: 0 0;
- }
-
- .sc_e_m,.sc_e_m2 {
- overflow: hidden;
- margin: 7px 10px;
- background-color: #f7f7f7;
- }
-
- .sc_e_m {
- padding: 15px 20px 4px;
- }
-
- .sc_e_m2 {
- padding: 4px 0 4px 19px;
- }
-
- .sc_e_d {
- line-height: 1.50;
- letter-spacing: -1px;
- }
-
- .sc_e_l,.sc_e_l2 {
- width: 260px;
- line-height: 1.44;
- letter-spacing: -1px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
-
- .sc_e_dl {
- padding-bottom: 8px;
- }
-
- .sc_e_u {
- padding: 8px 0;
- }
-
- .sc_e_h {
- padding: 30px 10px 0;
- border-top: 1px solid #d8d8d8;
- font-size: 1.08em;
- letter-spacing: -1px;
- }
-
- .sc_e_a,.sc_e_l,.sc_e_l2 {
- font-size: 1.23em;
- }
-
- .sc_e_l {
- margin-bottom: 3px;
- }
-
- .sc_e_l2 {
- margin-bottom: 6px;
- }
-
- .sc_e_t {
- margin-bottom: 4px;
- letter-spacing: -1px;
- }
-
- .sc_e_a {
- margin-right: 10px;
- }
-
- .sc_a {
- margin-right: 11px;
- }
-
- .new_btjc {
- position: absolute;
- bottom: 0;
- width: 100%;
- z-index: 1000;
- }
-
- .new_btjc .btjc_con {
- position: relative;
- width: 300px;
- margin: 0 auto 12px;
- background: #252525;
- border: 1px solid #252525;
- border-radius: 5px;
- z-index: 9;
- }
-
- .new_btjc .btjc_con p {
- position: relative;
- min-height: 55px;
- padding: 14px 35px 27px 81px;
- margin-bottom: -12px;
- font-size: 1.08em;
- line-height: 1.13;
- color: #fff;
- text-shadow: 0 0 2px #1a1a1a;
- background-size: auto 12px;
- background-size: auto 12px;
- }
-
- .new_btjc .btjc_con p .bg_img {
- position: absolute;
- top: 16px;
- left: 16px;
- width: 55px;
- height: 55px;
- background-size: 55px 55px;
- background-size: 55px 55px;
- }
-
- .new_btjc .btjc_con p .txt_blue {
- color: #f9595d;
- }
-
- .new_btjc .btjc_con p .bg_move {
- display: inline-block;
- width: 17px;
- height: 17px;
- font-size: 0;
- vertical-align: 4px;
- background-size: 100px 75px;
- background-size: 100px 75px;
- }
-
- .atcpa,.ts .help_wrap,.ts .lk {
- vertical-align: middle;
- }
-
- .new_btjc .btjc_con .btn_close {
- position: absolute;
- display: block;
- top: 0;
- right: 0;
- width: 40px;
- height: 40px;
- background-size: 100px 75px;
- background-size: 100px 75px;
- }
-
- .new_btjc .btjc_con.krcn p .txt_blue {
- color: #618dec;
- }
-
- .new_btjc .btjc_con.android {
- width: 100%;
- margin: 0;
- background: #3a4555;
- border-radius: 0;
- border: none;
- }
-
- .new_btjc .btjc_con.android p {
- padding: 14px 55px 14px 85px;
- margin: 0;
- font-size: 1.00em;
- font-weight: 700;
- background: 0 0;
- text-shadow: none;
- }
-
- .new_btjc .btjc_con.android p strong {
- color: #86bf33;
- }
-
- .new_btjc .btjc_con.android p .bg_fav {
- display: inline-block;
- width: 14px;
- height: 16px;
- margin: 0 3px;
- background-size: 100px 75px;
- background-size: 100px 75px;
- vertical-align: middle;
- }
-
- .new_btjc .btjc_con.android p a {
- font-size: 0.92em;
- color: #fff;
- font-weight: 400;
- margin: 0 0 1px 5px;
- border-bottom: 1px solid #fff;
- }
-
- .main_p3 {
- padding: 15px 10px;
- border-bottom: 2px solid #ccc;
- font-size: 1.14em;
- }
-
- .write_lst {
- display: block;
- overflow: hidden;
- height: 32px;
- padding: 0 13px;
- border-bottom: 1px solid #dfdfdf;
- font-size: 1.23em;
- line-height: 2.00;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .write_em {
- color: #e51313;
- }
-
- .ts h1 {
- position: relative;
- height: 32px;
- padding: 6px 10px;
- border-bottom: 1px solid #01af34;
- background-color: #03c73c;
- color: #fff;
- }
-
- .ts .kiclo {
- display: block;
- position: absolute;
- }
-
- .ts .kiclo span {
- display: block;
- height: 100%;
- position: relative;
- visibility: visible;
- overflow: visible;
- width: auto;
- font-size: 1.08em;
- line-height: 0.88;
- letter-spacing: 1px;
- color: #fff;
- text-indent: 1px;
- font-weight: 400;
- }
-
- .ts .lk {
- display: inline-block;
- font-size: 1.54em;
- color: #fff;
- line-height: 2.00;
- }
-
- .atcpa,.hs .itw {
- line-height: 2.06;
- }
-
- .ts .help_wrap {
- position: relative;
- display: inline-block;
- margin-left: -4px;
- width: 20px;
- }
-
- .ts .help_wrap .help {
- display: inline-block;
- width: 20px;
- height: 20px;
- background-position: -40px -120px;
- }
-
- .ts .kiclo {
- padding: 8px 3px;
- top: 8px;
- right: 10px;
- width: auto;
- height: auto;
- }
-
- .ts .helpt,.ts .helpt_on {
- position: absolute;
- padding-top: 6px;
- z-index: 101;
- }
-
- .ts .helpt {
- display: none;
- top: 28px;
- left: 5px;
- }
-
- ._backPanel,._backPanel2,._backPanel3,.atcpa,.hs .itw,.kib .w_box,.ts .helpt_on {
- display: block;
- }
-
- .ts .helpt_on {
- top: 23px;
- left: -150px;
- }
-
- .ts .helpt_on .sbox {
- overflow: auto;
- width: 219px;
- padding: 10px 10px 10px 9px;
- border: 1px solid #999;
- border-top: 0;
- background: #fff;
- color: #222;
- font-size: 1.00em;
- letter-spacing: -1px;
- text-align: justify;
- text-align: left;
- }
-
- .atcpa,.kib,.kib .canv {
- overflow: hidden;
- }
-
- .atcp,.atcpw,.hs {
- width: 100%;
- }
-
- .atcp {
- position: relative;
- z-index: 101;
- }
-
- .atcpw {
- position: absolute;
- left: 0;
- font-size: 1.15em;
- text-align: left;
- }
-
- .atcp .atcpw,.hs {
- position: relative;
- }
-
- .atcpw3 {
- border: 0;
- background: #fff;
- }
-
- .atcpli {
- height: 33px;
- border-bottom: 1px solid #dfdfdf;
- font-family: 'New Gulim','새굴림',Gulim,'굴림',sans-serif;
- }
-
- .a_no {
- border-bottom: 0;
- }
-
- .atcpa {
- height: 33px;
- padding: 0 13px;
- font-size: 1.08em;
- color: currentColor;
- letter-spacing: -1px;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .atcpsp {
- margin-right: 13px;
- font-size: 1.23em;
- color: currentColor;
- letter-spacing: 0;
- }
-
- .intru_hw,.intru_p2,.kib .butt a span,.u_hs .u_hssbt {
- letter-spacing: -1px;
- }
-
- .atcpem {
- color: #e51313;
- }
-
- ._backPanel2 {
- height: 264px;
- }
-
- ._backPanel1 {
- height: 132px;
- }
-
- .hs {
- z-index: 10;
- height: 51px;
- background: #01b536;
- }
-
- .hs .crlt,.hs .hssbt {
- position: absolute;
- border: 0;
- }
-
- .hs .hs_search {
- padding: 8px 118px 0 10px;
- }
-
- .hs .itw {
- height: 33px;
- padding: 1px 50px 1px 6px;
- background-color: #fff;
- }
-
- .hs.ki .hs_search {
- padding-right: 48px;
- }
-
- .hs.ki .crlt {
- top: 17px;
- right: 56px;
- }
-
- .hs .crlt {
- visibility: visible;
- z-index: 1;
- width: 18px;
- height: 18px;
- margin: 0;
- padding: 0;
- text-indent: -9999em;
- cursor: pointer;
- }
-
- .hs .hssbt {
- top: 8px;
- right: 10px;
- width: 37px;
- height: 35px;
- background-color: #02d23e;
- background-position: -40px 0;
- }
-
- .kib {
- position: relative;
- z-index: 999;
- padding-right: 109px;
- border-top: solid 1px #828282;
- }
-
- .kib .butt,.kib .pre,.kib .txt,.pop,.pop_close {
- position: absolute;
- }
-
- .jc2,.pop,.pop2,.wt {
- z-index: 99;
- }
-
- .kib .canv {
- height: 211px;
- background: #efefef;
- box-shadow: inset 0 0 10px #cfcfd1;
- box-shadow: inset 0 0 10px #cfcfd1;
- }
-
- .kib .txt {
- left: 6px;
- bottom: 7px;
- width: 186px;
- height: 26px;
- background-size: 200px 60px;
- }
-
- .kib .pre {
- top: 0;
- right: 55px;
- width: 53px;
- border-left: 1px solid #b5b5b5;
- }
-
- .kib .pre .ne,.kib .pre a {
- display: block;
- height: 52px;
- border-bottom: 1px solid #d8d8d8;
- background: #f4f4f4;
- line-height: 3.25;
- font-size: 1.43em;
- font-weight: 700;
- color: currentColor;
- text-align: center;
- }
-
- .kib .pre .page,.kib .pre .page2 {
- border: 0;
- border-bottom: 0;
- font-family: 'New Gulim','새굴림',Gulim,'굴림',Helvetica,sans-serif;
- font-size: 1.31em;
- }
-
- .kib .pre .page2 {
- line-height: 3.25;
- font-weight: 400;
- text-align: center;
- }
-
- .kib .pre .page .ne {
- margin: 0;
- padding: 0 11px 0 9px;
- border: 0;
- background-size: 40px 225px;
- background-size: 40px 225px;
- font-size: 1.23em;
- line-height: 3.25;
- font-weight: 400;
- }
-
- .font_b,.intru_h2,.intru_p,.intru_p2,.top_tab5 li,.words {
- font-weight: 700;
- }
-
- .kib .w_box {
- width: 53px;
- height: 52px;
- border-bottom: 1px solid #aeb0b6;
- background: #f4f4f4;
- }
-
- .kib .butt .del,.kib .butt .del2,.kib .butt .del3,.kib .butt .del4,.kib .butt a span {
- display: flex;
- height: 52px;
- line-height: 0.88;
- color: #fff;
- text-align: center;
- vertical-align: middle;
- }
-
- .han_box,ne {
- font-size: 1.23em;
- }
-
- .kib .butt {
- top: 0;
- right: 0;
- width: 55px;
- border-left: 1px solid #04a132;
- }
-
- .kib .butt .del,.kib .butt .del2,.kib .butt .del3,.kib .butt .del4 {
- display: flex;
- justify-content: center;
- align-items: center;
- font-size: 0.96em;
- border: 1px solid #05b337;
- border-width: 0 0 1px;
- background: #05c53d;
- }
-
- .kib .butt a span {
- font-size: 0.92em;
- box-align: center;
- box-pack: center;
- }
-
- .kib .butt .del {
- background-size: 26px 17px;
- background-size: 26px 17px;
- }
-
- .kib .butt .del.on {
- background-color: #05c53d;
- }
-
- .d .hs .hssbt {
- right: 6px;
- }
-
- .pop {
- top: 399px;
- width: 100%;
- }
-
- .pop_w {
- position: relative;
- padding: 13px;
- border: 1px solid #2e2e2e;
- background: #393939;
- line-height: normal;
- opacity: .95;
- }
-
- .pop_close {
- display: block;
- top: 8px;
- right: 8px;
- width: 23px;
- height: 22px;
- }
-
- .bti_down,.bti_up,.pop_down {
- position: absolute;
- height: 6px;
- }
-
- .pop_down {
- display: block;
- left: 40px;
- bottom: -6px;
- width: 10px;
- }
-
- .pop_sel {
- display: inline-block;
- background-color: #cdff74;
- line-height: 0.88;
- color: #999;
- }
-
- .pop_cn,.pop_p,.pop_py,.pop_word {
- display: block;
- }
-
- .pop_word {
- margin-bottom: 7px;
- font-size: 1.23em;
- line-height: 1.13;
- color: #fff;
- }
-
- .pop_cn {
- float: left;
- font-size: 1.38em;
- }
-
- .pop_p {
- margin-bottom: 5px;
- color: #999;
- }
-
- .pop2 {
- position: absolute;
- top: 399px;
- width: 100%;
- }
-
- .bti_down,.bti_up {
- display: block;
- width: 10px;
- }
-
- .u_hs,.wt {
- width: 100%;
- }
-
- .bti_up {
- top: -6px;
- left: 84px;
- }
-
- .bti_down {
- left: 85px;
- bottom: -6px;
- }
-
- .intru_hw {
- margin-top: 18px;
- padding: 0 10px;
- }
-
- .intru_h2 {
- font-size: 1.38em;
- line-height: 1.50;
- color: currentColor;
- }
-
- .intru_p,.intru_p2 {
- margin-top: 7px;
- color: #6d6d6d;
- text-align: left;
- font-size: 1.00em;
- line-height: 1.13;
- }
-
- .intru_lstw {
- margin: 14px 10px 0;
- padding-bottom: 18px;
- border-top: 1px solid #ddd;
- text-align: center;
- }
-
- .intru_lst {
- margin-top: 15px;
- }
-
- .intru_img {
- margin-top: 18px;
- }
-
- .intru_p2 {
- margin: 0;
- padding: 0 10px 82px;
- font-size: 1.00em;
- color: #a7a7a7;
- }
-
- .u_hs {
- position: relative;
- height: 39px;
- margin-bottom: -1px;
- background: #f3f739;
- }
-
- .u_hsft .u_hs,.u_hsmb0 {
- margin-bottom: 0;
- }
-
- .u_hsw {
- padding: 5px 38px 0 0;
- }
-
- .u_hs .u_itw {
- position: relative;
- height: 24px;
- padding: 4px 39px 0 6px;
- border: 1px solid #717104;
- background: #fff;
- box-shadow: inset 0 2px 2px #e5e5e5;
- box-shadow: inset 0 2px 2px #e5e5e5;
- }
-
- .u_hs .u_it {
- width: 100%;
- border: 0;
- font-size: 1.23em;
- border-radius: 0;
- appearance: none;
- }
-
- .u_clrt,.u_hs .u_hssbt {
- position: absolute;
- height: 30px;
- border: 0;
- }
-
- .u_hs .u_it.u_sd {
- color: #888;
- }
-
- .u_clrt {
- overflow: visible;
- top: -1px;
- right: 3px;
- width: 30px;
- margin: 0;
- padding: 0;
- background-position: 5px -405px;
- text-indent: -999em;
- cursor: pointer;
- }
-
- .u_hs .u_hssbt {
- top: 5px;
- background-color: #5dd668;
- font-size: 0.92em;
- line-height: 1.88;
- color: #fff;
- border-radius: 0;
- appearance: none;
- }
-
- .s .u_hs .u_hssbt {
- letter-spacing: -2px;
- text-indent: -2px;
- }
-
- .u_hs .u_hssbt_ss {
- right: 0;
- width: 39px;
- background-position: -42px -259px;
- }
-
- .u_hs .u_hssbt_us {
- right: 5px;
- width: 58px;
- background-position: 0 -327px;
- }
-
- .u_hs_nous .u_hsw {
- padding-right: 43px;
- }
-
- .u_hs_nous .u_hssbt_ss {
- right: 5px;
- }
-
- .u_hsft {
- padding: 8px 10px 6px;
- background: #fff;
- }
-
- .u_hsft .u_hs {
- background: #fff;
- }
-
- .u_hsft .u_itw {
- border-color: #cecece;
- box-shadow: none;
- box-shadow: none;
- }
-
- .u_hsft .u_hssbt {
- background-color: #f2f2f2;
- color: #777;
- }
-
- .u_hsft .u_hssbt_ss {
- background-position: -42px -293px;
- }
-
- .u_hsft .u_hssbt_us {
- background-position: 0 -361px;
- }
-
- .bd_no {
- border-bottom: 0;
- }
-
- .bd_t_no {
- border-top: 0;
- }
-
- .word_py {
- font-size: 1.23em;
- vertical-align: middle;
- }
-
- .dic_desc {
- clear: both;
- margin: 0 13px 40px;
- padding: 11px 14px 12px;
- color: #888;
- background: #eff0f1;
- line-height: 1.25;
- text-align: center;
- }
-
- .btjc2,.help {
- margin: 0 auto;
- }
-
- .dic_desc .green {
- color: #01b536;
- }
-
- .btjc {
- width: 100%;
- }
-
- .btjc2 {
- width: 299px;
- }
-
- .jc2 {
- position: fixed;
- left: 0;
- bottom: 0;
- width: 100%;
- height: 86px;
- border-top: 1px solid currentColor;
- border-bottom: 1px solid currentColor;
- background: #3a4555;
- }
-
- .header,.help,.set_lang {
- position: relative;
- }
-
- .header {
- z-index: 80;
- }
-
- .help {
- width: 50px;
- }
-
- .set_lang {
- clear: both;
- overflow: hidden;
- height: 25px;
- padding: 17px 20px;
- }
-
- .btn_add,.pop_txt,.pop_txt .arr_top,.u_ftst {
- position: absolute;
- }
-
- .set_lang label {
- padding-right: 12px;
- font-size: 1.00em;
- color: currentColor;
- }
-
- .set_lang .selec_wrap {
- display: inline-block;
- }
-
- .set_lang select {
- height: 25px;
- padding: 0 24px 0 6px;
- margin: 0;
- border: 1px solid #dedede;
- border-radius: 0;
- border-radius: 0;
- font-size: 1.08em;
- color: currentColor;
- line-height: 1.44;
- background-size: 18px 50px;
- background-size: 18px 50px;
- appearance: none;
- -moz-appearance: none;
- }
-
- .u_ftst {
- right: 20px;
- top: 19px;
- padding: 3px 3px 3px 20px;
- color: #333;
- background-size: 15px 15px;
- background-size: 15px 15px;
- font-family: Helvetica,sans-serif;
- font-size: 1.00em;
- line-height: 1.13;
- }
-
- .word_otr {
- padding: 15px 10px 3px;
- font-size: 1em;
- border-top: 1px solid #ccc;
- }
-
- .word_otr_h {
- display: block;
- margin-bottom: 7px;
- font-size: 1em;
- line-height: 1.5;
- }
-
- .word_otr_a {
- color: var(--color-brand);
- font-size: 1em;
- }
-
- .word_w3 .word_otr_a {
- font-size: 1em;
- }
-
- .word_otr_dv {
- margin: 0 6px;
- color: #ccc;
- }
-
- .word_otr_lst:after {
- display: block;
- clear: both;
- content: '';
- }
-
- .word_otr_lst li {
- float: left;
- height: 22px;
- line-height: 1.00;
- }
-
- .word_otr_lst .bl,.word_otr_lst.on span.bl {
- display: none;
- }
-
- .btn_add,.btn_open,.pop_txt,.word_otr_lst.on .bl,.word_otr_lst.on span.bl {
- display: inline-block;
- }
-
- .btn_open {
- height: 21px;
- width: 17px;
- margin-left: 8px;
- vertical-align: -3px;
- background-size: 38px 17px;
- background-size: 38px 17px;
- }
-
- .on .btn_open {
- background-position: -21px 0;
- }
-
- .word_otr.word_bd5 {
- padding: 18px 10px 3px;
- }
-
- .btn_add {
- top: 15px;
- right: 10px;
- background-size: 100px 80px;
- border: 0;
- appearance: none;
- z-index: 10;
- text-indent: -999em;
- border-radius: 0;
- }
-
- .pop_txt {
- top: 35px;
- right: 0;
- padding: 15px 16px 15px 17px;
- border: 1px solid #a5a8b0;
- background: #fff;
- font-size: 1.08em;
- color: #494b56;
- white-space: nowrap;
- border-radius: 1px;
- z-index: 20;
- }
-
- .pop_txt .arr_top {
- display: block;
- top: -7px;
- right: 10px;
- width: 12px;
- height: 8px;
- background-size: 100px 80px;
- }
-
- .top_tab5_v2 li,.word_select {
- position: relative;
- }
-
- .word_select_wrap {
- display: table-cell;
- width: 80px;
- text-align: right;
- vertical-align: middle;
- }
-
- .word_select {
- display: inline-block;
- }
-
- .word_select .word_btn {
- position: relative;
- top: 0;
- display: inline-block;
- height: auto;
- padding: 0;
- line-height: 1.50;
- border: 1px solid #bfc1c7;
- border-top: 1px solid #cccdd2;
- border-bottom: 1px solid #afb1bb;
- border-radius: 2px;
- background-size: 1px 34px;
- background-size: 1px 34px;
- }
-
- .word_select .word_btn span.tit {
- display: inline-block;
- padding: 0 6px 0 17px;
- font-size: 0.85em;
- font-weight: 700;
- color: #4d4f53;
- text-shadow: 0 -1px 0 #fff;
- background-size: 15px 32px;
- background-size: 15px 32px;
- vertical-align: top;
- font-family: '나눔고딕',NanumGothic,'굴림',Gulim,Helvetica,sans-serif;
- }
-
- .words,.words a {
- color: var(--color-brand);
- font-family: Helvetica,sans-serif;
- font-size: 1.23em;
- }
-
- .word_select .btn_add {
- top: 0;
- right: 0;
- width: 100%;
- height: 26px;
- background: 0 0;
- }
-
- .words {
- overflow: hidden;
- margin: 17px 5px 0 0;
- }
-
- .synonym_wrap {
- padding: 13px 0 2px;
- }
-
- .antonym,.synonym {
- margin-top: 7px;
- }
-
- .antonym .t,.synonym .t {
- font-size: 1.23em;
- color: #2caee5;
- }
-
- .antonym .mean,.synonym .mean {
- margin-left: 11px;
- font-size: 1.08em;
- color: var(--color-font-grey);
- }
-
- .antonym .t {
- color: #dd6356;
- }
-
- .top_tab5 li a {
- display: block;
- }
-
- .top_tab5 .un_bg {
- background: 0 0;
- }
-
- .top_tab5_v2 {
- border-bottom: 1px solid #c8c8c8!important;
- }
-
- .top_tab5_v2 li.on a {
- color: #4b8ffa!important;
- }
-
- .top_tab5_v2 .on:before {
- content: '';
- display: block;
- position: absolute;
- top: auto;
- left: 50%;
- bottom: -1px;
- width: 15px;
- height: 9px;
- margin-left: -7px;
- text-indent: -999px;
- background-size: 75px 550px;
- background-size: 75px 550px;
- }
-
- .top_tab5 li {
- display: table-cell;
- height: 16px;
- height: 33px;
- line-height: 2.06;
- text-align: center;
- background-size: 2px 16px;
- }
-
- .dsc_p,.p_num {
- line-height: 1.25;
- }
-
- .top_tab5 {
- display: table;
- width: 100%;
- height: 33px;
- border-bottom: 1px solid #80878e;
- background: #fcfcfc;
- background: gradient(linear,0 0,0 100%,from(#fcfcfc),to(#f7f7f7));
- }
-
- .top_tab5:after {
- display: block;
- clear: both;
- content: '';
- }
-
- .top_tab5 li {
- width: 25%;
- }
-
- .top_tab5 li:nth-child(1) {
- width: 22%;
- }
-
- .top_tab5 li:nth-child(2) {
- width: 24%;
- }
-
- .top_tab5 li:nth-child(3),.top_tab5 li:nth-child(4) {
- width: 27%;
- }
-
- .intro_box,.intro_sd {
- width: 100%;
- overflow: hidden;
- }
-
- .intro_area {
- padding: 0 11px;
- }
-
- .intro_sd {
- position: relative;
- }
-
- .intro_flk:after {
- content: '';
- clear: both;
- display: block;
- }
-
- .intro_box {
- float: left;
- padding: 17px 0 0;
- }
-
- .intro_box img {
- display: block;
- margin: 0 auto;
- }
-
- .dsc_p {
- overflow: hidden;
- margin-bottom: 10px;
- font-size: 1.15em;
- color: var(--color-font-grey);
- }
-
- .p_num {
- float: left;
- margin-right: 7px;
- font-size: 1.38em;
- color: #2f7bd6;
- }
-
- .font_b {
- display: block;
- }
-
- .pop_wrap {
- z-index: 100;
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background: rgba(0,0,0,.5);
- }
-
- .pop_layer {
- position: relative;
- top: 105px;
- width: 275px;
- height: 265px;
- margin: 0 auto;
- }
-
- .pop_layer .chk {
- position: absolute;
- z-index: 10;
- bottom: 13px;
- width: 100%;
- text-align: center;
- font-size: 0.85em;
- color: #79756e;
- }
-
- .con_clt,.con_clt .ask,.con_clt .txt_box1 {
- position: relative;
- }
-
- .pop_layer .chk input {
- width: 13px;
- height: 13px;
- border: 1px solid #777;
- vertical-align: middle;
- }
-
- .con_clt,.con_clt .txt_box1 {
- vertical-align: top;
- display: inline-block;
- }
-
- .con_clt .ask,.con_clt .ask .arr_top,.con_clt .ask .pop_clt a {
- background-size: 80px 80px;
- background-size: 80px 80px;
- }
-
- .con_clt {
- margin-left: 2px;
- line-height: 0;
- }
-
- .con_clt .txt_box1 {
- width: auto;
- height: auto;
- padding: 0 5px;
- border: 1px solid #d8d8d8;
- background: #fff;
- white-space: nowrap;
- }
-
- .con_clt .txt_box1 .hc {
- visibility: visible;
- overflow: visible;
- position: relative;
- left: 0;
- width: auto;
- height: auto;
- font-size: 1.00em;
- color: #6c6c6c;
- line-height: 1.19;
- }
-
- .con_clt .ask {
- display: inline-block;
- width: 20px;
- height: 20px;
- margin-left: 2px;
- background-position: -55px 0;
- vertical-align: middle;
- }
-
- .con_clt .ask a {
- display: block;
- width: 20px;
- height: 20px;
- }
-
- .con_clt .ask .pop_clt {
- display: inline-block;
- position: absolute;
- left: -49px;
- padding: 9px 20px 3px 12px;
- width: 180px;
- border: 1px solid #a5a8b0;
- background: #fff;
- font-size: 1.00em;
- color: #777;
- border-radius: 1px;
- z-index: 20;
- top: 29px;
- }
-
- .con_clt .ask .pop_clt p {
- padding-bottom: 7px;
- color: #777;
- font-size: 1.00em;
- line-height: 1.19;
- }
-
- .con_clt .ask .pop_clt a {
- display: block;
- position: absolute;
- top: 4px;
- right: 4px;
- background-position: 100% -45px;
- }
-
- .con_clt .ask .arr_top {
- display: block;
- position: absolute;
- top: 23px;
- left: 4px;
- width: 12px;
- height: 8px;
- background-position: -45px -45px;
- z-index: 20;
- }
-
- .con_clt .ask .arr_top.off,.con_clt .ask .pop_clt.off {
- display: none!important;
- }
-
- .h_word .con_clt {
- display: block;
- font-weight: 400;
- }
-
- .h_word .line_feed_ask {
- position: relative;
- }
-
- .h_word .line_feed_ask .pos_r {
- position: absolute;
- top: 0;
- right: 0;
- }
-
- .line_feed_ask {
- margin-top: 10px;
- }
-
- .line_feed_ask .layer_btn_ask {
- display: inline-block;
- margin-right: 3px;
- }
-
- .clt_yel .txt_box1 {
- border: none;
- background: 0 0;
- padding: 0 0 0 5px;
- font-size: 1.00em;
- line-height: 1.50;
- color: #333;
- }
-
- .clt_yel .txt_box1 .hc {
- line-height: 1.50;
- }
-
- .clt_yel .ask .arr_top {
- top: 23px;
- }
-
- .clt_yel .ask .pop_clt {
- top: 29px;
- }
-
- .clt_yel .ask {
- width: 23px;
- height: 25px;
- background-position: -52px 1px;
- }
-
- .clt_yel .ask a {
- width: 25px;
- height: 25px;
- }
-
- .layer_btn_ask {
- margin-left: 1px;
- }
-
- .layer_btn_ask .ask {
- margin-left: 0;
- }
-
- .layer_btn_ask .ask,.layer_btn_ask .ask>a {
- width: auto;
- }
-
- .clt_yel .ask .arr_top,.clt_yel .ask .pop_clt a,.layer_btn_ask.pos_b .ask .arr_top,.layer_btn_ask.pos_b .ask .pop_clt a {
- background-repeat: no-repeat;
- background-size: 15px 26px;
- }
-
- .clt_yel .ask .arr_top,.layer_btn_ask .ask .arr_top {
- overflow: hidden;
- left: 50%;
- margin-left: -6px;
- }
-
- .clt_yel .ask .pop_clt,.layer_btn_ask .ask .pop_clt {
- padding: 9px 27px 9px 13px;
- }
-
- .clt_yel .ask .pop_clt p,.layer_btn_ask .ask .pop_clt p {
- padding-bottom: 0;
- }
-
- .clt_yel .ask .pop_clt a,.layer_btn_ask.pos_b .ask .pop_clt a {
- display: block;
- position: absolute;
- top: 8px;
- right: 8px;
- width: 15px;
- height: 15px;
- background-position: 0 -11px;
- }
-
- .clt_yel .ask .arr_top,.layer_btn_ask.pos_b .ask .arr_top {
- width: 11px;
- height: 8px;
- background-position: 0 0;
- }
-
- .clt_yel .ask .pop_clt,.layer_btn_ask.pos_b .ask .pop_clt {
- width: 130px;
- border: 1px solid #ddd5aa;
- padding: 13px 24px 13px 13px;
- background-color: #fff8cf;
- font-size: 1.15em;
- line-height: 1.13;
- color: #49453c;
- }
-
- .clt_yel .ask .pop_clt p,.layer_btn_ask.pos_b .ask .pop_clt p {
- padding-bottom: 0;
- font-size: 1.15em;
- line-height: 1.13;
- color: #49453c;
- letter-spacing: -1px;
- }
-
- .websource {
- display: inline-block;
- padding-left: 4px;
- font-family: '돋움',dotum,Helvetica,sans-serif;
- font-size: 0.92em;
- color: #999;
- }
-
- .share_area {
- padding: 10px 0;
- border-top: 1px solid #ccc;
- text-align: center;
- }
-
- #naver_dic_audio_controller {
- display: block;
- }
-
- .mainw .help_on {
- top: 32px;
- left: 34px;
- }
-
- .mainw .help_on p {
- position: relative;
- padding-left: 10px;
- }
-
- .help_on {
- display: block;
- position: absolute;
- top: 28px;
- left: 5px;
- z-index: 101;
- padding-top: 6px;
- }
-
- .ic_ln,.shadow_view {
- left: 0;
- position: absolute;
- }
-
- .btn_txt_style1.info_userent .ico {
- background-size: 20px 16px;
- }
-
- .btn_txt_style1.info_userent {
- display: inline-block;
- position: absolute;
- top: 17px;
- right: 10px;
- width: auto;
- height: 27px;
- border: 1px solid #e8e9e9;
- background: #f6f6f6;
- vertical-align: top;
- }
-
- .btn_txt_style1.info_userent .hc {
- display: inline-block;
- position: relative;
- overflow: visible;
- width: auto;
- height: auto;
- min-width: 52px;
- padding: 6px 10px 0 0;
- font-size: 1.08em;
- line-height: 1.13;
- letter-spacing: -1px;
- color: #222;
- vertical-align: top;
- }
-
- .btn_txt_style1.info_userent+.srch_box {
- margin-top: 29px;
- }
-
- .btn_txt_style1.info_userent .ico {
- display: inline-block;
- width: 20px;
- height: 16px;
- margin: 6px 3px 0 10px;
- vertical-align: top;
- }
-
- .userentry_word .section {
- padding: 3px 0 0;
- }
-
- .userentry_word .spot_area {
- position: relative;
- padding: 18px 10px 20px;
- border-bottom: 1px solid #d9d9d9;
- background-color: #f6f6f6;
- }
-
- .userentry_word .spot_area h3 {
- display: block;
- top: 0;
- margin-bottom: 10px;
- font-size: 1.5em;
- font-weight: 700;
- line-height: 2.88;
- word-break: break-all;
- font-family: '나눔고딕',NanumGothic,'맑은 고딕','Malgun Gothic','돋움',Dotum,'굴림',Gulim,Helvetica,AppleGothic,sans-serif;
- }
-
- .userentry_word .spot_area .py {
- margin-bottom: 8px;
- padding-left: 2px;
- font-size: 1.29em;
- color: var(--color-font-grey);
- word-break: break-all;
- }
-
- .userentry_word .note {
- position: relative;
- margin-top: 10px;
- padding: 0 10px 0 32px;
- font-size: 1.08em;
- line-height: 1.25;
- color: #999;
- word-break: break-all;
- word-wrap: break-word;
- text-align: left;
- }
-
- .userentry_word .note .ico {
- position: absolute;
- top: 2px;
- left: 12px;
- display: inline-block;
- width: 17px;
- height: 17px;
- margin-right: 3px;
- background-size: 80px 80px;
- background-size: 80px 80px;
- }
-
- .userentry_word .btn_area {
- position: absolute;
- top: 10px;
- right: 10px;
- width: auto;
- text-align: right;
- }
-
- .userentry_word .entry_opendic li {
- padding: 15px 12px 20px;
- border-top: 1px solid #e2e2e2;
- word-break: break-all;
- word-wrap: break-all;
- }
-
- .userentry_word .entry_opendic li:first-child {
- border-top: none;
- }
-
- .userentry_word span.num {
- float: left;
- position: relative;
- top: 3px;
- width: 23px;
- line-height: 1.25em;
- font-size: 1.14em;
- vertical-align: top;
- }
-
- .userentry_word .mean_wrap {
- clear: both;
- margin-top: 10px;
- }
-
- .userentry_word .mean {
- display: block;
- overflow: hidden;
- font-size: 1.14em;
- line-height: 1.45em;
- letter-spacing: -1px;
- word-break: break-all;
- }
-
- .userentry_word .exam {
- padding: 2px 0 0 23px;
- word-break: break-word;
- }
-
- .userentry_word .exam .tel {
- display: block;
- margin: 8px 0 0;
- font-size: 1.14em;
- line-height: 1.31;
- overflow: hidden;
- padding: 5px 0 11px;
- font-weight: 700;
- color: var(--color-brand);
- font-family: Helvetica,sans-serif;
- }
-
- .userentry_word .exam .tel2 {
- display: block;
- margin: -7px 0 0;
- font-size: 1em;
- line-height: 1.35em;
- color: var(--color-font-grey);
- letter-spacing: -1px;
- }
-
- .userentry_word .user_info {
- position: relative;
- padding-top: 15px;
- font-size: 1.00em;
- color: #777;
- line-height: 1.00;
- }
-
- .userentry_word .user_info .bar {
- padding: 0 6px;
- color: #d2d2d2;
- }
-
- .userentry_word .user_info .date {
- font-size: 1.08em;
- color: #909090;
- }
-
- .userentry_word .vote {
- padding-top: 10px;
- }
-
- .userentry_word .vote .dislike,.userentry_word .vote .like {
- border: 1px solid #b6b6b6;
- border-radius: 3px;
- padding: 4px 7px 3px;
- font-weight: 700;
- font-size: 0.92em;
- }
-
- .userentry_word .vote .like {
- margin-right: 5px;
- color: #3882cf;
- }
-
- .userentry_word .vote .dislike {
- color: #777;
- }
-
- .userentry_word .vote .dislike a,.userentry_word .vote .like a {
- display: inline-block;
- overflow: hidden;
- width: 12px;
- height: 12px;
- margin-right: 5px;
- text-indent: 9999px;
- }
-
- .userentry_word .vote .like a {
- background-position: 0 0;
- }
-
- .userentry_word .vote .dislike a {
- position: relative;
- top: 2px;
- background-position: -23px 0;
- }
-
- .userentry_word .section2 .nav_sec {
- margin-top: -10px;
- }
-
- .userentry_word .section.ft_mod .exam,.userentry_word .section.ft_mod .mean,.userentry_word .section.ft_mod span.num {
- font-size: 1.54em;
- line-height: 1.56;
- }
-
- .usen_another {
- padding: 10px 10px 5px 12px;
- margin-bottom: 40px;
- color: currentColor;
- font-size: 1.08em;
- overflow: hidden;
- }
-
- .usen_another .btn_regist {
- position: relative;
- float: none;
- display: inline-block;
- margin-top: 10px;
- height: 27px;
- padding: 0 20px 0 12px;
- border: 1px solid #3a3f4c;
- border-radius: 5px;
- font-size: 1.00em;
- line-height: 1.69;
- color: #2a303b;
- background: #fff;
- background: gradient(linear,0 0,0 100%,from(#fdfdfd),to(#f2f2f2));
- }
-
- .usen_another .btn_regist .ico {
- position: absolute;
- top: 50%;
- right: 8px;
- margin-top: -5px;
- width: 6px;
- height: 10px;
- background-position: -45px -31px;
- }
-
- .usen_another .btn_regist.right {
- margin-left: 4px;
- }
-
- .usen_another .usen_all {
- position: relative;
- float: right;
- margin: 15px 0 0;
- text-align: right;
- color: #0068b1;
- }
-
- .usen_another .usen_all .ab {
- position: relative;
- display: inline-block;
- margin-right: 5px;
- font-size: 1.00em;
- vertical-align: middle;
- }
-
- .userentry_section {
- padding: 20px 10px 10px;
- border-top: 2px solid #cacaca;
- }
-
- .userentry_section .txt_box1 {
- display: inline;
- border: none;
- background: 0 0;
- padding: 0;
- font-size: 1.38em;
- font-weight: 700;
- line-height: 1;
- color: #333;
- vertical-align: middle;
- font-family: '나눔고딕',NanumGothic,'굴림',Gulim,Helvetica,sans-serif;
- }
-
- .ico_new,.userentry_section .more_ico {
- display: inline-block;
- vertical-align: top;
- }
-
- .userentry_section p.usen_word {
- margin-top: 18px;
- font-size: 1.08em;
- color: currentColor;
- }
-
- .userentry_section p.usen_word a {
- color: var(--color-brand);
- text-decoration: underline;
- }
-
- .userentry_section .more_whole {
- position: relative;
- height: 17px;
- margin: 6px 0 0;
- font-size: 1.08em;
- letter-spacing: 0;
- color: #0068b1;
- text-align: right;
- }
-
- .userentry_section .more_whole_lk {
- display: inline-block;
- font-size: 1.08em;
- font-weight: 700;
- color: #1172b6;
- }
-
- .userentry_section .more_ico {
- width: 6px;
- height: 10px;
- margin: 2px 0 0 4px;
- background-position: -44px 0;
- }
-
- .openword_none {
- margin: 10px 0;
- }
-
- .openword_none li {
- color: var(--color-font-grey);
- font-size: 1.08em;
- line-height: 1.81;
- }
-
- .openword_none li:first-child {
- padding: 2px 0 6px;
- }
-
- .openword_none li .btn_regist {
- display: inline-block;
- position: relative;
- height: 27px;
- padding: 0 20px 0 12px;
- margin-left: 9px;
- border: 1px solid #3a3f4c;
- border-radius: 5px;
- font-size: 1.00em;
- line-height: 1.69;
- color: #2a303b;
- background: #fff;
- background: gradient(linear,0 0,0 100%,from(#fdfdfd),to(#f2f2f2));
- }
-
- .openword_none li .btn_regist .ico {
- position: absolute;
- top: 50%;
- right: 8px;
- width: 6px;
- height: 10px;
- margin-top: -5px;
- background-position: -45px -31px;
- }
-
- .usen_all {
- display: inline-block;
- }
-
- .usen_all span {
- color: #0068b1;
- }
-
- .open_mean {
- margin-top: 18px;
- font-size: 1.08em;
- color: currentColor;
- font-weight: 700;
- }
-
- .open_mean .detail {
- position: relative;
- display: inline-block;
- padding-right: 8px;
- margin-left: 10px;
- color: #606060;
- font-size: 1.00em;
- font-weight: 400;
- }
-
- .open_mean .detail .arrow {
- position: absolute;
- top: 6px;
- right: 0;
- width: 4px;
- height: 6px;
- background-position: 0 -39px;
- }
-
- .userentry_section .user_info {
- font-size: 0.92em;
- margin: 8px 0 7px;
- color: #929191;
- }
-
- .userentry_section .user_info .bar {
- margin: 0 10px;
- }
-
- .bann_notice {
- position: relative;
- height: 41px;
- line-height: 2.56;
- padding: 0 34px 0 10px;
- background-color: #68696b;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- color: #fff;
- }
-
- .bann_notice .lst {
- font-size: 1.00em;
- color: #fff;
- }
-
- .bann_notice .close {
- position: absolute;
- right: 10px;
- top: 14px;
- width: 14px;
- height: 14px;
- background-position: -20px 0;
- font-size: 0;
- line-height: 0;
- color: transparent;
- }
-
- .ico_new {
- overflow: hidden;
- width: 13px;
- height: 13px;
- background-position: -80px 0;
- text-indent: 100%;
- white-space: nowrap;
- }
-
- .main .word_lst_a,.word_level {
- vertical-align: middle;
- }
-
- .common_tab_wrap {
- margin: 10px 7px 11px;
- background-color: #fff;
- box-shadow: 0 0 1px 0 rgba(228,228,228,1);
- box-shadow: 0 0 1px 0 rgba(228,228,228,1);
- }
-
- .common_tab_wrap .lst {
- overflow: hidden;
- margin-top: -1px;
- }
-
- .common_tab_wrap .lst li {
- float: left;
- width: 50%;
- height: 39px;
- line-height: 2.44;
- border-top: 1px solid #f3f3f3;
- }
-
- .common_tab_wrap .lst li:nth-child(even) {
- float: none;
- overflow: hidden;
- width: auto;
- border-left: 1px solid #f3f3f3;
- }
-
- .common_tab_wrap .lst li:nth-child(1),.common_tab_wrap .lst li:nth-child(2) {
- border-top: none;
- }
-
- .common_tab_wrap .lst li a {
- padding: 0 14px;
- font-size: 1.15em;
- color: #828282;
- }
-
- .common_tab_wrap .lst .ico_new {
- margin: 13px 0 0 -11px;
- }
-
- .section_card {
- background-color: #fff;
- margin: 0 7px 11px;
- box-shadow: 0 0 1px 0 rgba(228,228,228,1);
- box-shadow: 0 0 1px 0 rgba(228,228,228,1);
- }
-
- .section_card .home_tit {
- height: 40px;
- line-height: 2.50;
- padding: 0 14px;
- border-bottom: 1px solid #e8e8e9;
- }
-
- .section_card .home_tit h2 {
- font-size: 1.15em;
- color: currentColor;
- font-weight: 400;
- }
-
- .word_level {
- font-size: 1.15em;
- margin: 0 0 0 5px;
- color: var(--color-font-grey);
- }
-
- .word_mean {
- margin-top: 10px;
- font-size: 1.08em;
- color: #444;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
-
- .main .word_lstw {
- padding: 0;
- }
-
- .main .word_lst {
- height: 44px;
- padding: 13px 14px;
- margin: 0;
- border-top: 1px dashed #ececec;
- font-size: 0;
- }
-
- .main .word_lst:first-child {
- border-top: none;
- }
-
- .main .word_w2 {
- font-size: 1.2em;
- color: var(--color-brand);
- }
-
- .main .word_level {
- font-size: 1.2em;
- margin: 0 0 0 5px;
- color: var(--color-font-grey);
- vertical-align: top;
- }
-
- .main .word_mean {
- margin-top: 10px;
- font-size: 1.08em;
- color: #444;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
-
- .source span,.source span a {
- color: #b8b8b8;
- }
-
- .source {
- display: block;
- margin: 0 0 21px;
- text-align: right;
- }
-
- .source span {
- font-size: 0.92em;
- padding: 0 5px 0 0;
- }
-
- .word .banner_wrap {
- margin: 0 0 4px;
- }
-
- .word .banner_wrap .banner_cnkrdic {
- display: block;
- height: 43px;
- line-height: 2.69;
- border: 1px solid #e2e2e2;
- background: #fff;
- font-size: 1.08em;
- color: var(--color-font-grey);
- text-align: center;
- }
-
- .word .banner_wrap .banner_cnkrdic:after {
- display: inline-block;
- width: 20px;
- height: 20px;
- margin: 11px 0 0 7px;
- background-position: 0 -40px;
- vertical-align: top;
- content: '';
- }
-
- .ico_krword {
- position: relative;
- top: -1px;
- display: inline-block;
- width: 21px;
- height: 21px;
- margin: 0 0 0 5px;
- background-position: -55px -20px;
- vertical-align: top;
- }
-
- .banner_area a {
- display: block;
- background-color: #fff;
- }
-
- .banner_area .banner_inner {
- display: table;
- max-width: 320px;
- min-height: 110px;
- margin: 0 auto;
- }
-
- .banner_area .img,.banner_area .txt_area {
- display: table-cell;
- vertical-align: middle;
- }
-
- .banner_area .txt_area {
- width: auto;
- padding: 5px 10px 0;
- }
-
- .banner_area .img {
- width: 83px;
- height: 110px;
- padding-right: 10px;
- background-size: auto 110px;
- background-size: auto 110px;
- }
-
- .banner_area .tit {
- font-size: 1.31em;
- color: #1eb501;
- }
-
- .banner_area .txt {
- display: block;
- margin-top: 4px;
- font-size: 1.08em;
- line-height: 1.25;
- color: var(--color-font-grey);
- }
-
- .banner_area.quizcn a {
- background-color: #85bbd3;
- }
-
- .banner_area.quizcn .img {
- width: 107px;
- }
-
- .banner_area.quizcn .tit {
- font-size: 1.54em;
- line-height: 1.38;
- color: #fff;
- }
-
- .banner_area.quizcn .txt_area {
- padding: 28px 10px 0;
- vertical-align: top;
- }
-
- .banner_area.quizcn .btn {
- overflow: hidden;
- display: inline-block;
- margin-top: 8px;
- height: 24px;
- padding: 0 23px 0 6px;
- background-size: 19px 24px;
- background-color: #7aacc2;
- line-height: 1.56;
- color: #ddedf6;
- vertical-align: top;
- }
-
- .krcndic_down {
- position: fixed;
- bottom: 0;
- left: 0;
- right: 0;
- width: 100%;
- height: 70px;
- background-color: rgba(33,31,22,.5);
- z-index: 10;
- text-align: center;
- }
-
- .krcndic_down_link {
- display: inline-block;
- position: relative;
- z-index: 12;
- width: 100%;
- height: 70px;
- }
-
- .krcndic_down_link .txt {
- display: inline-block;
- margin-top: 15px;
- line-height: 2.50;
- color: #fff48e;
- }
-
- .krcndic_down_link .txt[lang=en] {
- font-size: 1.38em;
- }
-
- .krcndic_down_link .txt[lang=zh] {
- font-size: 1.23em;
- }
-
- .krcndic_down .ico_dicapp {
- display: inline-block;
- width: 56px;
- height: 48px;
- margin: 13px 6px 0 0;
- background-size: 56px 48px;
- vertical-align: top;
- }
-
- .krcndic_down_close {
- position: absolute;
- top: 0;
- right: 0;
- z-index: 13;
- display: block;
- overflow: hidden;
- width: 53px;
- height: 70px;
- }
-
- .krcndic_down .bu_x {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- width: 18px;
- height: 18px;
- margin: auto;
- font-size: 0;
- line-height: 0;
- color: transparent;
- background-size: 18px 18px;
- }
-
- .ico_kakaotalk,.ico_naverblog,.ico_share,.ico_sinaweibo,.ico_tencentweibo,.ico_twiter,.ico_wechat {
- display: inline-block;
- overflow: hidden;
- width: 34px;
- height: 34px;
- background-size: 275px 34px;
- text-indent: 100%;
- vertical-align: top;
- white-space: nowrap;
- }
-
- .ico_naverblog {
- background-position: 0 0;
- }
-
- .ico_wechat {
- background-position: -40px 0;
- }
-
- .ico_sinaweibo {
- background-position: -80px 0;
- }
-
- .ico_tencentweibo {
- background-position: -120px 0;
- }
-
- .ico_kakaotalk {
- background-position: -160px 0;
- }
-
- .ico_twiter {
- background-position: -200px 0;
- }
-
- .ico_share {
- background-position: -240px 0;
- }
-
- .share_service {
- padding: 14px 0 4px;
- text-align: center;
- font-size: 0;
- }
-
- .share_service_list {
- display: inline-block;
- }
-
- .share_service_list li:first-child {
- margin-left: 0;
- }
-
- .share_service_list li {
- display: inline-block;
- margin-left: 5px;
- }
-
- .main_offer {
- padding: 18px 15px 14px;
- }
-
- .a .main_offer {
- padding: 12px 10px 20px;
- }
-
- .main_h4 {
- font-size: 0.77em;
- color: #626161;
- }
-
- .main_p2,.main_p2 a {
- color: #999;
- }
-
- .main_p2 {
- font-size: 0.77em;
- line-height: 0.94;
- letter-spacing: 0;
- word-break: keep-all;
- word-wrap: break-word;
- }
-
- .labg {
- display: inline;
- background-color: #cdff74;
- color: currentColor;
- }
-
- .quiz_cont {
- position: relative;
- height: 156px;
- border: 10px solid #eff0f1;
- border-width: 10px 0;
- background-size: 40px 40px;
- background-size: 40px 40px;
- margin: 17px 0 0;
- }
-
- .quiz_cont .word_view {
- overflow: hidden;
- height: 130px;
- visibility: hidden;
- position: relative;
- }
-
- .quiz_cont .swipe-wrap {
- overflow: hidden;
- position: relative;
- }
-
- .quiz_cont .swipe-wrap>div {
- float: left;
- width: 100%;
- position: relative;
- }
-
- .quiz_cont .word_view .word_area {
- height: 130px;
- text-align: center;
- }
-
- .quiz_cont .word_view .word_area .tit_confuse {
- display: block;
- padding-top: 18px;
- font-size: 1.00em;
- font-weight: 400;
- color: #4e637e;
- }
-
- .quiz_cont .word_view .word_area .tit_confuse .count {
- font-family: HelveticaNeue,Helvetica,sans-serif;
- }
-
- .exfilter_guide,.exfilterset,.layer_shortcut,.shortcut {
- font-family: Helvetica,arial,AppleSDGothicNeo,sans-serif;
- }
-
- .quiz_cont .word_view .word_area .tit_confuse .count strong {
- font-weight: 400;
- }
-
- .quiz_cont .word_view .word_area .dsc_quiz {
- margin-bottom: 13px;
- padding-top: 23px;
- font-size: 1.23em;
- line-height: 1.31;
- color: #6b91a4;
- }
-
- .quiz_cont .word_view .word_area .versus {
- min-height: 23px;
- padding: 11px 15px;
- font-size: 1.46em;
- line-height: 1;
- font-weight: 700;
- color: #fff;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
-
- .quiz_cont .word_view .word_area .versus .txt_en {
- font-size: 1.62em;
- }
-
- .quiz_cont .word_view .word_area .versus .vs {
- font-weight: 400;
- font-size: 1.08em;
- color: #effbfe;
- }
-
- .quiz_cont .word_view .btn_quiz {
- display: inline-block;
- min-width: 93px;
- height: 28px;
- border: 1px solid #e1ebf1;
- border-radius: 30px;
- background: rgba(255,255,255,.1);
- font-size: 1.00em;
- line-height: 1.75;
- color: #fff;
- }
-
- .quiz_cont .paging {
- position: absolute;
- left: 0;
- bottom: 0;
- right: 0;
- height: 16px;
- padding-top: 10px;
- background: rgba(0,0,0,.05);
- text-align: center;
- }
-
- .quiz_cont .paging a {
- display: inline-block;
- width: 6px;
- height: 6px;
- margin-left: 1px;
- border-radius: 6px;
- background: #ccd1d9;
- font-size: 0;
- line-height: 0;
- color: transparent;
- vertical-align: top;
- }
-
- .quiz_cont .paging a:first-child {
- margin-left: 0;
- }
-
- .quiz_cont .paging a.on {
- background: #4f647f;
- }
-
- .quiz_cont~.ly_media {
- margin-top: 0;
- border-top: 0;
- }
-
- .layer_shortcut_arrow,.layer_shortcut_close .ico_x,.layer_shortcut_row .ico_arrowup,.shortcut_ico2 {
- display: inline-block;
- overflow: hidden;
- font-size: 0;
- text-indent: 100%;
- vertical-align: top;
- white-space: nowrap;
- }
-
- .shortcut_ico2 {
- background-size: 50px 14px;
- }
-
- .layer_shortcut_arrow,.layer_shortcut_close .ico_x,.layer_shortcut_row .ico_arrowup {
- background-size: 75px 21px;
- }
-
- .shortcut {
- margin-top: -6px;
- padding: 0 10px 20px;
- background: #f2f2f2;
- text-align: left;
- }
-
- .shortcut_click {
- display: block;
- overflow: hidden;
- position: relative;
- margin: 0 auto;
- padding: 11px 2px 9px 53px;
- min-height: 29px;
- border: 1px solid #dedede;
- background: #fcfcfc;
- font-size: 0;
- line-height: 0;
- }
-
- .shortcut_ico {
- position: absolute;
- top: 50%;
- left: 14px;
- margin-top: -15px;
- }
-
- .shortcut_ico2 {
- margin: 2px 0 0 7px;
- width: 13px;
- height: 13px;
- background-position: 0 0;
- }
-
- .shortcut_text {
- font-size: 0.85em;
- line-height: 0.81;
- color: var(--color-font-grey);
- }
-
- .shortcut_text2 {
- font-weight: 700;
- font-size: 1.00em;
- line-height: 1.06;
- color: #333;
- }
-
- .shortcut_text2_color {
- color: #00c73c;
- }
-
- .layer_shortcut {
- position: fixed;
- bottom: 0;
- width: 100%;
- z-index: 1000;
- text-align: left;
- }
-
- .layer_shortcut .inner {
- position: relative;
- width: 302px;
- margin: 0 auto 12px;
- }
-
- .layer_shortcut .inner:before {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- z-index: 10;
- background: #303030;
- opacity: .95;
- content: '';
- }
-
- .layer_shortcut_row {
- position: relative;
- z-index: 20;
- min-height: 61px;
- padding: 13px 25px 13px 84px;
- font-size: 1.15em;
- line-height: 1.25;
- color: #fff;
- }
-
- .layer_shortcut_row .ico_dict {
- position: absolute;
- top: 16px;
- left: 17px;
- }
-
- .layer_shortcut_row .text_color {
- color: #00ed47;
- }
-
- .layer_shortcut_row .ico_arrowup {
- width: 12px;
- height: 16px;
- margin: 0 6px 0 3px;
- background-position: -45px 0;
- }
-
- .layer_shortcut_close {
- position: absolute;
- display: block;
- top: 0;
- right: 0;
- z-index: 30;
- width: 38px;
- height: 42px;
- }
-
- .layer_shortcut_close .ico_x {
- width: 18px;
- height: 18px;
- margin: 12px 0 0 10px;
- background-position: -25px 0;
- }
-
- .layer_shortcut_arrow {
- position: absolute;
- left: 50%;
- bottom: -8px;
- z-index: 20;
- width: 14px;
- height: 8px;
- margin-left: -7px;
- background-position: -60px 0;
- }
-
- .btn_txt_style1.info_userent .ico2,.exfilter_guide_close,.exfilterset_list_bctchild .click_radio2,.exfilterset_list_examdesc .click_checkbox2,.exfilterset_list_hskchild .click_radio2,.exfilterset_list_levelchild .click_radio2,.word_h2w2_action .ico {
- display: inline-block;
- overflow: hidden;
- width: 0;
- height: 0;
- background-size: 95px 25px;
- text-indent: 100%;
- vertical-align: top;
- white-space: nowrap;
- }
-
- .btn_txt_style1.info_userent .ico2 {
- width: 18px;
- height: 16px;
- margin: 6px 2px 0 10px;
- background-position: 0 0;
- }
-
- .word_h2w2_action {
- display: inline-block;
- margin-top: 3px;
- vertical-align: top;
- cursor: pointer;
- }
-
- .word_h2w2_action .ico {
- width: 19px;
- height: 19px;
- margin-top: -1px;
- background-position: -20px 0;
- }
-
- .exfilterset .is_hide,.layer_exfilter .is_hide,.layer_exfilter.is_hide {
- display: none;
- }
-
- .exfilterset {
- margin-top: -1px;
- padding: 0 13px 23px;
- text-align: left;
- }
-
- .exfilterset~.word2 .word_lstw {
- padding-left: 7px;
-
- .word_lst {
- margin-bottom: 0;
- }
- }
-
- .exfilterset_list {
- position: relative;
- padding-top: 39px;
- }
-
- .exfilterset_list>dt {
- position: absolute;
- top: 0;
- text-align: center;
- }
-
- .exfilterset_list>dt .action {
- display: block;
- height: 37px;
- font-size: 1.15em;
- line-height: 2.31;
- color: #999;
- border: 1px solid #e5e4e4;
- cursor: pointer;
- }
-
- .exfilterset_list>dt .action.is_selected {
- border-color: #00c03a;
- background: #00c73c;
- color: #fff;
- }
-
- .exfilterset_list>dd {
- border: 1px solid #ededed;
- border-top: 0;
- background: #f8f8f9;
- }
-
- .exfilterset_list_level {
- width: 50%;
- left: 0;
- }
-
- .exfilterset_list_exam {
- width: 50%;
- right: 0;
- }
-
- .exfilterset_list_level em.action {
- border-right: 0;
- }
-
- .exfilterset_list_exam em.action {
- border-left: 0;
- }
-
- .exfilterset_list_leveldesc {
- padding: 20px 0 17px;
- }
-
- .exfilterset_list_examdesc {
- padding: 11px 0 17px;
- }
-
- .exfilterset_list_bctchild .click_text,.exfilterset_list_hskchild .click_text,.exfilterset_list_levelchild .click_text {
- font-size: 1.23em;
- line-height: 1.69;
- color: currentColor;
- }
-
- .exfilterset_list_levelchild {
- margin: 0 15px 0 -3px;
- }
-
- .exfilterset_list_bctchild,.exfilterset_list_hskchild {
- margin: 0 15px 0 1px;
- }
-
- .exfilterset_list_bctchild>li,.exfilterset_list_hskchild>li,.exfilterset_list_levelchild>li {
- display: inline-block;
- }
-
- .exfilterset_list_levelchild>li {
- margin-left: 23px;
- }
-
- .exfilterset_list_bctchild>li,.exfilterset_list_hskchild>li {
- margin: 9px 0 0 19px;
- }
-
- .exfilterset_list_hskchild>.item {
- display: block;
- }
-
- .exfilterset_list_bctchild .click,.exfilterset_list_hskchild .click,.exfilterset_list_levelchild .click {
- display: inline-block;
- cursor: pointer;
- }
-
- .exfilterset_list_bctchild .click,.exfilterset_list_hskchild .click {
- min-width: 70px;
- }
-
- .exfilterset_list_bctchild .click_radio,.exfilterset_list_examchild .click_checkbox,.exfilterset_list_hskchild .click_radio,.exfilterset_list_levelchild .click_radio {
- overflow: hidden;
- position: absolute;
- width: 1px;
- height: 1px;
- margin: -1px;
- clip: rect(0 0 0 0);
- }
-
- .exfilterset_list_bctchild .click_radio2,.exfilterset_list_hskchild .click_radio2,.exfilterset_list_levelchild .click_radio2 {
- width: 5px;
- height: 5px;
- margin: 10px 3px 0 0;
- background-position: 0 -20px;
- }
-
- .exfilterset_list_examchild {
- margin: 5px 0 0 20px;
- }
-
- .exfilterset_list_examchild .click {
- display: inline-block;
- cursor: pointer;
- line-height: 1.06;
- }
-
- .exfilterset_list_examchild .click_text {
- display: inline-block;
- margin: 6px 0 0 3px;
- font-size: 1.00em;
- color: #999;
- vertical-align: top;
- }
-
- .exfilterset_list_examchild .click_checkbox2 {
- width: 18px;
- height: 18px;
- margin-top: 5px;
- background-position: -40px 0;
- }
-
- .exfilterset_list_bctchild .click.is_checked .click_radio2,.exfilterset_list_hskchild .click.is_checked .click_radio2,.exfilterset_list_levelchild .click.is_checked .click_radio2 {
- background-position: -7px -20px;
- }
-
- .exfilterset_list_examchild .click.is_checked .click_checkbox2 {
- background-position: -60px 0;
- }
-
- .exfilterset_list_bctchild .click.is_checked .click_text,.exfilterset_list_examchild .click.is_checked .click_text,.exfilterset_list_hskchild .click.is_checked .click_text,.exfilterset_list_levelchild .click.is_checked .click_text {
- color: #00c73c;
- }
-
- .exfilterset2 {
- margin-left: -5px;
- padding: 52px 0 77px;
- text-align: center;
- }
-
- .exfilterset2_row {
- font-size: 1.15em;
- line-height: 1.38;
- color: #222;
- }
-
- .exfilterset2_click {
- display: inline-block;
- width: 170px;
- height: 30px;
- margin-top: 17px;
- padding-top: 11px;
- border: 1px solid #00c73c;
- font-size: 1.23em;
- line-height: 1.25;
- color: #00c73c;
- text-decoration: none!important;
- }
-
- .layer_exfilter {
- display: table;
- position: fixed;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- z-index: 100;
- width: 100%;
- height: 100%;
- text-align: center;
- }
-
- .layer_exfilter_inner {
- display: table-cell;
- vertical-align: middle;
- }
-
- .layer_exfilter_dimmed {
- position: fixed;
- top: -999px;
- left: 0;
- right: -999px;
- bottom: -999px;
- z-index: 30;
- background-color: rgba(0,0,0,.5);
- }
-
- .exfilter_guide {
- position: relative;
- z-index: 40;
- margin: 0 auto;
- width: 280px;
- min-height: 363px;
- background: #fff;
- text-align: left;
- }
-
- .exfilter_guide_title {
- height: 29px;
- padding: 11px 0 0 16px;
- background: #f1f3f4;
- font-size: 1.15em;
- line-height: 1.19;
- color: #767676;
- }
-
- .exfilter_guide_action {
- position: absolute;
- top: 0;
- right: 0;
- z-index: 40;
- padding: 12px 17px;
- cursor: pointer;
- }
-
- .exfilter_guide_close {
- width: 15px;
- height: 15px;
- background-position: -80px 0;
- }
-
- .exfilter_guide_menu {
- margin: 20px 17px 0;
- font-size: 0;
- white-space: nowrap;
- }
-
- .exfilter_guide_menu li {
- display: inline-block;
- width: 50%;
- }
-
- .exfilter_guide_menu .action {
- display: block;
- height: 37px;
- border: 1px solid #e2e2e2;
- font-size: 1.15em;
- line-height: 2.31;
- color: #222;
- text-align: center;
- letter-spacing: -1px;
- cursor: pointer;
- }
-
- .exfilter_guide_menu .item .action {
- padding-right: 1px;
- border-right: 0;
- }
-
- .exfilter_guide_menu .item2 .action {
- padding-left: 1px;
- border-left: 0;
- }
-
- .exfilter_guide_menu .action.is_selected {
- border: 1px solid #00c73c;
- background: #00c73c;
- color: #fff;
- }
-
- .exfilter_guide_article,.exfilter_guide_article2 {
- padding: 15px 22px 16px;
- }
-
- .exfilter_guide_article .list>dt:first-child,.exfilter_guide_article2 .list>dt:first-child {
- margin-top: 0;
- }
-
- .exfilter_guide_article .list>dt,.exfilter_guide_article2 .list>dt {
- margin-top: 16px;
- font-size: 1.08em;
- line-height: 1.50;
- color: #00c73c;
- }
-
- .exfilter_guide_article .list>dd,.exfilter_guide_article2 .list>dd {
- margin-top: 1px;
- font-size: 1.08em;
- line-height: 1.13;
- color: var(--color-font-grey);
- }
-
- @media all and (min-height:480px) {
- .exfilter_guide_article .list,.exfilter_guide_article2 .list {
- overflow: visible;
- max-height: none;
- }
- }
-
- .dimm_new {
- position: fixed;
- left: 0;
- top: 0;
- right: 0;
- bottom: 0;
- width: 100%;
- height: 100%;
- z-index: 9999;
- background-color: rgba(0,0,0,.8);
- }
-
- .ico_top {
- position: fixed;
- background-size: 41px 35px;
- background-size: 41px 35px;
- width: 41px;
- height: 35px;
- color: transparent;
- right: 11px;
- bottom: 15px;
- z-index: 2009;
- }
-
- .common_btn_wrap {
- background-color: #fff;
- margin: 19px 13px 40px;
- }
-
- .common_btn_wrap .btn_lst_more_show {
- display: block;
- width: 100%;
- height: 40px;
- background-color: #fff;
- border: 1px solid #e0e0e0;
- font-family: HelveticaNeue,Helvetica,sans-serif;
- cursor: pointer;
- text-align: center;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- color: currentColor;
- }
-
- .common_btn_wrap .btn_lst_more_show .ico_arrow {
- display: inline-block;
- vertical-align: middle;
- width: 13px;
- height: 7px;
- margin: 0 5px 0 0;
- background-size: 12px auto;
- background-size: 12px auto;
- }
-
- .common_btn_wrap .btn_lst_more_show .txt {
- display: inline-block;
- vertical-align: middle;
- line-height: 2.38;
- font-size: 1.08em;
- }
-
- .common_btn_wrap .btn_lst_more_show .num {
- display: inline-block;
- margin-left: 4px;
- font-size: 1.00em;
- font-weight: 400;
- vertical-align: middle;
- line-height: 2.38;
- color: var(--color-brand);
- }
-
- .common_btn_wrap .btn_lst_more_show .total_num {
- display: inline-block;
- line-height: 2.38;
- font-size: 1.00em;
- vertical-align: middle;
- color: #999;
- }
-
- .common_btn_wrap.nomore {
- margin: 19px 13px 0;
- }
-
- .common_btn_wrap.nomore .btn_lst_more_show {
- background-color: #f9f9f9;
- cursor: default;
- }
-
- .common_btn_wrap.nomore .btn_lst_more_show .num {
- color: #777;
- }
-
- p.left {
- margin: 0;
- }
-
- ol {
- padding-left: 1em;
- }
-
- .dicsp,
- .ico_krword,
- .m_tab,
- .info_userent,
- .quiz_cont,
- .search_vlive,
- .go_register,
- .section_banner,
- .ly_new_zhdict {
- display: none !important;
- }
-}
-
-.dictNaver-Entry-ja {
- position: relative;
- font-family: '나눔고딕',NanumGothic,'굴림',Gulim,Helvetica,Sans-serif;
-
- ul,ol {
- list-style: none;
- }
-
- table {
- border-collapse: collapse;
- }
-
- img {
- display: inline;
- }
-
- img,fieldset {
- border: 0;
- }
-
- a {
- color: currentColor;
- text-decoration: none;
- cursor: pointer;
- }
-
- label {
- cursor: pointer;
- }
-
- em,address {
- font-style: normal;
- }
-
- .blind,.u_hc {
- overflow: hidden;
- position: absolute;
- top: 0;
- left: -9999px;
- width: 0;
- height: 0;
- font-size: 0;
- line-height: 0;
- z-index: -1;
- }
-
- .it,textarea {
- border: 1px solid #bcbcbc;
- }
-
- .hc {
- visibility: hidden;
- overflow: hidden;
- position: absolute;
- left: -1000em;
- width: 0;
- height: 0;
- font-size: 0;
- line-height: 0;
- }
-
- .nc,hr {
- display: none !important;
- }
-
- .jp,.jap {
- font-family: HiraKakuProN-W3 !important;
- }
-
- .hs {
- position: relative;
- z-index: 1;
- width: 100%;
- height: 51px;
- background-color: #01B536;
- }
-
- .hs .hsw {
- padding: 8px 91px 0 10px;
- }
-
- .hs .hsw .clrt {
- width: 17px;
- height: 17px;
- background-position: -10px -120px;
- }
-
- .hs .clrt {
- top: 17px;
- right: 95px;
- }
-
- .hs .itw {
- display: block;
- height: 33px;
- padding: 1px 50px 1px 6px;
- background-color: #fff;
- }
-
- .hs .it {
- width: 100%;
- border: 0;
- font-size: 1.00em;
- font-family: HiraKakuProN-W3;
- border-radius: 0;
- -webkit-appearance: none;
- font-size: 1.13em;
- line-height: 2.06;
- }
-
- .a .hs .it {
- height: 24px;
- }
-
- .hs .it:focus {
- outline: 0;
- }
-
- .hs .hssbt {
- overflow: visible;
- position: absolute;
- top: 8px;
- right: 53px;
- width: 37px;
- height: 35px;
- border: 0;
- background-color: #02d23e;
- background-position: -40px 0px;
- }
-
- .hs .ipbt {
- position: absolute;
- top: 8px;
- right: 10px;
- width: 37px;
- height: 35px;
- background-color: #02d23e;
- background-position: -36px -112px;
- }
-
- .hs .ipbt.on {
- background-color: #02d23e;
- background-position: -71px -112px;
- }
-
- .atit {
- border-bottom-left-radius: 0 !important;
- border-bottom-right-radius: 0 !important;
- }
-
- .atcp {
- position: relative;
- z-index: 101;
- width: 100%;
- border-bottom: 1px solid #888;
- }
-
- .atcpw {
- width: 100%;
- font-size: 0.94em;
- text-align: left;
- }
-
- .atcpw2 {
- border: 1px solid var(--color-font-grey);
- border-top-color: #e8e8e8;
- background: #fff;
- }
-
- .atcpw2 ul {
- border-top: 1px solid #e8e8e8;
- }
-
- .atcpw2 ul.first {
- border-top: 0;
- }
-
- .atcpw2 li {
- border-top: 1px solid #f7f7f7;
- font-size: 1.14em;
- }
-
- .atcpw2 li:first-child {
- border-top: 0;
- }
-
- .atcpw2 li.subt {
- position: relative;
- }
-
- .atcpw2 li.subt .vi {
- display: inline-block;
- overflow: hidden;
- position: absolute;
- top: 0;
- left: 50%;
- width: 50%;
- padding: .45em 0;
- background-color: #fff;
- text-align: left;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .atcpw2 li a {
- display: block;
- overflow: hidden;
- padding: .45em .5em .45em .6em;
- color: currentColor;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .atcpw2 li a em {
- color: #e51313;
- }
-
- .atcpw3 {
- border: 0;
- background: #fff;
- }
-
- .atcpw3 .atcpa {
- padding-top: .7em;
- padding-bottom: .75em;
- }
-
- .atcpli {
- border-bottom: 1px solid #f7f7f7;
- font-size: 1.14em;
- }
-
- .atcpli.subt {
- position: relative;
- }
-
- .atcpli.subt .vi {
- display: inline-block;
- overflow: hidden;
- position: absolute;
- top: 0;
- left: 50%;
- width: 50%;
- padding: .45em 0;
- background-color: #fff;
- text-align: left;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .atcpa {
- display: block;
- overflow: hidden;
- padding: .45em .5em .45em .8em;
- color: currentColor;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .atcpkw {
- color: #e51313;
- }
-
- .atcpsb {
- margin-left: .8em;
- color: #888;
- }
-
- .atbt {
- position: relative;
- margin-top: -1px;
- padding: .25em 10px;
- border-top: 1px solid #e8e8e8;
- background: #f8f8f8;
- text-align: right;
- }
-
- .atbt .tb {
- position: absolute;
- top: 3px;
- left: 8px;
- padding: .45em .4em .4em;
- font-size: .93em;
- color: var(--color-font-grey);
- }
-
- .atbt .write_txt {
- float: left;
- margin-top: 5px;
- font-size: 0.88em;
- color: var(--color-font-grey);
- }
-
- .atbt button {
- overflow: visible;
- margin: 0;
- padding: .45em 0 .4em 1.6em;
- border: none;
- background-position: -140px 4px;
- font-size: .93em;
- color: var(--color-font-grey);
- cursor: pointer;
- -webkit-appearance: none;
- }
-
- .atbt button .w {
- -webkit-margin-start: -10px;
- }
-
- .atcpt .atcpw2 {
- border-top-color: #bcbcbc;
- border-left: 0;
- border-right: 0;
- }
-
- .atcpb .atcpw {
- top: -11px;
- }
-
- .atcpb .atcpw2 {
- margin: 0 43px 0 10px;
- border-color: #bcbcbc;
- }
-
- .ime_atcpt {
- position: absolute !important;
- }
-
- .ime_atcpt .atcpw3 li {
- height: 33px;
- border-bottom: 1px solid #f7f7f7;
- }
-
- .ime_atcpt .atcpw3 .atcpa {
- height: 24px;
- padding: 9px 10px 0;
- font-size: 1.13em;
- }
-
- .ime_atcpt .atcpw3 .atcpa .atcpsp {
- display: inline-block;
- min-width: 120px;
- margin-right: 10px;
- }
-
- .ly_media {
- position: relative;
- margin-top: 30px;
- padding: 11px 10px 12px 10px;
- border-top: 1px solid #eaeaea;
- border-bottom: 1px solid #eaeaea;
- background: #fbfbfb;
- color: #999;
- font-size: 0.81em;
- z-index: 11;
- line-height: 1.25;
- }
-
- .ly_media a {
- color: var(--color-brand);
- text-decoration: underline;
- }
-
- .top_fod {
- margin-top: 0;
- line-height: 1.00;
- }
-
- .top_fod.ly_media a {
- display: inline-block;
- margin-top: 5px;
- }
-
- .sch2 {
- overflow: hidden;
- padding: 8px 0 11px;
- background: #fff;
- }
-
- .sc4_n {
- position: relative;
- height: 30px;
- text-align: center;
- }
-
- .sc4_n .sc_box2 {
- display: block;
- height: 25px;
- margin: 0 48px 0 10px;
- padding: 4px 30px 0 5px;
- border: 1px solid #cecece;
- background: #fff;
- }
-
- .sc4_n .it2 {
- width: 100%;
- border: 0 none;
- font-size: 1.00em;
- color: #999;
- border-radius: 0;
- -webkit-appearance: none;
- }
-
- .sc4_n .sbt4 {
- position: absolute;
- top: 0;
- right: 52px;
- width: 30px;
- height: 30px;
- border: 0;
- background-position: -157px -82px;
- vertical-align: middle;
- }
-
- .sc4_n .sbt3 {
- position: absolute;
- top: 0;
- right: 11px;
- width: 39px;
- height: 31px;
- border: 0;
- background-position: -117px -82px;
- }
-
- .hc2 {
- display: none;
- }
-
- .u_ftlkw {
- position: relative;
- clear: both;
- padding-top: 20px;
- border-top: 1px solid #d4d4d4;
- background: #f4f4f4;
- text-align: center;
- z-index: 21;
- }
-
- .u_ftlk {
- display: inline-block;
- padding: 0 8px;
- border: 1px solid #d3d3d4;
- background-color: #fff;
- font-size: 0.75em;
- line-height: 1.56;
- color: #222;
- text-align: center;
- vertical-align: top;
- }
-
- .u_cr {
- clear: both;
- padding: 15px 0 13px;
- background: #f4f4f4;
- font-size: 0.69em;
- line-height: 1.06;
- color: #777;
- text-align: center;
- }
-
- .u_cra {
- font-size: 0.69em;
- color: #777;
- }
-
- .u_cra:before {
- display: inline-block;
- height: 10px;
- margin: 0 7px 0 5px;
- border-left: 1px solid #d7d7d7;
- vertical-align: -1px;
- content: '';
- }
-
- .u_cri_v1 {
- display: block;
- padding-top: 3px;
- background-position: 0 -82px;
- font-size: 0.69em;
- }
-
- .u_cra_v1:before {
- margin: 0 4px 0 0;
- border: none;
- }
-
- .set_lang {
- clear: both;
- overflow: hidden;
- position: relative;
- border-top: solid 1px #e5e5e7;
- background-color: #fff;
- }
-
- .set_lang form {
- padding: 17px 20px;
- }
-
- .set_lang label {
- padding-right: 12px;
- font-size: 0.81em;
- color: currentColor;
- }
-
- .set_lang .selec_wrap {
- display: inline-block;
- }
-
- .set_lang select {
- height: 25px;
- padding: 0 24px 0 6px;
- margin: 0;
- border: solid 1px #dedede;
- border-radius: 0px;
- font-size: 0.88em;
- color: currentColor;
- line-height: 1.44;
- background-size: 18px 50px;
- -webkit-appearance: none;
- -moz-appearance: none;
- }
-
- .u_ftst {
- position: absolute;
- right: 20px;
- top: 19px;
- padding: 3px 3px 3px 20px;
- color: #333;
- font-family: Helvetica,sans-serif;
- font-size: 0.81em;
- line-height: 1.13;
- }
-
- .retop {
- position: relative;
- margin-top: 15px;
- padding-top: 12px;
- }
-
- .retop .set_lang {
- margin: 0;
- padding: 0;
- }
-
- .word_otr {
- padding: 18px 10px 3px;
- font-size: 0.94em;
- }
-
- .word_otr_h {
- display: block;
- margin-bottom: 7px;
- font-size: 0.94em;
- line-height: 1.00;
- }
-
- .word_otr_a {
- display: inline-block;
- color: var(--color-brand);
- font-size: 0.94em;
- margin-bottom: 5px;
- }
-
- .word_otr_dv {
- margin: 0 6px !important;
- color: #ccc;
- }
-
- .word_otr_lst:after {
- display: block;
- clear: both;
- content: '';
- }
-
- .word_otr_lst li {
- float: left;
- height: 22px;
- line-height: 1.00;
- }
-
- .word_otr_lst .bl,.word_otr_lst.on span.bl {
- display: none;
- margin: 0;
- }
-
- .word_otr_lst.on .bl,.word_otr_lst.on span.bl {
- display: inline-block;
- }
-
- .btn_open {
- display: inline-block;
- height: 21px;
- width: 17px;
- margin-left: 8px;
- background-position: -96px -187px;
- }
-
- .on .btn_open {
- background-position: -117px -187px;
- }
-
- .btn_up {
- overflow: hidden;
- margin: 20px 0 0;
- margin-top: 20px;
- padding: 0 10px;
- font-size: 0.75em;
- }
-
- .huri_off rt {
- display: none;
- }
-
- .huri_off sup.huri {
- display: none;
- }
-
- sup.huri, sup.huri a {
- position: relative;
- top: 4px;
- font-size: 0.81em;
- line-height: 0.63;
- color: #e51313!important;
- letter-spacing: -1px;
- }
-
- sup.huri {
- margin-left: 2px;
- }
-
- .ico_star {
- display: inline-block;
- height: 27px;
- width: 14px;
- margin-right: 5px;
- font-size: 0.88em;
- vertical-align: top;
- background-position: -119px 5px;
- }
-
- .ico_star2 {
- width: 29px;
- }
-
- .ico_star3 {
- width: 44px;
- }
-
- .ico_star4 {
- width: 59px;
- }
-
- .ico_star5 {
- width: 74px;
- }
-
- .area_jlpt {
- display: inline;
- font-size: 0.88em;
- color: #707483;
- position: relative;
- top: -3px;
- }
-
- .spot_area .spot_area_inner {
- padding-right: 30px;
- }
-
- .spot_area .area_jlpt {
- top: -1px;
- }
-
- .spot_area .hanja h3+.area_jlpt {
- margin-left: 4px;
- }
-
- .area_jlpt .btn_so, .area_jlpt .btn_jlpt {
- display: inline-block;
- min-width: 21px;
- height: 17px;
- padding: 4px 4px 0 5px;
- border: 1px solid #bfc1c8;
- border-radius: 3px;
- font-family: tahoma,Helvetica,sans-serif;
- font-size: 0.94em;
- line-height: 0.88;
- color: #4e5366;
- text-align: center;
- vertical-align: middle;
- background: #f9f9f9;
- background: -moz-linear-gradient(0,#ffffff 0%,#f9f9f9 93%,#f2f2f2 93%,#f2f2f2 100%);
- background: -webkit-gradient(linear,0 0,0 100%,color-stop(0%,#ffffff),color-stop(93%,#f9f9f9),color-stop(93%,#f2f2f2),color-stop(100%,#f2f2f2));
- background: -ms-linear-gradient(0,#ffffff 0%,#f9f9f9 93%,#f2f2f2 93%,#f2f2f2 100%);
- }
-
- .area_jlpt .btn_so {
- border: 1px solid #e5e6e8;
- color: #707483;
- letter-spacing: -1px;
- background: #fcfcfc;
- background: -moz-linear-gradient(0,#ffffff 0%,#fcfcfc 93%,#f8f8f8 93%,#f8f8f8 100%);
- background: -webkit-gradient(linear,0 0,0 100%,color-stop(0%,#ffffff),color-stop(93%,#fcfcfc),color-stop(93%,#f8f8f8),color-stop(100%,#f8f8f8));
- background: -ms-linear-gradient(0,#ffffff 0%,#fcfcfc 93%,#f8f8f8 93%,#f8f8f8 100%);
- }
-
- .area_jlpt .btn_jlpt+.btn_so {
- margin-left: 1px;
- }
-
- .spot_area .area_jlpt .btn_jlpt+.btn_so {
- margin-left: 0;
- }
-
- .entry.type_hj+.area_jlpt {
- margin-left: 3px;
- }
-
- .spot_area .area_jlpt .btn_so {
- background: #f8f8f8;
- background: -moz-linear-gradient(0,#fbfbfb 0%,#f8f8f8 93%,#f4f4f4 93%,#f4f4f4 100%);
- background: -webkit-gradient(linear,0 0,0 100%,color-stop(0%,#fbfbfb),color-stop(93%,#f8f8f8),color-stop(93%,#f4f4f4),color-stop(100%,#f4f4f4));
- background: -ms-linear-gradient(0,#fbfbfb 0%,#f8f8f8 93%,#f4f4f4 93%,#f4f4f4 100%);
- }
-
- .ico_star+.area_jlpt {
- margin-left: -2px;
- }
-
- .txt_sch {
- display: none;
- min-height: 20px;
- padding: 15px 10px;
- border-bottom: 1px solid #f9f9f9;
- font-size: 0.94em;
- }
-
- .txt_sch .kwd {
- font-weight: bold;
- }
-
- .txt_sch .kwd .jp {
- font-size: 0.94em;
- font-weight: bold;
- }
-
- .txt_sch a {
- color: var(--color-brand);
- }
-
- .txt_sch a .jp {
- font-size: 0.94em;
- }
-
- .mid_ico {
- margin: 0 2px;
- }
-
- .section {
- padding: 10px 0 0;
- font-size: 1.00em;
- line-height: 1.3;
- }
-
- .section.all {
- border-top: 2px solid #b8b8b8;
- }
-
- .section.section_sptrans {
- border-top: 1px solid #eaeaea;
- }
-
- .autolink.on, .autolink2.on {
- background: #ff3;
- }
-
- .section h4 {
- margin: 0;
- padding: 0 10px 5px;
- font-size: 1.19em;
- }
-
- .section h4 .blind {
- visibility: visible;
- position: static;
- width: auto;
- height: auto;
- font-size: 1em;
- line-height: 1.38;
- }
-
- .section h4 em {
- margin-left: -1px;
- font-weight: normal;
- font-size: 1.00em;
- color: var(--color-font-grey);
- }
-
- .section h4 em span {
- font-size: 1.00em;
- letter-spacing: 0;
- }
-
- .section .more2 {
- height: 17px;
- padding: 0 10px 0 10px;
- text-align: right;
- }
-
- .section .more2 a {
- padding-right: 13px;
- background-position: 100% 1px;
- font-size: 0.88em;
- color: #0068b1;
- letter-spacing: -1px;
- }
-
- .section.section_word .more2 {
- margin-top: -4px;
- padding-bottom: 5px;
- }
-
- .section.section_article .more2 {
- margin-top: -6px;
- padding-bottom: 5px;
- }
-
- .section.section_example .more2 {
- margin-top: -5px;
- padding-bottom: 19px;
- }
-
- .section ruby rt {
- color: #e51313;
- }
-
- .dc.section_box+.more {
- display: none;
- }
-
- .detail_krjp .section h4, .detail_jpkr .section h4, .detail_hj .section h4 {
- margin-bottom: 0;
- padding-left: 10px;
- padding-top: 20px;
- border-top: 2px solid #eaeaea;
- border-bottom: 0;
- }
-
- .srch_box {
- padding: 0 10px 0.5em;
- }
-
- .srch_box .srch_top {
- padding-bottom: 2px;
- vertical-align: middle;
- }
-
- .srch_box .srch_top>* {
- vertical-align: middle;
- line-height: 1.3;
- }
-
- .srch_box .srch_top .entry {
- display: inline;
- font-size: 1.13em;
- vertical-align: middle;
- }
-
- .srch_box .srch_top .entry .sw {
- position: relative;
- top: -4px;
- color: #999;
- }
-
- .srch_box .srch_top .entry .sw .jp {
- position: relative;
- top: 2px;
- }
-
- .srch_box .srch_top .entry a,.srch_box .srch_top .entry a strong,.srch_box .srch_top .entry a .jp {
- margin-left: 0;
- color: var(--color-brand);
- }
-
- .srch_box .srch_top .entry sup {
- position: relative;
- top: 4px;
- font-weight: bold;
- font-size: 0.88em;
- color: #0068b1;
- }
-
- .srch_box .srch_top .entry .subtitle {
- margin-right: 5px;
- font-size: 1.00em;
- color: var(--color-font-grey);
- }
-
- .player {
- display: inline-block;
- position: relative;
- top: -2px;
- }
-
- .player .play, .player .btn_play, .player .playing {
- display: block;
- overflow: hidden;
- width: 36px;
- height: 27px;
- border: 0;
- background-position: 0 -120px;
- font-size: 0.88em;
- text-indent: -9999px;
- cursor: pointer;
- }
-
- .player .playing, .player .play.on, .player.on .playing, .player.on .play {
- background-position: -43px -120px;
- }
-
- .player.load .play {
- background-position: 0 0;
- }
-
- .srch_box .srch_top .btn_add {
- display: none;
- }
-
- .srch_box .srch_top .star {
- margin-right: 5px;
- vertical-align: middle;
- }
-
- .srch_box .lst_txt {
- position: relative;
- top: -1px;
- vertical-align: middle;
- font-size: 1em;
- }
-
- .srch_box .inner_lst {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- list-style-position: inside;
- margin-left: -30px;
- }
-
- .srch_box .pin {
- display: block;
- overflow: hidden;
- font-size: 1.00em;
- color: var(--color-font-grey);
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .srch_box2 .pin2 {
- display: block;
- }
-
- .srch_result .section_article .srch_box2 .pin2 {
- padding-top: 0;
- }
-
- .srch_box .pin .lst_txt {
- color: currentColor;
- }
-
- .srch_box .pin2 .jp strong {
- font-weight: normal;
- }
-
- .srch_box .jp {
- margin: 0;
- font-size: 1em;
- }
-
- .inner_lst {
- padding-left: 10px;
- }
-
- .inner_lst:first-child {
- margin-top: 0;
- }
-
- .inner_lst .pin {
- display: inline-block;
- vertical-align: middle;
- color: var(--color-font-grey);
- }
-
- .inner_lst .pin a,.inner_lst .pin a strong {
- font-weight: normal;
- }
-
- .accent_wrap {
- position: relative;
- }
-
- .top_btn {
- display: inline-block;
- position: relative;
- height: 20px;
- line-height: 1.13;
- margin-right: 4px;
- background: #fff;
- border: 1px solid #cbcbcb;
- vertical-align: middle;
- }
-
- .top_btn .blind {
- display: block;
- width: auto;
- height: auto;
- padding-left: 9px;
- padding-right: 15px;
- visibility: visible;
- font-size: 0.69em;
- line-height: 1.25;
- position: static;
- left: auto;
- top: auto;
- color: var(--color-font-grey);
- }
-
- .top_btn:after {
- position: absolute;
- right: 6px;
- top: 50%;
- width: 4px;
- height: 7px;
- margin-top: -2px;
- background-position: -164px -26px;
- content: '';
- transform: rotate(90deg);
- -webkit-transform: rotate(90deg);
- }
-
- .on.top_btn:after {
- position: absolute;
- right: 6px;
- top: 50%;
- width: 4px;
- height: 7px;
- margin-top: -3px;
- background-position: -164px -26px;
- content: '';
- transform: rotate(-90deg);
- -webkit-transform: rotate(-90deg);
- }
-
- .accent {
- position: absolute;
- left: 0;
- top: 21px;
- z-index: 100;
- padding: 0 5px 0 0!important;
- border: 1px solid #cbcbcb;
- background: #fff;
- font-weight: normal !important;
- }
-
- .accent.rgt {
- left: auto;
- right: 9px;
- }
-
- .accent .list1 {
- width: auto;
- margin: 0 9px;
- padding: 8px 0 5px 0;
- line-height: 1.00;
- font-size: 0.69em;
- color: var(--color-font-grey);
- font-weight: normal;
- border-bottom: 1px solid #efefef;
- }
-
- .accent .list2 {
- padding: 3px 0 8px;
- *padding: 4px 0 10px;
- }
-
- .accent .list2 li {
- padding: 0 0 0 9px;
- *padding: 1px 0 0 7px;
- margin-bottom: -4px;
- color: #444;
- font-size: 0.88em;
- line-height: 1.63;
- width: 143px;
- text-align: left;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .accent .list2 li a {
- padding: 0;
- color: #444 !important;
- }
-
- .accent .red {
- position: relative;
- *display: inline-block;
- margin: 0;
- color: #f83a1d;
- }
-
- .accent .tic {
- display: inline-block;
- background-position: 4px -221px;
- color: #f83a1d;
- }
-
- .accent .close {
- position: absolute;
- top: 3px;
- right: 3px;
- width: 9px;
- height: 9px;
- background-position: -130px -46px;
- }
-
- .tc-panels .section {
- padding: 0 10px 2em;
- }
-
- .detail_krjp .tc-panels .section, .detail_jpkr .tc-panels .section, .detail_hj .tc-panels .section {
- padding: 30px 0 30px 0;
- }
-
- .tc-panels .section ol {
- list-style: decimal;
- margin-left: 16px;
- }
-
- .tc-panels .section>ol {
- padding-left: 10px;
- margin-left: 22px;
- }
-
- .tc-panels .section ol ol {
- list-style: lower-alpha;
- }
-
- .tc-panels .section ol li {
- padding: 0 0 8px 0;
- }
-
- .tc-panels .section ol li:last-child {
- padding-bottom: 0;
- }
-
- .tc-panels .section.last {
- border-bottom: 1px solid #ccc;
- }
-
- .tc-panels .section.last+.section.idiom {
- padding-top: 10px;
- }
-
- .tc-panels .section.suk {
- margin-top: -1px;
- border-top: 1px solid #fff;
- }
-
- .tc-panels .section.suk .entry2 {
- margin-left: 36px;
- }
-
- .tc-panels .more {
- height: 17px;
- padding: 14px 10px 14px 0;
- text-align: right;
- }
-
- .tc-panels .more a {
- padding-right: 13px;
- background-position: 100% 1px;
- color: #0068b1;
- letter-spacing: -1px;
- }
-
- .detail_krjp .tc-panels .section.last, .detail_jpkr .tc-panels .section.last, .detail_hj .tc-panels .section.last {
- border-bottom: 0;
- }
-
- .section.idiom .entry2 .jp {
- font-size: 1.00em;
- }
-
- .section.idiom .entry2 .btn_add {
- display: none;
- }
-
- .section.idiom .bar {
- margin: 0 5px;
- }
-
- .section.idiom+.more {
- border-top: 1px solid #ccc;
- }
-
- .section2 .nav_sec {
- padding: 10px 0;
- border-bottom: 1px solid #eaeaea;
- }
-
- .section2 .nav_sec em {
- display: none;
- position: relative;
- top: -1px;
- padding-left: 2px;
- color: #777;
- font-family: tahoma,Helvetica,sans-serif;
- font-size: 0.69em;
- vertical-align: baseline;
- }
-
- .section2 .nav_sec .bar {
- display: none;
- padding: 0 2px 0 3px;
- color: #d9d9d9;
- font-size: 0.75em;
- }
-
- .section2 .nav_sec a {
- display: none;
- }
-
- .section2 .nav_sec a.all {
- display: block;
- padding: 10px 20px 10px 10px;
- text-align: right;
- font-size: 1.00em;
- color: currentColor;
- }
-
- .section2 .nav_sec a.all .tx_lnk {
- color: #0068b1;
- }
-
- .section2 .nav_sec.v1 {
- border-top: 1px solid #eaeaea;
- border-bottom: 0;
- }
-
- .cen_box2 {
- padding: 0 10px;
- }
-
- .cen_box2 h4 {
- margin-bottom: 12px;
- }
-
- .cen_box2 h6 {
- font-size: 0.88em;
- }
-
- .cen_box2 p {
- margin-top: 0 !important;
- }
-
- .cen_box2 p a {
- color: var(--color-font-grey);
- }
-
- .cen_box2 .tbl_lst {
- overflow: hidden;
- zoom: 1;
- }
-
- .cen_box2 .tbl_lst li {
- overflow: hidden;
- float: left;
- width: 46%;
- margin: 0 10px 11px 0;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .cen_box2 .tbl_lst a {
- color: #0000de;
- }
-
- .detail_krjp .cen_box2, .detail_jpkr .cen_box2, .detail_hj .cen_box2 {
- margin: 15px 10px 25px -22px;
- padding: 10px 10px 10px 16px;
- background: #f4f5f5;
- text-indent: 0;
- font-size: 0.88em;
- color: var(--color-font-grey);
- }
-
- .detail_krjp .cen_box2 h6, .detail_jpkr .cen_box2 h6, .detail_hj .cen_box2 h6 {
- margin: 0;
- padding: 0;
- font-size: 0.88em;
- color: currentColor;
- }
-
- .lst2 {
- padding: 2px 0 30px 26px;
- }
-
- .lst2 li {
- line-height: 1.38;
- }
-
- .lst2>li {
- padding-bottom: 19px;
- }
-
- .lst2>li:last-child {
- padding-bottom: 6px;
- }
-
- .lst2 li:first-child {
- margin-top: 0;
- }
-
- .lst2 li a {
- color: #0075d0;
- }
-
- .lst2 li .jp_sp {
- margin-left: 5px;
- vertical-align: 1px;
- }
-
- .lst2 li .lst_txt .lft {
- margin-right: 5px;
- color: var(--color-font-grey);
- }
-
- .dlst {
- overflow: hidden;
- position: relative;
- width: 100%;
- margin-top: -2px;
- border-top: 2px solid #d9d9d9;
- border-bottom: 2px solid #d9d9d9;
- }
-
- .dlst .fd_btn {
- display: inline-block;
- position: absolute;
- top: 9px;
- right: 10px;
- width: 20px;
- height: 20px;
- background-position: -130px -122px;
- }
-
- .dlst .fd_btn.on {
- background-position: -158px -122px;
- }
-
- .dlst .lst_dl {
- width: 100%;
- background: #f6f6f6;
- zoom: 1;
- }
-
- .dlst .lst_dl:after {
- display: block;
- visibility: hidden;
- clear: both;
- height: 0;
- content: '.';
- }
-
- .dlst .lst {
- float: left;
- width: 51%;
- font-size: 1.06em;
- letter-spacing: -1px;
- }
-
- .dlst .lst_dl dt {
- width: 48%;
- min-width: 154px;
- }
-
- .dlst .lst span {
- display: block;
- padding: 7px 0 7px 11px;
- border-right: 1px solid #f7f7f7;
- line-height: 1.50;
- }
-
- .dlst .lst_open {
- background: #fff;
- }
-
- .dlst .lst_open,.dlst.on .lst_dl {
- display: none;
- }
-
- .dlst .lst_open .lst {
- background: #fff;
- }
-
- .dlst .lst_open dt {
- position: relative;
- }
-
- .dlst .lst_open dt::after {
- display: block;
- position: absolute;
- top: 0;
- left: 0;
- width: 300%;
- height: 1px;
- background: #f7f7f7;
- content: '';
- }
-
- .dlst .lst_open .lst span {
- border-right: none;
- color: #333;
- }
-
- .dlst .lst_dl .lst:nth-child(2n) span {
- padding-left: 12px;
- padding-right: 28px;
- border: 0;
- }
-
- .dlst .lst_dl .lst:nth-child(1),.dlst .lst_dl .lst:nth-child(2) {
- border-top: 0;
- line-height: 2.31;
- }
-
- .dlst.on .lst_open {
- display: block;
- }
-
- .dlst .lst_dl dd {
- border-left: 1px solid #f7f7f7;
- letter-spacing: 0;
- }
-
- .td_lst {
- background-position: 45px 0;
- }
-
- .td_li {
- position: relative;
- padding: 9px 0 10px 62px;
- border-top: 1px solid #eee;
- border-top: 1px solid rgba(234,234,234,.5);
- zoom: 1;
- }
-
- .td_li:first-child {
- border-top: 0;
- }
-
- .td_li .num {
- position: absolute;
- top: 25px;
- left: 12px;
- font-family: arial,sans-serif;
- font-weight: bold;
- font-size: 0.94em;
- color: #5c5c5c;
- }
-
- .td_li .jp {
- position: relative;
- margin-right: 2px;
- height: 37px;
- font-size: 1.25em;
- line-height: 1.69;
- color: var(--color-brand);
- vertical-align: middle;
- font-weight: normal;
- }
-
- .td_li .jp em {
- color: var(--color-font-grey);
- }
-
- .td_li .jp sup {
- position: absolute;
- top: -2px;
- height: 14px;
- line-height: 0.88;
- font-size: 0.75em;
- }
-
- .td_li .td_txt {
- overflow: hidden;
- margin-top: 3px;
- font-size: 0.94em;
- text-overflow: ellipsis;
- white-space: nowrap;
- word-wrap: normal;
- }
-
- .td_li .td_txt .jp {
- color: currentColor;
- }
-
- .td_li .player {
- margin-left: 6px;
- }
-
- .td_lst.v1 {
- background: none;
- }
-
- .td_lst.v1 .td_li {
- padding-left: 10px;
- border-color: #eaeaea;
- }
-
- .td_lst_v2 {
- background: none !important;
- }
-
- .td_lst_v2 .td_li {
- overflow: hidden;
- padding-left: 10px;
- border-top: 0;
- zoom: 1;
- }
-
- .td_lst_v2 .td_li:first-child {
- border-bottom: 1px solid #cdcfd1;
- }
-
- .td_lst_v2 .td_txt .dsc {
- display: block;
- margin-top: 5px;
- font-size: 0.81em;
- color: var(--color-font-grey);
- letter-spacing: -1px;
- }
-
- .info_box {
- position: relative;
- background-color: #fff;
- }
-
- .info_tit {
- position: relative;
- z-index: 50;
- height: 31px;
- border-top: 1px solid #cacaca;
- border-bottom: 1px solid #cacaca;
- line-height: 2.06;
- padding-left: 10px;
- font-size: 0.94em;
- background-position: 0 0;
- letter-spacing: -1px;
- }
-
- .info_tit .en {
- font-family: arial,Helvetica,sans-serif;
- font-size: 1.06em;
- letter-spacing: 0;
- }
-
- .info_tit .feature {
- position: absolute;
- top: -2px;
- right: 5px;
- }
-
- .info_tit a.btn_class_word {
- display: inline-block;
- height: 24px;
- margin-right: 4px;
- padding: 0 5px;
- font-size: 0.75em;
- line-height: 1.69;
- color: #4b4b4b;
- text-align: center;
- letter-spacing: -1px;
- vertical-align: middle;
- border: 1px solid #b4b4b4;
- border-radius: 3px;
- border-color: #b4b4b4 #a3a3a3 #909090;
- background: #f9f9f9;
- background: -webkit-gradient(linear,0 0,0 100%,color-stop(0%,#f9f9f9),color-stop(100%,#e7e7e7));
- -webkit-box-shadow: 0 1px 0 0 #f6f6f6;
- box-shadow: 0 1px 0 0 #f6f6f6;
- }
-
- .info_tit a.btn_refresh {
- display: inline-block;
- overflow: hidden;
- width: 32px;
- height: 27px;
- background-position: -100px 0;
- text-indent: -9999px;
- vertical-align: middle;
- }
-
- .info_tit a.ico_help {
- display: inline-block;
- overflow: hidden;
- width: 22px;
- height: 22px;
- margin: -4px 0 0 6px;
- background-position: 0 0;
- vertical-align: middle;
- }
-
- .info_tit .help_dsc {
- position: absolute;
- top: 31px;
- right: 0;
- left: 0;
- z-index: 60;
- padding: 12px 52px 10px 14px;
- border: 1px solid #a1afbd;
- background-color: #f4f8fb;
- }
-
- .info_tit .help_dsc p {
- font-size: 0.88em;
- line-height: 1.00;
- letter-spacing: 0;
- }
-
- .info_tit .help_dsc p em {
- color: #4c5461;
- }
-
- .info_tit .help_dsc p strong {
- display: block;
- padding-top: 5px;
- font-size: 0.81em;
- font-weight: normal;
- color: var(--color-font-grey);
- }
-
- .info_tit .help_dsc p strong span {
- font-weight: bold;
- }
-
- .info_tit .help_dsc .btn_clse {
- position: absolute;
- top: 10px;
- right: 10px;
- width: 17px;
- height: 17px;
- background-position: 0 0;
- cursor: pointer;
- }
-
- .info_tit .help_dsc .effect {
- display: none;
- position: absolute;
- top: -4px;
- left: 120px;
- width: 8px;
- height: 4px;
- background-position: 0 0;
- }
-
- .info_box .no_data {
- padding: 12px 0 13px 10px;
- font-size: 0.94em;
- color: var(--color-font-grey);
- }
-
- .info_box .no_data strong {
- font-weight: normal;
- }
-
- .info_box .player {
- top: 0;
- }
-
- .info_box:first-child .info_tit {
- border-top: 0;
- }
-
- .info_box:first-child .btn_all_del {
- position: absolute;
- top: 0;
- right: 0;
- z-index: 50;
- height: 32px;
- padding-right: 8px;
- font-size: 0.81em;
- color: #999;
- line-height: 2.00;
- *line-height: 2.13;
- text-align: right;
- border-left: 1px solid #cacaca;
- letter-spacing: -1px;
- white-space: nowrap;
- }
-
- .myw_lst {
- display: block;
- width: 100%;
- overflow: hidden;
- margin-bottom: -1px;
- }
-
- .myw_li {
- width: 50%;
- float: left;
- position: relative;
- border-bottom: 1px solid #eaeaea;
- }
-
- .myw_txt {
- display: block;
- height: 47px;
- padding: 0 0 0 10px;
- margin-right: 33px;
- line-height: 2.94;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- font-size: 1.06em;
- color: #333;
- }
-
- .myw_txt sup {
- position: relative;
- top: -4px;
- font-size: 0.75em;
- vertical-align: 2px;
- margin-left: 2px;
- }
-
- .myw_li:nth-child(2n) .myw_txt {
- border-left: 1px solid #eaeaea;
- }
-
- .myw_noti {
- padding: 13px 10px;
- font-size: 0.94em;
- color: var(--color-font-grey);
- }
-
- .ico_x {
- float: left;
- height: 11px;
- width: 10px;
- margin: 11px 2px 0 8px;
- background-position: -130px -45px;
- }
-
- .ico_x2 {
- position: absolute;
- right: 7px;
- top: 50%;
- margin-top: -10px;
- height: 20px;
- width: 26px;
- background-position: -122px -40px;
- }
-
- .u_pg2 {
- padding: 15px 0 35px;
- font-size: .86em;
- text-align: center;
- white-space: nowrap;
- border-top: 1px solid #eaeaea;
- }
-
- .u_pg2_btn {
- display: inline-block;
- padding: .42em .86em;
- border: 1px solid #bcbcbc;
- border-radius: 3px;
- background: #f1f1f1;
- background: -webkit-gradient(linear,0 0,0 100%,from(#fff),color-stop(.05,#fbfbfb),to(#f1f1f1));
- color: var(--color-font-grey);
- vertical-align: 1px;
- }
-
- .u_pg2_btn.uc_vh {
- visibility: hidden;
- }
-
- .u_pg2_prev,.u_pg2_next {
- display: inline-block;
- }
-
- .u_pg2_prev {
- padding-left: .86em;
- background-position: 0 4px;
- }
-
- .u_pg2_next {
- padding-right: .86em;
- background-position: 100% -35px;
- }
-
- .u_pg2_pg {
- display: inline-block;
- padding: 0 5px;
- font-weight: bold;
- color: #32a800;
- line-height: 1.69;
- }
-
- .u_pg2_total {
- color: #999;
- }
-
- .u_pg2 .pad_wid {
- padding: 0;
- margin: 0 1px;
- }
-
- .u_pg2 .arr_ico {
- display: inline-block;
- width: 36px;
- height: 25px;
- vertical-align: middle;
- }
-
- .u_pg2 .arr_ico.lft {
- background-position: -13px -53px;
- }
-
- .u_pg2 .arr_ico.lft2 {
- background-position: -23px -480px;
- }
-
- .u_pg2 .arr_ico.rgt {
- background-position: -36px -53px;
- }
-
- .u_pg2 .arr_ico.rgt2 {
- background-position: -47px -480px;
- }
-
- .paginate {
- padding: 30px 0;
- font-size: 0.88em;
- text-align: center;
- white-space: nowrap;
- }
-
- .paginate .u_pg2_pg {
- display: inline-block;
- min-width: 7.5em;
- padding: .4em;
- font-weight: bold;
- color: #32a800;
- }
-
- .paginate .u_pg2_total {
- font-weight: normal;
- color: #909090;
- }
-
- .paginate a {
- display: inline-block;
- min-width: 34px;
- padding: 6px 9px 4px;
- border: 1px solid #bcbcbc;
- font-size: 0.81em;
- color: #454545;
- }
-
- .paginate a span {
- display: inline-block;
- }
-
- .paginate a.prev span {
- padding-left: 9px;
- background-position: 0 3px;
- }
-
- .paginate a.next span {
- padding-right: 9px;
- background-position: 100% -36px;
- }
-
- .top_move {
- padding: 0 12px 10px;
- text-align: right;
- }
-
- .top_move a {
- display: inline-block;
- padding: 6px 10px;
- border: 1px solid #bcbcbc;
- border-radius: 3px;
- background: #f1f1f1;
- background: -webkit-gradient(linear,0 0,0 100%,from(#FFF),color-stop(.05,#fbfbfb),to(#f1f1f1));
- color: #444;
- }
-
- .top_move a .ico_move {
- display: inline-block;
- width: 9px;
- height: 8px;
- margin-top: 4px;
- *margin-right: 5px;
- background-position: 0 0;
- vertical-align: middle;
- }
-
- .wc_btn_area {
- overflow: hidden;
- position: relative;
- border-bottom: 1px solid #cacaca;
- font-size: 0.94em;
- background-position: 0 0;
- letter-spacing: -1px;
- }
-
- .wc_btn_area .slt_wrap {
- position: relative;
- float: left;
- border-right: 1px solid #cacaca;
- font-weight: normal;
- font-size: 0.88em;
- color: #444;
- }
-
- .wc_btn_area .slt_wrap.on {
- background-color: #f8f8f8;
- color: #41507b;
- }
-
- .wc_btn_area .slt_wrap select {
- display: block;
- height: 31px;
- padding: 0 20px 0 5px;
- border: 0;
- border-radius: 0;
- background-color: transparent;
- -webkit-appearance: none;
- font-size: 0.88em;
- color: #333;
- letter-spacing: -1px;
- }
-
- .wc_btn_area .slt_wrap:first-child select {
- padding: 0 30px 0 15px;
- }
-
- .wc_btn_area .slt_wrap .ico_arr {
- position: absolute;
- right: 10px;
- top: 50%;
- display: block;
- width: 9px;
- height: 6px;
- margin-top: -3px;
- background-position: 0 0;
- }
-
- .wc_btn_area .slt_wrap:first-child .ico_arr {
- right: 20px;
- }
-
- .wc_btn_area .slt_wrap.on .ico_arr {
- background-position: -11px 0;
- }
-
- .dl_list {
- overflow: hidden;
- max-height: 41px;
- padding: 8px 14px 10px 11px;
- border-bottom: 2px solid #b8b8b8;
- }
-
- .dl_list dt,.dl_list dd {
- display: inline;
- }
-
- .dl_list dt {
- padding: 0 0 0 4px;
- border: 1px solid #d8d8d8;
- background-color: #f7f8f9;
- }
-
- .dl_list dt>.blind {
- visibility: visible;
- overflow: hidden;
- position: static;
- width: auto;
- height: auto;
- font-size: 0.81em;
- color: #6c6c6c;
- }
-
- .dl_list dd {
- margin-left: 5px;
- line-height: 1.31;
- }
-
- .dl_list dd a {
- color: var(--color-brand);
- white-space: nowrap;
- font-size: 0.94em;
- }
-
- .dl_list .jp {
- font-size: 0.94em;
- }
-
- .btn_txt_style1.expand_all_exam_bt {
- margin-left: 4px;
- }
-
- .section_box h5 {
- font-size: 1.25em;
- }
-
- .detail_jpkr .section_box h5, .detail_krjp .section_box h5, .detail_hj .section_box h5 {
- font-size: 1.25em;
- padding-left: 10px;
- padding-bottom: 18px;
- color: currentColor;
- }
-
- .section_box h6 {
- margin: 5px 0 15px;
- padding-left: 11px;
- font-size: 1.13em;
- }
-
- .section_box h6 .kor_link {
- color: currentColor;
- }
-
- .section_box h6 a {
- color: #0068b1;
- }
-
- .section_box .pin {
- display: block;
- margin: 8px 0;
- }
-
- .section_box .lst li {
- font-size: 1.00em;
- line-height: 1.38;
- }
-
- .section_box .lst li .lst_txt {
- font-size: 1.13em;
- }
-
- .section_box .lst li .roman {
- display: block;
- }
-
- .section_box .lst li .jp {
- font-size: 1.06em;
- }
-
- .section_box .player {
- margin-top: -5px;
- }
-
- .detail_krjp .section_box .lst li .lst_txt, .detail_jpkr .section_box .lst li .lst_txt, .detail_hj .section_box .lst li .lst_txt {
- display: block;
- padding-bottom: 5px;
- }
-
- .ft_mod_sm h5 {
- font-size: 1.13em;
- }
-
- .ft_mod_sm h6 {
- font-size: 0.88em;
- }
-
- .ft_mod_sm .lst li {
- font-size: 0.88em;
- line-height: 1.19;
- }
-
- .ft_mod_sm .pin {
- font-size: 0.88em;
- }
-
- .ft_mod h5, .detail_hj .ft_mod .section.section_phonetic h5 {
- font-size: 1.50em;
- }
-
- .ft_mod .srch_box .srch_top .entry {
- font-size: 1.38em;
- line-height: 1.69;
- }
-
- .ft_mod .srch_box .srch_top .entry .jp {
- font-size: 1.44em;
- }
-
- .ft_mod .section_article .entry .sw, .ft_mod .section_word .entry .sw {
- font-size: 1.38em;
- }
-
- .ft_mod h6 {
- font-size: 1.25em;
- }
-
- .ft_mod .pin {
- font-size: 1.25em;
- }
-
- .ft_mod .lst li {
- font-size: 1.25em;
- line-height: 1.56;
- }
-
- .ft_mod.section_box .lst li .lst_txt {
- font-size: 1.25em;
- }
-
- .ft_mod .lst li .jp {
- font-size: 1.31em;
- line-height: 1.56;
- }
-
- .ft_mod .top_dn dt .jp, .ft_mod .top_dn dd .jp {
- font-size: 1.25em;
- }
-
- .ft_mod .top_dn dt, .ft_mod .top_dn dd {
- font-size: 1.25em;
- }
-
- .ft_mod.srch_result .top_dn_v2 .ft_col3 {
- top: 0;
- vertical-align: top;
- }
-
- .ft_mod .section_example .lst .pin {
- font-size: 1.19em;
- }
-
- .ft_mod .section {
- font-size: 1.25em;
- line-height: 1.50;
- }
-
- .ft_mod .section .jp {
- font-size: 1.25em;
- }
-
- .ft_mod .section h4 {
- line-height: 1.13;
- }
-
- .ft_mod .srch_box .pin .img_info_wrap .info {
- font-size: 1.00em;
- line-height: 1.31;
- }
-
- .ft_mod.section_box.kor_food .food_desc .mean_wrap .mean {
- font-size: 1.06em;
- line-height: 1.50;
- }
-
- .ft_mod.section_box.kor_food .food_desc .mean_wrap .mean[lang="ja"] {
- margin-top: 17px;
- font-size: 1.25em;
- line-height: 1.69;
- }
-
- .ft_mod2 h5 {
- font-size: 1.63em;
- }
-
- .ft_mod2 h6 {
- font-size: 1.38em;
- }
-
- .ft_mod2 .pin {
- font-size: 1.38em;
- }
-
- .ft_mod2 .lst li {
- font-size: 1.38em;
- line-height: 1.69;
- }
-
- .ft_mod3 h5 {
- font-size: 1.75em;
- }
-
- .ft_mod3 h6 {
- font-size: 1.50em;
- }
-
- .ft_mod3 .pin {
- font-size: 1.50em;
- }
-
- .ft_mod3 .lst li {
- font-size: 1.50em;
- line-height: 1.81;
- }
-
- .srch_result .mw {
- margin-right: 2px;
- }
-
- .srch_result .sw {
- margin-right: 2px;
- }
-
- .srch_result .player {
- margin-right: 2px;
- }
-
- .section_word .srch_box .lst li {
- padding-bottom: 5px;
- }
-
- .section_word .entry .sw {
- margin-left: 3px;
- font-size: 1.00em;
- color: var(--color-font-grey);
- vertical-align: middle;
- }
-
- .section_word .lst {
- list-style: decimal;
- margin: 0;
- }
-
- .section_word dd {
- line-height: 1.2;
- }
-
- .section_word .srch_box .pin {
- padding-bottom: 4px;
- }
-
- .section_word .srch_box .pin:last-child {
- padding-bottom: 0;
- }
-
- .section_word .srch_box .lst_p {
- padding-bottom: 10px;
- }
-
- .section_word .top_dn {
- margin: 5px 0;
- padding-top: 1px;
- }
-
- .section_article .srch_box {
- padding-bottom: 0.8em;
- }
-
- .section_article .entry .sw {
- margin-left: 3px;
- font-size: 0.88em;
- color: var(--color-font-grey);
- vertical-align: middle;
- }
-
- .section_article .lst p {
- margin-top: 10px;
- }
-
- .detail_krjp .section_article .lst p, .detail_jpkr .section_article .lst p, .detail_hj .section_article .lst p {
- margin-top: 3px;
- padding-bottom: 5px;
- }
-
- .detail_krjp .section_article .lst p .ico_bl+span, .detail_jpkr .section_article .lst p .ico_bl+span, .detail_hj .section_article .lst p .ico_bl+span, .detail_krjp .section_article .lst p .kor+span, .detail_jpkr .section_article .lst p .kor+span, .detail_hj .section_article .lst p .kor+span {
- margin-right: 10px;
- }
-
- .detail_krjp .section_article .lst p .player, .detail_jpkr .section_article .lst p .player, .detail_hj .section_article .lst p .player {
- position: relative;
- margin-left: -5px;
- }
-
- .detail_krjp .section_article .lst p .kor, .detail_jpkr .section_article .lst p .kor, .detail_hj .section_article .lst p .kor {
- display: block;
- margin-top: -3px;
- color: var(--color-font-grey);
- }
-
- .detail_krjp .section_article .lst p .kor .kor_link, .detail_jpkr .section_article .lst p .kor .kor_link, .detail_hj .section_article .lst p .kor .kor_link {
- color: var(--color-font-grey);
- }
-
- .detail_krjp .section_article .lst p .kor .kor_link, .detail_jpkr .section_article .lst p .kor .kor_link, .detail_hj .section_article .lst p .kor .kor_link {
- color: var(--color-font-grey);
- }
-
- .detail_krjp .section_article ul.lst, .detail_jpkr .section_article ul.lst, .detail_hj .section_article ul.lst {
- padding-left: 10px;
- margin-left: 16px;
- }
-
- .section_example .lst li {
- margin-bottom: 0.8em;
- }
-
- .section_example .lst p {
- margin: 0;
- color: currentColor;
- }
-
- .section_example .lst .jp {
- font-size: 1em;
- }
-
- .section_example .lst .pin {
- position: relative;
- top: -2px;
- font-size: 1.06em;
- }
-
- .section_example .cen_box2 {
- margin-left: 10px;
- }
-
- .detail_krjp .tc-panels .section.section_proverb {
- padding: 0 0 13px 0;
- }
-
- .section_proverb h4 {
- padding-top: 30px;
- }
-
- .section_proverb .lst {
- padding: 5px 10px 0 27px;
- }
-
- .section_proverb .player {
- margin-left: 5px;
- }
-
- .section_proverb .lst .kor {
- display: block;
- color: var(--color-font-grey);
- }
-
- .section_proverb .lst .kor .kor_link {
- color: var(--color-font-grey);
- }
-
- .section_proverb .lst p {
- padding-bottom: 10px;
- }
-
- .section_expression {
- padding: 0 !important;
- }
-
- .section_expression h4 {
- padding-top: 30px;
- }
-
- .section_expression .player {
- margin-left: 5px;
- }
-
- .section_expression .lst_txt a, .section_expression .lst .kor_link {
- color: currentColor;
- }
-
- .section_compound {
- padding: 0 !important;
- }
-
- .section_compound h4 {
- padding-top: 30px;
- }
-
- .section_compound .lst_txt a, .section_compound .lst .kor_link {
- color: currentColor;
- }
-
- .section_relhanja {
- padding: 0 !important;
- }
-
- .section_relhanja h6 {
- margin: 0 10px;
- }
-
- .section_relhanja .top_dn {
- padding-left: 10px;
- }
-
- .section_relhanja .top_dt2 {
- clear: none;
- margin-left: 10px;
- }
-
- .section_relhanja .top_dn.top_dn_v2 {
- padding-bottom: 0;
- }
-
- .section_relhanja.section.idiom .entry2 .jp {
- font-size: 1.13em;
- line-height: 1.25;
- }
-
- .section_relhanja.section.idiom .entry2 a.jp {
- vertical-align: middle;
- }
-
- .srch_result .section_sptrans {
- margin-top: 0;
- }
-
- .section_sptrans.section h4 {
- margin-bottom: 0;
- padding-bottom: 6px;
- border: 0;
- }
-
- .section_sptrans .srch_box .lst_p .jap_ico,.lst2 li .lst_p .jap_ico {
- padding-right: 8px;
- margin-right: 5px;
- background-position: 100% 6px;
- }
-
- .tc-panels .section.section_phonetic {
- padding-top: 30px;
- }
-
- .detail_hj .section.section_phonetic h5 {
- font-size: 1.31em;
- color: currentColor;
- }
-
- .section_phonetic .entry {
- margin-bottom: 0;
- font-weight: normal;
- }
-
- .section.section_phonetic .pin {
- margin: 4px 0 4px 10px;
- color: var(--color-font-grey);
- }
-
- .section_phonetic .lst.lst_v3 {
- margin-left: 10px;
- padding-bottom: 10px;
- }
-
- .section_phonetic ol.lst.lst_v3 {
- margin-left: 22px;
- }
-
- .section_phonetic ol.lst.lst_v3 li {
- padding-bottom: 0;
- }
-
- .section_phonetic ol.lst.lst_v3 li .lst_txt {
- padding-bottom: 0;
- }
-
- .section_phonetic .lst .inner_lst {
- padding-left: 0;
- padding-bottom: 0;
- }
-
- .section_phonetic .lst .lst_txt .pin {
- display: inline;
- margin-left: 0;
- margin-right: 4px;
- vertical-align: 0;
- }
-
- .tc-panels .section.section_ideographic {
- padding-top: 30px;
- }
-
- .detail_hj .section.section_ideographic h5 {
- font-size: 1.31em;
- color: currentColor;
- }
-
- .section_ideographic .entry {
- margin-bottom: 0;
- font-weight: normal;
- }
-
- .section_ideographic .lst.lst_v3 {
- padding-bottom: 13px;
- }
-
- .section_ideographic .lst.lst_v3 .inner_lst {
- padding-bottom: 0;
- }
-
- .section_ideographic .lst.lst_v3 .inner_lst .lst_txt {
- padding-bottom: 0;
- }
-
- .section_ideographic .lst.lst_v2.lst_v3 {
- margin-left: 10px;
- padding-bottom: 10px;
- }
-
- .section_ideographic .lst.lst_v2.lst_v3 .inner_lst {
- padding-left: 0;
- }
-
- .section_ideographic .lst .lst_txt .pin {
- display: inline;
- margin-right: 4px;
- vertical-align: 0;
- }
-
- .section_box .section_ideographic .pin {
- color: var(--color-font-grey);
- margin: 1px 0 3px 10px;
- }
-
- .top_dn {
- padding-top: 4px;
- zoom: 1;
- }
-
- .top_dn:after {
- display: block;
- height: 0;
- visibility: hidden;
- clear: both;
- content: '';
- }
-
- .top_dn dt,.top_dn dd {
- max-width: 80%;
- float: left;
- font-size: 1em;
- margin: 0;
- line-height: 1.19;
- }
-
- .top_dn dt {
- margin: 0 5px 5px 0;
- padding: 0 4px;
- // border: 1px solid #d8dfef;
- border-radius: 1px;
- // background-color: #fafbfd;
- line-height: 1;
- }
-
- .top_dn dt .blind {
- visibility: visible;
- position: static;
- width: auto;
- height: auto;
- vertical-align: middle;
- font-size: 1em;
- line-height: 1;
- color: #778cab;
- }
-
- .top_dn dt .jp,.top_dn dd .jp {
- font-size: 1.00em;
- }
-
- .top_dn.top_dn_v2 {
- clear: both;
- padding-top: 0;
- margin: 0;
- }
-
- .top_dn.top_dn_v2 dd {
- color: #777;
- }
-
- .top_dn .top_dt4 {
- margin-left: 14px;
- }
-
- .top_dt,.top_dt2,.top_dt3,.top_dt4 {
- position: relative;
- top: -1px;
- display: inline-block;
- min-width: 21px;
- min-height: 13px;
- text-align: center;
- }
-
- .top_dt2 {
- clear: both;
- }
-
- .top_dn .top_dt3 .blind,.top_dn .top_dt4 .blind {
- color: #9da1a8;
- }
-
- .top_dn .bar {
- margin: 0 4px;
- }
-
- .srch_box .srch_top .entry .jp {
- font-size: 1.19em;
- letter-spacing: -1px;
- }
-
- .srch_result .top_dn dd {
- overflow: hidden;
- position: relative;
- top: -2px;
- max-width: 85%;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .srch_result .top_dn_v2 dd {
- top: 0;
- }
-
- .spot_area .top_dn.top_dn_v2 dd em.ps2 {
- display: inline-block;
- margin-left: 7px;
- }
-
- .srch_result .top_dn_v2 .ft_col3 {
- top: -2px;
- }
-
- .dt {
- margin: 0 10px 0;
- border: solid 1px #ebebeb;
- background-color: #f7f7f7;
- }
-
- .dt .tb {
- display: table;
- width: 100%;
- overflow: hidden;
- }
-
- .dt li {
- display: table-cell;
- width: 33%;
- }
-
- .dt li:first-child {
- background: none;
- }
-
- .dt .wh {
- width: 100%;
- background: none;
- }
-
- .dt li a {
- display: inline-block;
- width: 100%;
- padding: .6em 0 .5em;
- color: var(--color-font-grey);
- text-align: center;
- font-size: 1.00em;
- }
-
- .dt li a em {
- font-size: .89em;
- }
-
- .dt li .on {
- color: currentColor;
- font-weight: bold;
- }
-
- .dt li .on em {
- color: #e51313;
- }
-
- .spi_wrap {
- margin: 0 auto;
- padding: 20px 0 0;
- }
-
- .detail_krjp .spi_wrap, .detail_jpkr .spi_wrap, .detail_hj .spi_wrap {
- padding: 10px 0;
- }
-
- .lang_skin .module_handwriting_func_item {
- letter-spacing: -1px;
- }
-
- .ts {
- width: 100%;
- font-family: '나눔고딕',NanumGothic,'굴림',Gulim,Helvetica,sans-serif;
- }
-
- .ts h1 {
- height: 32px;
- padding: 6px 10px;
- border-bottom: 1px solid #01AF34;
- background-color: #03C73C;
- color: #fff;
- }
-
- .ts h1 ul {
- display: inline-block;
- text-align: center;
- font-weight: normal;
- overflow: hidden;
- }
-
- .ts h1 ul li a {
- padding: 8px 9px 8px 10px;
- height: 16px;
- display: block;
- overflow: hidden;
- }
-
- .ts h1 ul .tab_name {
- display: block;
- overflow: hidden;
- width: 100%;
- height: 100%;
- font-size: 0.88em;
- color: #fff;
- visibility: visible;
- line-height: 1.06;
- }
-
- .ts .help_wrap {
- position: relative;
- display: inline-block;
- vertical-align: middle;
- margin-left: -4px;
- width: 20px;
- z-index: 102;
- }
-
- .ts .help_wrap .help {
- display: inline-block;
- vertical-align: top;
- width: 20px;
- height: 20px;
- background-position: -120px -120px;
- }
-
- .ts .kiclo {
- display: block;
- padding: 8px 3px;
- width: auto;
- height: auto;
- background-image: none;
- position: absolute;
- top: 8px;
- right: 10px;
- background-color: transparent;
- }
-
- .ts .kiclo span {
- display: block;
- height: 100%;
- position: relative;
- visibility: visible;
- overflow: visible;
- width: auto;
- font-size: 0.88em;
- line-height: 0.81;
- letter-spacing: 1px;
- color: #fff;
- text-indent: 1px;
- font-weight: normal;
- font-family: '나눔고딕',NanumGothic,'굴림',Gulim,Helvetica,sans-serif;
- }
-
- .top_a,.top_a2,.top_a3 {
- height: 32px;
- }
-
- .top_a,.top_a2,.top_a2 .line,.top_a3,.top_a3 .line {
- background-position: 0 0;
- }
-
- .top_a {
- float: left;
- background-position: 0% -80px;
- }
-
- .top_a.on,.top_a2.on,.top_a3.on {
- background-color: #01B536;
- }
-
- .top_a2 {
- position: relative;
- float: left;
- background-position: 50% -80px;
- }
-
- .top_a2 .line,.top_a3 .line {
- position: absolute;
- left: -1px;
- bottom: 0;
- width: 1px;
- height: 100%;
- background-position: -10px -40px;
- }
-
- .top_a3 {
- position: relative;
- float: left;
- background-position: 99% -80px;
- }
-
- .kia {
- padding-right: 54px;
- }
-
- .wide {
- padding-right: 78px;
- }
-
- ._fingerWrite.wide {
- padding-right: 161px;
- }
-
- ._backPanel {
- background-color: #fff;
- }
-
- .kia.wide .butt {
- position: absolute;
- top: 0;
- right: 0;
- width: 80px;
- height: 191px;
- }
-
- .bn1,.bn2,.bn3,.bn4,.bn5 {
- width: 20%;
- }
-
- .helpt {
- display: block;
- position: absolute;
- top: 27px;
- left: -156px;
- z-index: 101;
- padding: 14px 10px 13px 9px;
- border: 1px solid #c9c7ca;
- background-color: #fff;
- }
-
- .helpt .sbox {
- width: 195px;
- font-size: 0.81em;
- font-weight: normal;
- line-height: 1.13;
- color: currentColor;
- letter-spacing: -1px;
- text-align: left;
- }
-
- .helpt .sbox:after {
- position: absolute;
- top: -3px;
- right: 45px;
- width: 6px;
- height: 3px;
- content: '';
- background-position: 100% 0;
- }
-
- .helpt .se {
- padding-top: .5em;
- }
-
- .helpt .sebt {
- display: inline-block;
- width: 21px;
- height: 18px;
- margin-top: -2px;
- margin-right: 3px;
- vertical-align: middle;
- }
-
- .hs.ki {
- height: 51px;
- }
-
- .hs.ki .hsw {
- padding-right: 48px;
- }
-
- .hs.ki .itw {
- font-size: 1.13em;
- line-height: 2.00;
- vertical-align: middle;
- }
-
- .hs.ki .itwb {
- border: solid 1px #cfd7e0;
- background-color: #e4eefc;
- }
-
- .hs.ki .itwb2 {
- border: solid 1px #cfd7e0;
- background-color: #e4eefc;
- }
-
- .hs.ki .sm {
- font-size: .81em;
- }
-
- .hs .it.sd {
- color: currentColor;
- }
-
- .hs.ki .hssbt {
- right: 10px;
- }
-
- .hs.ki .hsw .clrt {
- right: 51px;
- }
-
- .kia .butt .del .ico, .kib .butt .del .ico, .kia .butt .del_v1 .ico, .kib .butt .del_v1 .ico, .kia .butt .shift .ico, .kia .butt .space .ico {
- background-size: 26px 70px;
- }
-
- .kia .butt .del.on .ico, .kib .butt .del.on .ico, .kia .butt .del_v1.on .ico, .kib .butt .del_v1.on .ico, .kia .butt .shift.on .ico, .kia .butt .space.on .ico {
- background-size: 26px 70px;
- }
-
- .kia {
- overflow: hidden;
- position: relative;
- border-top: solid 1px #828282;
- }
-
- .kia .pad {
- width: 100%;
- }
-
- .kia .l1,.kia .l2,.kia .l3,.kia .l4 {
- position: relative;
- height: 53px;
- }
-
- .kia .l4 {
- height: 52px;
- }
-
- .kia.wide .l1,.kia.wide .l2,.kia.wide .l3 {
- height: 48px;
- }
-
- .kia.wide .l4 {
- height: 47px;
- }
-
- .kia .pad a,.kia .pad span {
- display: block;
- float: left;
- height: 47px;
- margin-right: -1px;
- padding-top: 5px;
- border-left: solid 1px #aeb0b6;
- border-bottom: solid 1px #aeb0b6;
- background: #e8e9ed;
- background: #e8e9ed -webkit-gradient(linear,0% 0%,0% 70%,from(#fcfdfd),to(#e8e9ed));
- font-family: HiraKakuProN-W6;
- font-size: 1.43em;
- color: currentColor;
- text-align: center;
- text-shadow: 2px 2px 1px #fff;
- }
-
- .kia.wide .pad a,.kia.wide .pad span {
- height: 42px;
- padding-top: 5px;
- }
-
- .kia .pad a:first-child {
- margin: 0;
- }
-
- .kia .pad a sub {
- position: relative;
- top: 4px;
- font-size: .7em;
- line-height: .3em;
- }
-
- .kia .pad.sam a,.kia .pad.sam span {
- color: #909090;
- }
-
- .kia .pad .on {
- border-left-color: #23780b;
- border-bottom-color: #23780b;
- background: #3bce08;
- color: #fff;
- text-shadow: 1px 1px 1px rgba(0,0,0,.2);
- }
-
- .kia .pad .sm {
- height: 34px;
- padding-top: 18px;
- font-size: 1.14em;
- color: #000 !important;
- }
-
- .kia.wide .pad .sm {
- height: 31px;
- padding-top: 16px;
- }
-
- .kia .pad .sm sub {
- padding-left: 5px;
- font-size: .86em;
- }
-
- .kia .l4 a,.kia .l4 span {
- border-bottom: 0 !important;
- }
-
- .kia .shf {
- position: absolute;
- top: 53px;
- z-index: 2;
- width: 100%;
- }
-
- .kia.wide .shf {
- top: 48px;
- width: 100%;
- height: 48px;
- }
-
- .kia .shf a,.kia .shf span {
- margin-right: -1px;
- border-left-color: #626366 !important;
- border-bottom-color: #626366 !important;
- background: #f0f0ef;
- background: #f0f0ef -webkit-gradient(linear,0% 0%,0% 70%,from(#fcfcfb),to(#f0f0ef)) !important;
- color: #208d00 !important;
- }
-
- .kia .shf .on,.kia .shf .on {
- background: #3bce08;
- color: #fff !important;
- }
-
- .kia .shf.wa {
- right: 0;
- left: none;
- }
-
- .kia .shf.ya {
- right: 0;
- left: none;
- }
-
- .kia .butt {
- overflow: hidden;
- position: absolute;
- top: 0;
- right: 0;
- width: 56px;
- height: 211px;
- background-color: #05C53D;
- border-left: 1px solid #04a132;
- }
-
- .kia.wide .butt {
- width: 80px;
- }
-
- .kia .butt .del, .kia .butt .del_v1, .kib .butt .del, .kib .butt .del_v1, .kia .butt .shift, .kia .butt .space, .kia .butt .search {
- display: -webkit-box;
- -webkit-box-pack: center;
- -webkit-box-orient: vertical;
- text-align: center;
- }
-
- .kia .butt .del,.kib .butt .del {
- height: 105px;
- border-bottom: solid 1px #05b337;
- }
-
- .kia .butt .del_v1,.kib .butt .del_v1 {
- height: 46px;
- border-bottom: solid 1px #05b337;
- }
-
- .kia .butt .shift {
- height: 105px;
- border-bottom: solid 1px #05b337;
- }
-
- .kia .butt .space {
- height: 45px;
- border-bottom: solid 1px #05b337;
- }
-
- .kia .butt .search {
- height: 70px;
- }
-
- .kia .butt .ico,.kib .butt .ico,.kia .butt .search .txt {
- display: inline-block;
- }
-
- .kia .butt .del .ico, .kia .butt .del.on .ico, .kia .butt .del_v1 .ico, .kia .butt .del_v1.on .ico, .kib .butt .del .ico, .kib .butt .del.on .ico, .kib .butt .del_v1 .ico, .kib .butt .del_v1.on .ico {
- width: 26px;
- height: 17px;
- background-position: 0 0;
- }
-
- .kia .butt .shift .ico, .kia .butt .shift.on .ico {
- width: 26px;
- height: 17px;
- background-position: 0 -30px;
- }
-
- .kia .butt .space .ico, .kia .butt .space.on .ico {
- width: 26px;
- height: 7px;
- background-position: 0 -60px;
- }
-
- .kia .butt .search .txt {
- font-size: 0.94em;
- color: #FFF;
- text-align: center;
- }
-
- .kia .butt .search.on .txt {
- color: #F4FF3C;
- }
-
- .kia.wide .butt .del,.kia.wide .butt .shift,.kia.wide .butt .space,.kia.wide .butt .search {
- height: 95px !important;
- }
-
- .kia .butt .del.shot,.kib .butt .del.shot {
- height: 52px !important;
- }
-
- .kib {
- overflow: hidden;
- position: relative;
- padding-right: 108px;
- border-top: solid 1px #828282;
- }
-
- .wide2 {
- padding-right: 108px;
- }
-
- .kib .canv {
- overflow: hidden;
- float: left;
- width: 100%;
- height: 211px;
- background-color: #e5e5e7;
- }
-
- .kib.wide .canv {
- overflow: hidden;
- width: 100%;
- height: 191px;
- background-color: #e5e5e7;
- }
-
- .kib .pre {
- overflow: hidden;
- float: left;
- position: absolute;
- top: 0;
- right: 55px;
- width: 53px;
- }
-
- .kib.wide .pre {
- right: 81px;
- width: 80px;
- }
-
- .kib .pre a,.kib .pre span {
- display: block;
- line-height: 3.25;
- height: 52px;
- border-left: solid 1px #b5b5b5;
- border-bottom: solid 1px #d8d8d8;
- background: #f4f4f4;
- font-family: HiraKakuProN-W6;
- font-size: 1.43em;
- color: currentColor;
- text-align: center;
- text-shadow: 2px 2px 1px #fff;
- }
-
- .kib .pre .sm {
- font-size: 1.14em;
- }
-
- .kib .pre .pg {
- border-bottom: 0 !important;
- font-size: 1em;
- }
-
- .kib.wide .pre a,.kib.wide .pre span {
- height: 47px;
- line-height: 2.94;
- }
-
- .a .kib.wide .pre a,.a .kib.wide .pre span {
- height: 47px;
- line-height: 2.94;
- }
-
- .kib.wide .pre .pg {
- line-height: 2.94;
- }
-
- .a .kib .pre .pg {
- line-height: 3.38;
- }
-
- .kib .pre .pg strong {
- padding-right: 8px;
- font-weight: normal;
- color: #707070;
- }
-
- .a .kib .pre .pg strong {
- background-position: right 6px;
- }
-
- .kib .pre span.pg strong {
- opacity: .75;
- }
-
- .kib .pre .pg em {
- font-weight: bold;
- color: #303030;
- }
-
- .kib .txt {
- position: absolute;
- left: 8px;
- bottom: 6px;
- padding-right: 122px;
- color: #a9a9a9;
- letter-spacing: -1px;
- }
-
- .kib .txt .hc {
- display: inline-block;
- visibility: visible;
- position: relative;
- left: auto;
- width: auto;
- height: auto;
- font-size: 0.63em;
- line-height: 0.75;
- vertical-align: middle;
- }
-
- .kib.wide .txt {
- padding-right: 172px;
- }
+.dictNaver-EntryBox {
+ border: 1px solid #eee;
+ padding: 1em 0.5em 0.5em;
+ margin-top: 1.4em;
+ position: relative;
- .kib .butt {
- overflow: hidden;
- float: right;
+ .dictNaver-EntryBoxTitle {
position: absolute;
top: 0;
- right: 0;
- width: 55px;
- background-color: #05c53d;
- border-left: 1px solid #04a132;
- }
-
- .kib .butt a .txt {
- display: -webkit-box;
- height: 52px;
- font-size: 0.75em;
- line-height: 0.88;
- color: #FFF;
- letter-spacing: -1px;
- text-align: center;
- vertical-align: middle;
- -webkit-box-align: center;
- -webkit-box-pack: center;
- position: static;
- padding: 0;
- }
-
- .kib.wide .butt {
- right: 0;
- width: 81px;
- }
-
- .kib .butt .del {
- height: 52px;
- border: 1px solid #05b337;
- border-width: 0 0 1px 0;
- }
-
- .kib .butt .del_v1 {
- height: 52px;
- border: 1px solid #05b337;
- border-width: 0 0 1px 0;
- background: #05c53d;
- }
-
- .kib .butt .del1 {
- display: block;
- height: 52px;
- border: 1px solid #05b337;
- border-width: 0 0 1px 0;
- background: #05c53d;
- }
-
- .kib .butt .dela {
- display: block;
- height: 52px;
- border: 1px solid #05b337;
- border-width: 0 0 1px 0;
- background: #05c53d;
- }
-
- .kib.wide .butt .del, .kib.wide .butt .del.shot, .kib.wide .butt .del1, .kib.wide .butt .dela {
- height: 47px !important;
- }
-
- .bn1,.bn2,.bn3,.bn4,.bn5 {
- position: absolute;
- }
-
- .shf .bn1,.shf .bn2,.shf .bn3,.shf .bn4,.shf .bn5 {
- box-shadow: 5px 2px 10px rgba(0,0,0,.8);
- }
-
- .kia .pad .shf a:first-child {
- margin: 0;
- box-shadow: 3px 2px 10px rgba(0,0,0,.8);
- }
-
- .kia .pad .bn1 {
- left: 0;
- border-left: 0;
- }
-
- .bn2 {
- left: 20%;
- }
-
- .bn3 {
- left: 40%;
- }
-
- .bn4 {
- left: 60%;
- }
-
- .bn5 {
- left: 80%;
- }
-
- .btjc {
- width: 100%;
- }
-
- .btjc2 {
- width: 299px;
- margin: 0 auto;
- }
-
- .jc,.jc4,.jct,.jcd,.jcd4,.jcd5,.close2 {
- display: block;
- position: absolute;
- background-size: 270px 104px;
- }
-
- .jc,.jc4 {
- bottom: 0;
- z-index: 99;
- width: 299px;
- height: 97px;
- background-size: 300px 97px;
- }
-
- .jct {
- top: 15px;
- left: 10px;
- width: 55px;
- height: 55px;
- }
-
- .jcd {
- top: 15px;
- left: 80px;
- width: 161px;
- height: 54px;
- background-position: -65px 0;
- }
-
- .jc4 .jcd2 {
- top: 15px;
- left: 75px;
- width: 210px;
- height: 53px;
- background-size: 270px 104px;
- }
-
- .jc5 .jcd {
- top: 15px;
- left: 80px;
- width: 186px;
- height: 49px;
- background-position: 0 -55px;
- }
-
- .close2 {
- top: 11px;
- right: 6px;
- width: 23px;
- height: 22px;
- background-size: 102px 308px;
- }
-
- .jc5 {
- position: absolute;
- left: 0;
- bottom: 0;
- z-index: 99;
- width: 100%;
- height: 86px;
- border-top: 1px solid currentColor;
- border-bottom: 1px solid currentColor;
- background: #3a4555;
- }
-
- .btn_up {
- overflow: hidden;
- margin: 20px 0 0;
- margin-top: 20px;
- padding: 0 10px;
- }
-
- .jc,.jc6,.jct2,.jcd2,.jc6,.jc7,.close2 {
- display: block;
- position: absolute;
- background-size: 275px 123px;
- }
-
- .jc,.jc6 {
- bottom: 0;
- z-index: 99;
- width: 300px;
- height: 97px;
- background-size: 300px 97px;
- }
-
- .jct2 {
- top: 13px;
- left: 13px;
- width: 55px;
- height: 55px;
- }
-
- .jcd2 {
- top: 15px;
- left: 75px;
- width: 161px;
- height: 52px;
- background-position: -60px 0;
- }
-
- .jc6 .jcd2 {
- top: 15px;
- left: 75px;
- width: 213px;
- height: 55px;
- }
-
- .jc7 .jcd2 {
- position: relative;
- top: 15px;
- left: 80px;
- width: 230px;
- height: 68px;
- background-position: 0 -55px;
- }
-
- .jc7 .jcd2 a {
- display: block;
- position: absolute;
- right: 102px;
- bottom: 0;
- width: 55px;
- height: 15px;
- }
-
- .close2 {
- top: 11px;
- right: 6px;
- width: 23px;
- height: 22px;
- background-size: 102px 308px;
- }
-
- .jc7 {
- position: absolute;
- left: 0;
- bottom: 0;
- z-index: 99;
- width: 100%;
- height: 95px;
- border-top: 1px solid currentColor;
- border-bottom: 1px solid currentColor;
- background: #3a4555;
- }
-
- .btn_add {
- display: inline-block;
- position: absolute;
- top: 16px;
- right: 10px;
- width: 30px;
- height: 30px;
- background-position: 0 0;
- border: 0;
- -webkit-appearance: none;
- z-index: 10;
- text-indent: -999em;
- border-radius: 0;
+ left: 0.8em;
+ transform: translateY(-50%);
+ padding: 0 0.4em;
+ font-size: 1.3em;
+ font-weight: bold;
+ background: var(--color-background);
}
- .pop_txt {
+ .dictNaver-EntryTitle {
display: inline-block;
- position: absolute;
- top: 54px;
- right: 10px;
- padding: 15px 16px 15px 17px;
- border: 1px solid #a5a8b0;
- background: #fff;
- font-size: 0.88em;
- color: #494b56;
- z-index: 20;
- }
-
- .pop_txt .arr_top {
- display: block;
- position: absolute;
- top: -7px;
- right: 8px;
- width: 12px;
- height: 8px;
- background-position: -60px 0;
- }
-
- .btn_txt_style1 {
- width: auto;
- height: auto;
- border: 1px solid #b9b9b9;
- border-radius: 4px;
- background-size: 1px 100px;
- vertical-align: middle;
- }
-
- .btn_txt_style1 .hc {
- position: relative;
- overflow: visible;
- visibility: visible;
- left: 0;
- width: auto;
- height: auto;
- min-width: 52px;
- padding: 0 6px;
- font-size: 0.69em;
- line-height: 1.63;
- letter-spacing: -1px;
- text-indent: 0;
- color: var(--color-font-grey);
- }
-
- h2 .btn_txt_style1 .hc {
- font-weight: normal;
- }
-
- .btn_txt_style1.open,.btn_txt_style1.close {
- width: auto;
- padding-right: 6px;
- }
-
- .btn_txt_style1.open .hc {
- min-width: 43px;
- padding-right: 9px;
- background-size: 7px 42px;
- }
-
- .btn_txt_style1.close .hc {
- min-width: 43px;
- padding-right: 9px;
- background-size: 7px 42px;
- }
-
- .btn_r_abs {
- position: relative;
- right: 12px;
- text-align: right;
- margin-bottom: -18px;
+ margin-right: 4px;
+ color: #213eab;
+ font-size: 1.2em;
}
- .btn_r_abs .btn_txt_style1 {
- position: relative;
- display: inline-block;
- top: 0;
- right: 0;
+ .dictNaver-EntrySup {
+ color: #213eab;
+ margin: 0 4px;
}
- .btn_txt_style1.ft_small,.btn_txt_style1.ft_big {
- width: 30px;
- padding: 0;
- text-align: center;
+ .dictNaver-EntryKanji {
+ font-size: 1.1em;
font-weight: bold;
- color: #aaa;
- border: 1px solid #afafaf;
- }
-
- .btn_txt_style1.ft_small {
- margin-right: -1px;
- padding: 0 1px;
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- border-right: 0;
- }
-
- .btn_txt_style1.ft_small .hc {
- position: relative;
- top: 1px;
- padding: 0 6px 0 3px;
- font-size: 0.75em;
- color: #999;
- }
-
- .btn_txt_style1.ft_big {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
- }
-
- .btn_txt_style1.ft_big .hc {
- position: relative;
- top: 1px;
- padding: 0 5px 0 3px;
- font-size: 0.94em;
- color: #999;
- }
-
- .btn_txt_style1.ft_small.on .hc,.btn_txt_style1.ft_big.on .hc {
- color: #444;
- }
-
- .con_clt .ask,.con_clt .ask .arr_top {
- background-size: 80px 80px;
- }
-
- .con_clt .ask,.con_clt .txt_box1 {
- position: relative;
- top: -1px;
}
- .con_clt .txt_box1 {
+ .dictNaver-EntryPron {
display: inline-block;
- width: auto;
- height: auto;
- padding: 0 5px 0 6px;
- border: 1px solid #d8d8d8;
- line-height: 0;
- background: #fff;
- vertical-align: top;
- }
-
- .con_clt .txt_box1 .hc {
- visibility: visible;
- overflow: visible;
- position: relative;
- left: 0;
- width: auto;
- height: auto;
- font-size: 0.81em;
- color: #6c6c6c;
- line-height: 1.19;
- }
- .con_clt .ask {
- position: relative;
- display: inline-block;
- width: 20px;
- height: 20px;
- margin-left: 2px;
- background-position: -55px 0;
- vertical-align: middle;
+ .dictNaver-EntryPronFa {
+ display: inline-block;
+ height: 14px;
+ line-height: 14px;
+ margin-right: 4px;
+ border: 1px solid #e0e0e0;
+ background-color: #fff;
+ padding: 0 2px;
+ font-size: 12px;
+ color: #999;
+ }
}
- .con_clt .ask a {
- display: block;
- width: 20px;
- height: 20px;
+ .dictNaver-EntryExp {
+ .dictNaver-EntryExpPos {
+ color: #71829f;
+ margin: 0 4px;
+ }
}
- .con_clt .ask .pop_clt {
+ .dictNaver-EntrySource {
+ color: #969696;
display: inline-block;
- position: absolute;
- padding: 9px 28px 3px 13px;
- width: 198px;
- border: 1px solid #A5A8B0;
- background: #fff;
- font-size: 0.81em;
- color: #777;
- z-index: 20;
- top: 28px;
- }
+ font-size: 12px;
- .con_clt .ask .pop_clt p {
- padding-bottom: 7px;
- color: #777;
- font-size: 0.81em;
- line-height: 1.19;
+ &:hover {
+ text-decoration: none;
+ }
}
+}
- .con_clt .ask .pop_clt a {
- display: block;
- position: absolute;
- top: 5px;
- right: 5px;
- background-position: 100% -45px;
- }
+.dictNaver-MeanBox {
+ border: 1px solid #eee;
+ padding: 1em 0.5em 0.5em;
+ margin-top: 1.4em;
+ position: relative;
- .con_clt .ask .arr_top {
- display: block;
+ .dictNaver-MeanBoxTitle {
position: absolute;
- top: 22px;
- left: 4px;
- width: 12px;
- height: 8px;
- background-position: -45px -45px;
- z-index: 20;
- }
-
- .con_clt .ask .pop_clt.off,.con_clt .ask .arr_top.off {
- display: none !important;
- }
-
- .srch_box .srch_top .con_clt .txt_box1 {
- vertical-align: middle;
- }
-
- .srch_box .srch_top .con_clt .ask, .srch_box .srch_top .con_clt .txt_box1 {
top: 0;
+ left: 0.8em;
+ transform: translateY(-50%);
+ padding: 0 0.4em;
+ font-size: 1.3em;
+ font-weight: bold;
+ background: var(--color-background);
}
- .con_clt .pop_clt a,.con_clt .arr_top {
- background-size: 80px 80px;
- }
-
- .con_clt {
- display: inline-block;
- position: relative;
- line-height: 0;
- font-weight: normal;
- }
-
- .con_clt a {
- display: block;
- width: 20px;
- height: 20px;
- }
-
- .con_clt .pop_clt {
+ .dictNaver-MeanTitle {
display: inline-block;
- position: absolute;
- padding: 9px 28px 3px 13px;
- width: 198px;
- border: 1px solid #A5A8B0;
- background: #fff;
- font-size: 0.81em;
- color: #777;
- z-index: 20;
- top: 28px;
- }
-
- .con_clt .pop_clt p {
- padding-bottom: 7px;
- color: #777;
- font-size: 0.81em;
- line-height: 1.19;
- }
-
- .con_clt .pop_clt a {
- display: block;
- position: absolute;
- top: 5px;
- right: 5px;
- background-position: 100% -45px;
- }
-
- .con_clt .arr_top {
- display: block;
- position: absolute;
- top: 22px;
- left: 50%;
- margin-left: -6px;
- width: 12px;
- height: 8px;
- background-position: -45px -45px;
- z-index: 20;
- }
-
- .con_clt .pop_clt.off,.con_clt .arr_top.off {
- display: none !important;
+ margin-right: 4px;
+ color: #213eab;
+ font-size: 1.2em;
}
- .srch_box .srch_top .con_clt {
- line-height: 0;
+ .dictNaver-MeanSup {
+ color: #213eab;
}
- .btn_collect {
- padding: 0 5px 0 6px;
- background: #fff;
- border: 1px solid #d8d8d8;
- font-size: 0.81em;
- color: #6c6c6c;
- line-height: 1.19;
+ .dictNaver-MeanAlias {
+ color: #5b5b5b;
+ margin: 0 4px;
}
- .tts_wrap {
+ .dictNaver-MeanPron {
display: inline-block;
- line-height: 0;
}
- .btn_tts {
- padding: 0 5px 0 6px;
- background: #fff;
- border: 1px solid #d8d8d8;
- font-size: 0.81em;
- color: #6c6c6c;
- line-height: 1.19;
- }
+ .dictNaver-MeanExp {
+ .dictNaver-MeanExpPos {
+ color: #71829f;
+ margin: 0 4px;
+ }
- .ly_wrap {
- position: absolute;
- left: 0;
- right: 0;
- text-align: center;
+ .dictNaver-MeanExpLg {
+ color: #858585;
+ margin-right: 4px;
+ }
}
- .ly_tts_desc {
- position: relative;
+ .dictNaver-MeanSource {
+ color: #969696;
display: inline-block;
- padding: 8px 12px;
- background: #fffef0;
- border: 1px solid #c3c1a2;
- text-align: left;
- z-index: 50;
- }
+ margin-top: 2px;
+ font-size: 12px;
- .ly_tts_desc .title {
- display: block;
- font-size: 0.88em;
- line-height: 0.94;
- font-weight: bold;
- color: #11c948;
+ &:hover {
+ text-decoration: none;
+ }
}
+}
- .ly_tts_desc .text {
- margin-top: 3px;
- padding: 0;
- font-size: 0.94em;
- line-height: 1.13;
- letter-spacing: -0.075em;
- color: currentColor;
- }
+.dictNaver-ExampleBox {
+ border: 1px solid #eee;
+ padding: 1em 0.5em 0.5em;
+ margin-top: 1.4em;
+ position: relative;
- .tts_wrap .btn_close {
+ .dictNaver-ExampleBoxTitle {
position: absolute;
- overflow: hidden;
top: 0;
- right: 0;
- width: 29px;
- height: 29px;
- background-size: 29px auto;
- border: 0;
- font-size: 0;
- color: transparent;
- }
-
- .srch_box .srch_top .tts_wrap {
- line-height: 0;
+ left: 0.8em;
+ transform: translateY(-50%);
+ padding: 0 0.4em;
+ font-size: 1.3em;
+ font-weight: bold;
+ background: var(--color-background);
}
- .websource {
+ .dictNaver-ExampleTitle {
display: inline-block;
- padding-left: 4px;
- font-family: '돋움',dotum,Helvetica,sans-serif;
- font-size: 0.75em;
- color: #999;
- }
-
- .txt_origin {
- padding: 0 10px 10px 0;
- text-align: right;
- color: #767676;
- font-size: 0.88em;
- }
-
- .txt_origin a {
- color: #767676;
- }
-
- #naver_dic_audio_controller {
- display: block;
- }
-
- .container {
- background-color: #e6e6e6;
- }
-
- .srch_box .pin .img_info_wrap {
- position: relative;
- margin-bottom: -11px;
- padding: 7px 0 9px;
- overflow: hidden;
- background-color: #fff;
- color: currentColor;
- display: -ms-flexbox;
- display: -webkit-flex;
- display: flex;
- -ms-flex-align: center;
- -webkit-align-items: center;
- -webkit-box-align: center;
- align-items: center;
- }
-
- .srch_box .pin .img_info_wrap .img_area {
- position: relative;
- height: 80px;
- padding-right: 110px;
- margin: 0 8px 0 -2px;
- line-height: 4.38;
- font-size: 0;
- overflow: hidden;
- display: -webkit-box;
- background-size: 100% auto;
- background-position: 50% 0;
- background-repeat: no-repeat;
- }
-
- .srch_box .pin .img_info_wrap .img_area:after {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- border: 5px solid #fff;
- content: '';
- }
-
- .srch_box .pin .img_info_wrap .info {
- display: -webkit-box;
- -webkit-line-clamp: 3;
- -webkit-box-orient: vertical;
- text-overflow: ellipsis;
- max-height: 60px;
- word-wrap: break-word;
- overflow: hidden;
- font-size: 0.81em;
- line-height: 1.13;
- white-space: normal;
- color: var(--color-font-grey);
- }
-
- .section_box.kor_food .section {
- padding: 10px 0 10px;
- border-bottom: 1px solid #d5d5d5;
- }
-
- .section_box.kor_food .section .image_wrap {
- position: relative;
- padding: 15px 15px 5px;
- }
-
- .section_box.kor_food .section .image_wrap .image_area {
- text-align: center;
- }
-
- .section_box.kor_food .section .image_wrap img {
- max-width: 100%;
- max-height: 400px;
- vertical-align: top;
- }
-
- .section_box.kor_food + .userentry_section {
- border-top: none;
- }
-
- .section_box.kor_food ul.lst .inner_lst {
- padding: 0 15px;
- }
-
- .section_box.kor_food ol.lst .inner_lst {
- padding: 0 15px 0 0;
- }
-
- .section_box.kor_food .lst li .lst_txt {
- font-size: 1.00em;
- }
-
- .section_box.kor_food .lst li .lst_txt + p {
- margin-top: 20px;
- }
-
- .section_box.kor_food .lst li > p {
- margin-top: 10px;
- padding-bottom: 12px;
- }
-
- .section_box.kor_food .lst li > p .ico_bl + span {
- margin-right: 10px;
- }
-
- .section_box.kor_food .lst li > p .player {
- position: relative;
- margin-left: -5px;
- }
-
- .section_box.kor_food .lst li > p .kor {
- display: block;
- margin-top: -3px;
- color: var(--color-font-grey);
- }
-
- .detail_jpkr .section_box.kor_food ol.lst li .cen_box2 {
- margin: 17px 0 0 -15px;
- }
-
- .section_box .section .source {
- display: block;
- padding: 8px 15px 20px;
- font-size: 0.75em;
- text-align: right;
- color: #aaa;
- word-wrap: normal;
- word-break: break-all;
- }
-
- .section_box .section .source a {
- color: #aaa;
- }
-
- .section_box.kor_food .food_desc {
- border-top: 9px solid #f0f0f0;
- border-bottom: 9px solid #f0f0f0;
- }
-
- .section_box.kor_food .food_desc .section_tit {
- height: 40px;
- padding: 0 12px;
- border-bottom: 1px solid #ebebeb;
- line-height: 2.56;
- font-size: 1.00em;
- color: #444;
- }
-
- .section_box.kor_food .food_desc .image_wrap {
- position: relative;
- padding: 20px 15px 15px;
- }
-
- .section_box.kor_food .food_desc .image_wrap:after {
- display: block;
- position: absolute;
- bottom: 0;
- left: 3px;
- right: 2px;
- content: '';
- height: 1px;
- background-size: 4px 1px;
- background-repeat: repeat-x;
- }
-
- .section_box.kor_food .food_desc .image_wrap .image_area {
- position: relative;
- text-align: center;
- }
-
- .section_box.kor_food .food_desc .image_wrap img {
- max-width: 100%;
- max-height: 400px;
- vertical-align: top;
- }
-
- .section_box.kor_food .food_desc .mean_wrap {
- padding: 19px 14px 0;
- border-bottom: 1px solid #e5e5e5;
- }
-
- .section_box.kor_food .food_desc .mean_wrap .mean {
- font-size: 0.94em;
- line-height: 1.25;
- }
-
- .section_box.kor_food .food_desc .mean_wrap .mean + .mean {
- margin-top: 13px;
- }
-
- .section_box.kor_food .food_desc .mean_wrap .mean[lang="ja"] {
- font-size: 1.06em;
- line-height: 1.38;
- }
-
- .section_box.kor_food .food_desc .mean_wrap .source {
- display: block;
- padding: 15px 0 20px;
- font-size: 0.75em;
- text-align: right;
- color: #aaa;
+ margin-right: 4px;
+ // color: #213eab;
+ font-size: 1.2em;
}
- .section_box.kor_food .food_desc .mean_wrap .source a {
- color: #aaa;
+ .dictNaver-ExamplePron {
+ display: inline-block;
}
- .section.all:first-of-type {
- border: none;
- }
+ .dictNaver-ExampleSource {
+ color: #969696;
+ display: inline-block;
+ margin-top: 2px;
+ font-size: 12px;
- .section .more2 {
- padding-bottom: 5px !important;
+ &:hover {
+ text-decoration: none;
+ }
}
+}
- .lst_p {
- margin: 0;
- }
+ruby {
+ margin-right: 4px;
- ruby rt,
- .tbl_bx.srch,
- .play,
- .tts_wrap,
- .btn_play,
- .btn_collect,
- ._commonClose {
- display: none !important;
+ & rt {
+ color: #fb5b63;
}
}
diff --git a/src/components/dictionaries/naver/engine.ts b/src/components/dictionaries/naver/engine.ts
index 292bdc7b7..788af09c4 100644
--- a/src/components/dictionaries/naver/engine.ts
+++ b/src/components/dictionaries/naver/engine.ts
@@ -1,29 +1,27 @@
-import { fetchDirtyDOM } from '@/_helpers/fetch-dom'
import {
handleNoResult,
handleNetWorkError,
- getInnerHTML,
SearchFunction,
GetSrcPageFunction,
- HTMLString,
- removeChildren,
- DictSearchResult,
- externalLink
+ DictSearchResult
} from '../helpers'
import { isContainJapanese, isContainKorean } from '@/_helpers/lang-check'
+import axios from 'axios'
export const getSrcPage: GetSrcPageFunction = text => {
return isContainJapanese(text)
- ? `https://ja.dict.naver.com/search.nhn?range=all&q=${encodeURIComponent(
- text
- )}`
+ ? `https://ja.dict.naver.com/#/search?query=${encodeURIComponent(text)}`
: `https://zh.dict.naver.com/#/search?query=${encodeURIComponent(text)}`
}
/** Alternate machine translation result */
export interface NaverResult {
lang: 'zh' | 'ja'
- entry: HTMLString
+ entry: {
+ WORD: { items: any[] }
+ MEANING: { items: any[] }
+ EXAMPLE: { items: any[] }
+ }
}
interface NaverPayload {
@@ -53,72 +51,47 @@ export const search: SearchFunction<NaverResult, NaverPayload> = (
}
async function zhDict(text: string): Promise<NaverSearchResult> {
- try {
- var doc = await fetchDirtyDOM(
- `http://m.cndic.naver.com/search/all?sLn=zh_CN&fromNewVer&q=${encodeURIComponent(
+ const { data } = await axios
+ .get(
+ `https://zh.dict.naver.com/api3/zhko/search?query=${encodeURIComponent(
text
- )}`
+ )}&lang=zh_CN`
)
- } catch (e) {
- return handleNetWorkError()
- }
+ .catch(handleNetWorkError)
+
+ const ListMap = data?.searchResultMap?.searchResultListMap
- let $container = doc.querySelector('#ct')
- if (!$container) {
+ if (!ListMap) {
return handleNoResult()
}
- $container = $container.querySelector('#ct') || $container
-
- removeChildren($container, '.recent_searches')
- removeChildren($container, '.m_tab')
- removeChildren($container, '.con_clt')
- removeChildren($container, '.info_userent')
- removeChildren($container, '.go_register')
- removeChildren($container, '.section_banner')
- removeChildren($container, '.spi_area')
- removeChildren($container, '.word_otr.word_line')
- removeChildren($container, '.common_btn_wrap.my_vlive_pageBar')
-
- $container
- .querySelectorAll<HTMLAnchorElement>('a.more_d')
- .forEach(externalLink)
-
return {
result: {
lang: 'zh',
- entry: getInnerHTML('http://m.cndic.naver.com', $container)
+ entry: ListMap
}
}
}
async function jaDict(text: string): Promise<NaverSearchResult> {
- try {
- var doc = await fetchDirtyDOM(
- `https://ja.dict.naver.com/search.nhn?range=all&q=${encodeURIComponent(
+ const { data } = await axios
+ .get(
+ `https://ja.dict.naver.com/api3/jako/search?query=${encodeURIComponent(
text
)}`
)
- } catch (e) {
- return handleNetWorkError()
- }
+ .catch(handleNetWorkError)
+
+ const ListMap = data?.searchResultMap?.searchResultListMap
- const $container = doc.querySelector('#content')
- if (!$container) {
+ if (!ListMap) {
return handleNoResult()
}
- removeChildren($container, '.sorting')
- removeChildren($container, '.info_userent')
- removeChildren($container, '.view_ctrl')
- removeChildren($container, '.go_register')
- removeChildren($container, '.section_banner')
- removeChildren($container, '.conjugate')
-
return {
result: {
lang: 'ja',
- entry: getInnerHTML('https://ja.dict.naver.com', $container)
+ entry: ListMap
}
}
}
diff --git a/test/specs/components/dictionaries/naver/engine.spec.ts b/test/specs/components/dictionaries/naver/engine.spec.ts
index 7afe05a73..a5637eb0c 100644
--- a/test/specs/components/dictionaries/naver/engine.spec.ts
+++ b/test/specs/components/dictionaries/naver/engine.spec.ts
@@ -10,7 +10,7 @@ describe('Dict/Naver/engine', () => {
isPDF: false
}).then(searchResult => {
expect(searchResult.result.lang).toBe('zh')
- expect(typeof searchResult.result.entry).toBe('string')
+ expect(typeof searchResult.result.entry).toBe('object')
})
)
})
@@ -22,7 +22,7 @@ describe('Dict/Naver/engine', () => {
search('愛', getDefaultConfig(), profile, { isPDF: false }).then(
searchResult => {
expect(searchResult.result.lang).toBe('ja')
- expect(typeof searchResult.result.entry).toBe('string')
+ expect(typeof searchResult.result.entry).toBe('object')
}
)
)
diff --git a/test/specs/components/dictionaries/naver/fixtures.js b/test/specs/components/dictionaries/naver/fixtures.js
index 9c57f7eb7..266d5cf67 100644
--- a/test/specs/components/dictionaries/naver/fixtures.js
+++ b/test/specs/components/dictionaries/naver/fixtures.js
@@ -1,14 +1,15 @@
module.exports = {
files: [
[
- '愛.html',
- 'https://ja.dict.naver.com/search.nhn?range=all&q=' +
+ '愛.json',
+ 'https://ja.dict.naver.com/api3/jako/search?query=' +
encodeURIComponent('愛')
],
[
- '爱.html',
- 'http://m.cndic.naver.com/search/all?sLn=zh_CN&fromNewVer&q=' +
- encodeURIComponent('爱')
+ '爱.json',
+ `https://zh.dict.naver.com/api3/zhko/search?query=${encodeURIComponent(
+ '爱'
+ )}&lang=zh_CN`
]
]
}
diff --git a/test/specs/components/dictionaries/naver/requests.mock.ts b/test/specs/components/dictionaries/naver/requests.mock.ts
index 85ba013e7..523e13c51 100644
--- a/test/specs/components/dictionaries/naver/requests.mock.ts
+++ b/test/specs/components/dictionaries/naver/requests.mock.ts
@@ -5,9 +5,9 @@ export const mockSearchTexts = ['爱', '愛']
export const mockRequest: MockRequest = mock => {
mock
.onGet(new RegExp('naver.+' + encodeURIComponent('爱')))
- .reply(200, require(`raw-loader!./response/爱.html`).default)
+ .reply(200, require(`./response/爱.json`))
mock
.onGet(new RegExp('naver.+' + encodeURIComponent('愛')))
- .reply(200, require(`raw-loader!./response/愛.html`).default)
+ .reply(200, require(`./response/愛.json`))
}
|
refactor
|
update naver dict (#1483)
|
0135b3e84ec85af382e2e94470b5c1705e1e830e
|
2020-08-03 11:14:27
|
crimx
|
fix(dicts): cambridge idiom-only entry
| false
|
diff --git a/src/components/dictionaries/cambridge/_style.shadow.scss b/src/components/dictionaries/cambridge/_style.shadow.scss
index add4db09a..306948131 100644
--- a/src/components/dictionaries/cambridge/_style.shadow.scss
+++ b/src/components/dictionaries/cambridge/_style.shadow.scss
@@ -379,7 +379,7 @@ h1.hw,
}
.di-title {
- font-size: 1.5em;
+ font-size: 1.2em;
font-weight: bold;
line-height: 1.3;
// border-bottom: 1px solid currentColor;
diff --git a/src/components/dictionaries/cambridge/engine.ts b/src/components/dictionaries/cambridge/engine.ts
index 3d2322dd1..14bc12027 100644
--- a/src/components/dictionaries/cambridge/engine.ts
+++ b/src/components/dictionaries/cambridge/engine.ts
@@ -86,11 +86,7 @@ function handleDOM(
)
if (!$source) return
- const src = getFullLink(
- 'https://dictionary.cambridge.org',
- $source,
- 'src'
- )
+ const src = getFullLink(HOST, $source, 'src')
if (src) {
$daud.replaceWith(getStaticSpeaker(src))
@@ -147,6 +143,27 @@ function handleDOM(
})
})
+ if (result.length <= 0) {
+ // check idiom
+ const $idiom = doc.querySelector('.idiom-block')
+ if ($idiom) {
+ removeChild($idiom, '.bb.hax')
+
+ // expand button
+ $idiom.querySelectorAll('.daccord_h').forEach($btn => {
+ $btn.parentElement!.classList.add('amp-accordion')
+ })
+
+ // See more results
+ $idiom.querySelectorAll<HTMLAnchorElement>('a.had').forEach(externalLink)
+
+ result.push({
+ id: '`d-cambridge-entry-idiom',
+ html: getInnerHTML(HOST, $idiom)
+ })
+ }
+ }
+
if (result.length > 0) {
return { result, audio, catalog }
}
|
fix
|
cambridge idiom-only entry
|
a5f2af038e4687baa550a9ca158fc950dff8972f
|
2018-05-16 00:19:46
|
CRIMX
|
feat(build): add devbuild flag
| false
|
diff --git a/config/env.js b/config/env.js
index c42eccc8e..385f15497 100644
--- a/config/env.js
+++ b/config/env.js
@@ -75,6 +75,7 @@ function getClientEnvironment(publicUrl) {
// images into the `src` and `import` them in code to get their paths.
PUBLIC_URL: publicUrl,
DEBUG_MODE: process.env.DEBUG_MODE || '',
+ DEV_BUILD: process.env.DEV_BUILD || '',
}
)
// Stringify all values so we can feed into Webpack DefinePlugin
diff --git a/scripts/build.js b/scripts/build.js
index a944e1147..a7fe1402e 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -7,6 +7,7 @@ process.env.PUBLIC_URL = './'
const argv = require('minimist')(process.argv.slice(2))
if (argv.debug) { process.env.DEBUG_MODE = true }
+if (argv.devbuild) { process.env.DEV_BUILD = true }
// Makes the script crash on unhandled rejections instead of silently
// ignoring them. In the future, promise rejections that are not handled will
diff --git a/src/background/initialization.ts b/src/background/initialization.ts
index 47961b6b2..45faf27ab 100644
--- a/src/background/initialization.ts
+++ b/src/background/initialization.ts
@@ -17,13 +17,17 @@ function onInstalled ({ reason, previousVersion }: { reason: string, previousVer
// merge config on installed
storage.sync.get('config')
.then(({ config }: { config: AppConfig }) => {
- if (config && config.dicts) {
- // got previous config
- return mergeConfig(config)
+ if (!process.env.DEV_BUILD) {
+ if (config && config.dicts) {
+ // got previous config
+ return mergeConfig(config)
+ }
}
return storage.sync.clear() // local get cleared by database
.then(() => {
- openURL('https://github.com/crimx/crx-saladict/wiki/Instructions')
+ if (!process.env.DEV_BUILD) {
+ openURL('https://github.com/crimx/crx-saladict/wiki/Instructions')
+ }
return mergeConfig()
})
})
|
feat
|
add devbuild flag
|
f86f77e8a23529da4d40592ce0ec1a3cb5d34b2d
|
2018-08-27 10:08:33
|
CRIMX
|
fix(locales): typo
| false
|
diff --git a/src/_locales/popup/messages.json b/src/_locales/popup/messages.json
index 0c8673878..53dcbfd2b 100644
--- a/src/_locales/popup/messages.json
+++ b/src/_locales/popup/messages.json
@@ -2,7 +2,7 @@
"app_active_title": {
"zh_CN": "启用划词",
"zh_TW": "啓用滑鼠劃字",
- "en": "Endable Inline Translator"
+ "en": "Enable Inline Translator"
},
"app_temp_active_title": {
"zh_CN": "对当前页暂时关闭划词",
|
fix
|
typo
|
6440aa2c6cc71fdcab9d547f57444fbbb8109222
|
2018-10-29 17:43:40
|
CRIMX
|
refactor: separate service layer
| false
|
diff --git a/src/_helpers/sync-manager/helpers.ts b/src/_helpers/sync-manager/helpers.ts
index cc6018d9b..c153a7f52 100644
--- a/src/_helpers/sync-manager/helpers.ts
+++ b/src/_helpers/sync-manager/helpers.ts
@@ -15,7 +15,7 @@ export interface NotebookFile {
* Check server and create a Saladict Directory if not exist.
*/
export interface InitServer<C> {
- (config: C): Promise<boolean>
+ (config: C): Promise<void>
}
/**
@@ -68,5 +68,5 @@ export async function setNotebook (words: Word[]): Promise<void> {
}
export async function getNotebook (): Promise<Word[]> {
- return (await getWords({ type: MsgType.GetWords, area: 'notebook' })).words
+ return (await getWords({ type: MsgType.GetWords, area: 'notebook' })).words || []
}
diff --git a/src/_helpers/sync-manager/index.ts b/src/_helpers/sync-manager/index.ts
index 2e5b1b288..015e9c784 100644
--- a/src/_helpers/sync-manager/index.ts
+++ b/src/_helpers/sync-manager/index.ts
@@ -7,33 +7,37 @@ import { empty } from 'rxjs/observable/empty'
import * as service from './services/webdav'
import { createSyncConfigStream, getMeta, setMeta, setNotebook, getNotebook, NotebookFile, getSyncConfig } from './helpers'
-// Moniter sync configs and start interval
-createSyncConfigStream().pipe(
- switchMap(configs => {
- if (!configs || !configs[service.serviceID]) {
- if (process.env.DEV_BUILD) {
- console.log('No Sync Service Conifg', configs, service.serviceID)
+/** Init on new server */
+export function initSyncService (config: any): Promise<void> {
+ return service.initServer(config)
+}
+
+export function startSyncServiceInterval () {
+ // Moniter sync configs and start interval
+ createSyncConfigStream().pipe(
+ switchMap(configs => {
+ if (!configs || !configs[service.serviceID]) {
+ if (process.env.DEV_BUILD) {
+ console.log('No Sync Service Conifg', configs, service.serviceID)
+ }
+ return empty<void>()
}
- return empty<void>()
- }
- if (process.env.DEV_BUILD) {
- console.log('Sync Service Conifg', configs, service.serviceID)
- }
+ if (process.env.DEV_BUILD) {
+ console.log('Sync Service Conifg', configs, service.serviceID)
+ }
- const config = configs[service.serviceID]
+ const config = configs[service.serviceID]
- return fromPromise<void>(downlaod(config)).pipe(
- delay(config.duration),
- repeat(),
- )
- })
-)
+ return fromPromise<void>(downlaod(config)).pipe(
+ delay(config.duration),
+ repeat(),
+ )
+ })
+ )
+}
export async function upload () {
- const words = await getNotebook()
- if (!words || words.length <= 0) { return }
-
const config = await getSyncConfig<service.SyncConfig>(service.serviceID)
if (!config) {
if (process.env.DEV_BUILD) {
@@ -42,6 +46,11 @@ export async function upload () {
return
}
+ await downlaod(config)
+
+ const words = await getNotebook()
+ if (!words || words.length <= 0) { return }
+
const timestamp = Date.now()
let text: string
diff --git a/src/_helpers/sync-manager/services/webdav.ts b/src/_helpers/sync-manager/services/webdav.ts
index 80f040c37..c6bb97d87 100644
--- a/src/_helpers/sync-manager/services/webdav.ts
+++ b/src/_helpers/sync-manager/services/webdav.ts
@@ -3,8 +3,8 @@ import {
InitServer,
Upload,
DlChanged,
- setMeta,
getNotebook,
+ setNotebook,
} from '../helpers'
export interface SyncConfig {
@@ -23,52 +23,6 @@ export interface Meta {
export const serviceID = 'webdav'
-export const initServer: InitServer<SyncConfig> = async config => {
- const text = await fetch(config.url, {
- method: 'PROPFIND',
- headers: {
- 'Authorization': 'Basic ' + window.btoa(`${config.user}:${config.passwd}`),
- 'Content-Type': 'application/xml; charset="utf-8"',
- 'Depth': '2',
- },
- }).then(r => r.text())
-
- const doc = new DOMParser().parseFromString(text, 'application/xml')
-
- const dir = Array.from(doc.querySelectorAll('response'))
- .find(el => {
- const href = el.querySelector('href')
- if (href && href.textContent && href.textContent.endsWith('/Saladict/')) {
- // is Saladict
- if (el.querySelector('resourcetype collection')) {
- // is collection
- return true
- }
- }
- return false
- })
-
- if (!dir) {
- // create directory
- const response = await fetch(config.url + 'Saladict', { method: 'MKCOL' })
- if (!response.ok) {
- // cannot create directory
- return Promise.reject('mkcol')
- }
- return true
- }
-
- const file = await dlChanged(config, {})
- if (file) {
- // file exist
- // remind use for overwriting
- return Promise.reject('exist')
- }
-
- const words = await getNotebook()
- return true
-}
-
export const upload: Upload<SyncConfig> = async (config, text) => {
const response = await fetch(config.url + 'Saladict/notebook.json', {
method: 'PUT',
@@ -140,3 +94,57 @@ export const dlChanged: DlChanged<SyncConfig, Meta> = async (
return { json, etag: response.headers.get('ETag') || '' }
}
+
+export const initServer: InitServer<SyncConfig> = async config => {
+ let text: string
+
+ try {
+ text = await fetch(config.url, {
+ method: 'PROPFIND',
+ headers: {
+ 'Authorization': 'Basic ' + window.btoa(`${config.user}:${config.passwd}`),
+ 'Content-Type': 'application/xml; charset="utf-8"',
+ 'Depth': '2',
+ },
+ }).then(r => r.text())
+ } catch (e) {
+ return Promise.reject('network')
+ }
+
+ const doc = new DOMParser().parseFromString(text, 'application/xml')
+
+ const dir = Array.from(doc.querySelectorAll('response'))
+ .find(el => {
+ const href = el.querySelector('href')
+ if (href && href.textContent && href.textContent.endsWith('/Saladict/')) {
+ // is Saladict
+ if (el.querySelector('resourcetype collection')) {
+ // is collection
+ return
+ }
+ }
+ return Promise.reject('parse') as any
+ })
+
+ if (!dir) {
+ // create directory
+ const response = await fetch(config.url + 'Saladict', { method: 'MKCOL' })
+ if (!response.ok) {
+ // cannot create directory
+ return Promise.reject('mkcol')
+ }
+ return
+ }
+
+ const file = await dlChanged(config, {})
+ if (file) {
+ const words = await getNotebook()
+ if (words.length > 0) {
+ // file exist
+ // require use permission for overwriting
+ return Promise.reject('exist')
+ } else {
+ await setNotebook(file.json.words)
+ }
+ }
+}
diff --git a/src/background/server.ts b/src/background/server.ts
index bbb719e9e..a5fc40aec 100644
--- a/src/background/server.ts
+++ b/src/background/server.ts
@@ -1,12 +1,13 @@
+import { appConfigFactory, TCDirection } from '@/app-config'
import { message, openURL } from '@/_helpers/browser-api'
-import { play } from './audio-manager'
-import { isInNotebook, saveWord, deleteWords, getWordsByText, getWords } from './database'
import { chsToChz } from '@/_helpers/chs-to-chz'
-import { appConfigFactory, TCDirection } from '@/app-config'
+import { initSyncService } from '@/_helpers/sync-manager'
+import { timeout, timer } from '@/_helpers/promise-more'
import { createActiveConfigStream } from '@/_helpers/config-manager'
import { DictSearchResult } from '@/typings/server'
-import { timeout, timer } from '@/_helpers/promise-more'
import { SearchErrorType, SearchFunction } from '@/components/dictionaries/helpers'
+import { isInNotebook, saveWord, deleteWords, getWordsByText, getWords } from './database'
+import { play } from './audio-manager'
import {
MsgType,
MsgOpenUrl,
@@ -18,6 +19,7 @@ import {
MsgGetWordsByText,
MsgGetWords,
MsgQSPanelIDChanged,
+ MsgSyncServiceInit,
} from '@/typings/message'
browser.browserAction.setBadgeBackgroundColor({ color: '#C0392B' })
@@ -71,6 +73,9 @@ message.addListener((data, sender: browser.runtime.MessageSender) => {
case MsgType.GetWords:
return getWords(data as MsgGetWords)
+ case MsgType.SyncServiceInit:
+ return initSyncService((data as MsgSyncServiceInit).config)
+
case 'youdao_translate_ajax' as any:
return youdaoTranslateAjax(data.request)
}
diff --git a/src/typings/message.ts b/src/typings/message.ts
index 94b3ba426..96dbe786c 100644
--- a/src/typings/message.ts
+++ b/src/typings/message.ts
@@ -66,6 +66,8 @@ export const enum MsgType {
/** Manually emit selection event */
EmitSelection,
+ SyncServiceInit,
+
/**
* Background proxy sends back underlyingly
*/
@@ -207,7 +209,12 @@ export interface MsgQSPanelSearchText {
export type MsgQueryQSPanelResponse = boolean
export interface MsgQueryPanelState {
- type: MsgType.QueryPanelState,
+ type: MsgType.QueryPanelState
/** object path, default returns the whole state */
path?: string
}
+
+export interface MsgSyncServiceInit {
+ type: MsgType.SyncServiceInit
+ config: any
+}
|
refactor
|
separate service layer
|
956d2aff3d06e31cde359fd7ea77d5ebdd7bf0d0
|
2018-04-16 17:31:19
|
CRIMX
|
feat(content): add redux store
| false
|
diff --git a/src/content/redux/create.ts b/src/content/redux/create.ts
new file mode 100644
index 000000000..8bb9c5e09
--- /dev/null
+++ b/src/content/redux/create.ts
@@ -0,0 +1,20 @@
+import { createStore, applyMiddleware, compose } from 'redux'
+import thunk from 'redux-thunk'
+import rootReducer from './modules'
+
+import { listenConfig } from './modules/config'
+import { listenSelection } from './modules/selection'
+
+export default () => {
+ const composeEnhancers = window['__REDUX_DEVTOOLS_EXTENSION_COMPOSE__'] || compose
+
+ const store = createStore(
+ rootReducer,
+ composeEnhancers(applyMiddleware(thunk))
+ )
+
+ store.dispatch(listenConfig())
+ store.dispatch(listenSelection())
+
+ return store
+}
diff --git a/src/content/redux/modules/config.ts b/src/content/redux/modules/config.ts
new file mode 100644
index 000000000..01a3e0a9d
--- /dev/null
+++ b/src/content/redux/modules/config.ts
@@ -0,0 +1,42 @@
+import { appConfigFactory, AppConfig } from '@/app-config'
+import { addAppConfigListener } from '@/_helpers/config-manager'
+
+/*-----------------------------------------------*\
+ Actions
+\*-----------------------------------------------*/
+
+const enum Actions {
+ NEW_CONFIG = 'configs/NEW_CONFIG'
+}
+
+/*-----------------------------------------------*\
+ State
+\*-----------------------------------------------*/
+
+export type ConfigState = AppConfig
+
+export default function reducer (state = appConfigFactory(), action) {
+ switch (action.type) {
+ case Actions.NEW_CONFIG:
+ return action.payload
+ default:
+ return state
+ }
+}
+
+/*-----------------------------------------------*\
+ Action Creators
+\*-----------------------------------------------*/
+
+/** When app config is updated */
+export const newConfig = config => ({ type: Actions.NEW_CONFIG, payload: config })
+
+/*-----------------------------------------------*\
+ Side Effects
+\*-----------------------------------------------*/
+
+export function listenConfig () {
+ return dispatch => {
+ addAppConfigListener(({ config }) => dispatch(newConfig(config)))
+ }
+}
diff --git a/src/content/redux/modules/index.ts b/src/content/redux/modules/index.ts
new file mode 100644
index 000000000..28546185f
--- /dev/null
+++ b/src/content/redux/modules/index.ts
@@ -0,0 +1,19 @@
+import { combineReducers } from 'redux'
+import config, { ConfigState } from './config'
+import selection, { SelectionState } from './selection'
+import dictionaries, { DictionariesState } from './dictionaries'
+import widget, { WidgetState } from './widget'
+
+export default combineReducers({
+ config,
+ selection,
+ dictionaries,
+ widget,
+})
+
+export type StoreState = {
+ config: ConfigState
+ selection: SelectionState
+ dictionaries: DictionariesState
+ widget: WidgetState
+}
diff --git a/src/content/redux/modules/selection.ts b/src/content/redux/modules/selection.ts
new file mode 100644
index 000000000..f99e166b8
--- /dev/null
+++ b/src/content/redux/modules/selection.ts
@@ -0,0 +1,59 @@
+import { message } from '@/_helpers/browser-api'
+import { MsgSelection, MsgType } from '@/typings/message'
+
+/*-----------------------------------------------*\
+ Actions
+\*-----------------------------------------------*/
+
+const enum Actions {
+ NEW_SELECTION = 'selection/NEW_SELECTION'
+}
+
+/*-----------------------------------------------*\
+ State
+\*-----------------------------------------------*/
+
+export type SelectionState = MsgSelection
+
+const initState: SelectionState = {
+ type: MsgType.Selection,
+ selectionInfo: {
+ text: '',
+ context: '',
+ title: '',
+ url: '',
+ favicon: '',
+ trans: '',
+ note: '',
+ },
+ mouseX: 0,
+ mouseY: 0,
+ dbClick: false,
+ ctrlKey: false,
+}
+
+export default function reducer (state = initState, action) {
+ switch (action.type) {
+ case Actions.NEW_SELECTION:
+ return action.payload
+ default:
+ return state
+ }
+}
+
+/*-----------------------------------------------*\
+ Action Creators
+\*-----------------------------------------------*/
+
+/** When new selection is made */
+export const newSelection = selection => ({ type: Actions.NEW_SELECTION, payload: selection })
+
+/*-----------------------------------------------*\
+ Side Effects
+\*-----------------------------------------------*/
+
+export function listenSelection () {
+ return dispatch => {
+ message.self.addListener(MsgType.Selection, message => dispatch(newSelection(message)))
+ }
+}
|
feat
|
add redux store
|
44070f52997bb1305f66366f874fe9ef08d5e66a
|
2019-02-13 10:50:09
|
CRIMX
|
chore(release): 6.24.2
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd440220f..00d5705ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
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.24.2"></a>
+## [6.24.2](https://github.com/crimx/ext-saladict/compare/v6.24.1...v6.24.2) (2019-02-13)
+
+
+### Bug Fixes
+
+* **panel:** fix changing page title ([1fe0acc](https://github.com/crimx/ext-saladict/commit/1fe0acc))
+* **panel:** fix fav icon ([5f0433f](https://github.com/crimx/ext-saladict/commit/5f0433f))
+
+
+
<a name="6.24.1"></a>
## [6.24.1](https://github.com/crimx/ext-saladict/compare/v6.24.0...v6.24.1) (2019-02-13)
diff --git a/package.json b/package.json
index d56751c9f..0f01f18e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.24.1",
+ "version": "6.24.2",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.24.2
|
0f53f4e31264b7f7e9a5afa441b1e3123228b58f
|
2018-10-17 14:26:00
|
CRIMX
|
chore(release): 6.18.1
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d421b73e..82c23bfd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
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.18.1"></a>
+## [6.18.1](https://github.com/crimx/ext-saladict/compare/v6.18.0...v6.18.1) (2018-10-17)
+
+
+
<a name="6.18.0"></a>
# [6.18.0](https://github.com/crimx/ext-saladict/compare/v6.17.1...v6.18.0) (2018-10-16)
diff --git a/package.json b/package.json
index 7e4382571..cd611c6c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.18.0",
+ "version": "6.18.1",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.18.1
|
e9aed82053af753f0bdf7b70917abec9307a4016
|
2019-12-09 23:45:16
|
crimx
|
refactor: clean code
| false
|
diff --git a/src/background/context-menus.ts b/src/background/context-menus.ts
index 16164337e..e66fc8a0f 100644
--- a/src/background/context-menus.ts
+++ b/src/background/context-menus.ts
@@ -1,28 +1,14 @@
import { message, openURL } from '@/_helpers/browser-api'
import { AppConfig } from '@/app-config'
-import { i18nLoader } from '@/_helpers/i18n'
-import { TFunction } from 'i18next'
import isEqual from 'lodash/isEqual'
-import { addConfigListener, AppConfigChanged } from '@/_helpers/config-manager'
+import { createConfigStream } from '@/_helpers/config-manager'
import './types'
-import {
- Observable,
- combineLatest,
- fromEventPattern,
- BehaviorSubject
-} from 'rxjs'
-import {
- mergeMap,
- filter,
- map,
- audit,
- mapTo,
- share,
- startWith
-} from 'rxjs/operators'
-
-type ContextMenusConfig = AppConfig['contextMenus']
+import { TFunction } from 'i18next'
+import { I18nManager } from './i18n-manager'
+
+import { combineLatest } from 'rxjs'
+import { concatMap, filter, distinctUntilChanged } from 'rxjs/operators'
interface CreateMenuOptions {
type?: browser.contextMenus.ItemType
@@ -32,381 +18,363 @@ interface CreateMenuOptions {
contexts?: browser.contextMenus.ContextType[]
}
-// singleton
-let setMenus$$: Observable<void>
-
-const i18n = i18nLoader()
-i18n.loadNamespaces('menus')
-
-const i18n$$ = new BehaviorSubject<TFunction>(
- i18n.getFixedT(i18n.language, 'menus')
-)
-
-i18n.on('languageChanged', () =>
- i18n$$.next(i18n.getFixedT(i18n.language, 'menus'))
-)
-
-browser.contextMenus.onClicked.addListener(handleContextMenusClick)
-message.addListener('CONTEXT_MENUS_CLICK', ({ payload }) =>
- handleContextMenusClick(payload)
-)
+interface ContextMenusClickInfo {
+ menuItemId: string | number
+ selectionText?: string
+ linkUrl?: string
+}
-export function init(initConfig: ContextMenusConfig): Observable<void> {
- if (setMenus$$) {
- return setMenus$$
+export class ContextMenus {
+ static getInstance() {
+ return ContextMenus.instance || (ContextMenus.instance = new ContextMenus())
}
- // when context menus config changes
- const contextMenusChanged$ = fromEventPattern<
- AppConfigChanged[] | AppConfigChanged
- >(addConfigListener as any).pipe(
- map(args => (Array.isArray(args) ? args[0] : args)),
- filter(({ newConfig, oldConfig }) => {
- if (!newConfig) {
- return false
- }
- if (!oldConfig) {
- return true
+ static init = ContextMenus.getInstance
+
+ /**
+ * @param url provide a url
+ * @param force load the current tab anyway
+ */
+ static async openPDF(url?: string, force?: boolean) {
+ const pdfURL = browser.runtime.getURL('assets/pdf/web/viewer.html')
+ if (url) {
+ // open link as pdf
+ return openURL(pdfURL + '?file=' + encodeURIComponent(url))
+ }
+ const tabs = await browser.tabs.query({ active: true, currentWindow: true })
+ if (tabs.length > 0 && tabs[0].url) {
+ if (/pdf$/i.test(tabs[0].url as string) || force) {
+ return openURL(
+ pdfURL + '?file=' + encodeURIComponent(tabs[0].url as string)
+ )
}
-
- return !isEqual(
- oldConfig.contextMenus.selected,
- newConfig.contextMenus.selected
- )
- }),
- map(({ newConfig }) => newConfig.contextMenus),
- startWith(initConfig)
- )
-
- let signal$: Observable<boolean>
-
- setMenus$$ = combineLatest(contextMenusChanged$, i18n$$).pipe(
- // ignore values while setContextMenus is running
- // if source emits any value during setContextMenus,
- // retrieve the latest after setContextMenus is completed
- audit(() => signal$),
- mergeMap(([contextMenus, t]) => setContextMenus(contextMenus, t)),
- share()
- )
-
- signal$ = setMenus$$.pipe(
- mapTo(true), // last setContextMenus is completed
- startWith(true)
- )
-
- setMenus$$.subscribe()
-
- return setMenus$$
-}
-
-/**
- * @param url provide a url
- * @param force load the current tab anyway
- */
-export async function openPDF(url?: string, force?: boolean) {
- const pdfURL = browser.runtime.getURL('assets/pdf/web/viewer.html')
- if (url) {
- // open link as pdf
- return openURL(pdfURL + '?file=' + encodeURIComponent(url))
- }
- const tabs = await browser.tabs.query({ active: true, currentWindow: true })
- if (tabs.length > 0 && tabs[0].url) {
- if (/pdf$/i.test(tabs[0].url as string) || force) {
- return openURL(
- pdfURL + '?file=' + encodeURIComponent(tabs[0].url as string)
- )
}
+ return openURL(pdfURL)
}
- return openURL(pdfURL)
-}
-export function openGoogle() {
- browser.tabs.executeScript({ file: '/assets/google-page-trans.js' })
- // browser.tabs.query({ active: true, currentWindow: true })
- // .then(tabs => {
- // if (tabs.length > 0 && tabs[0].url) {
- // openURL(`https://translate.google.${cn ? 'cn' : 'com'}/translate?sl=auto&tl=${window.appConfig.langCode}&js=y&prev=_t&ie=UTF-8&u=${encodeURIComponent(tabs[0].url as string)}&edit-text=&act=url`)
- // }
- // })
-}
+ static openGoogle() {
+ browser.tabs.executeScript({ file: '/assets/google-page-trans.js' })
+ // browser.tabs.query({ active: true, currentWindow: true })
+ // .then(tabs => {
+ // if (tabs.length > 0 && tabs[0].url) {
+ // openURL(`https://translate.google.${cn ? 'cn' : 'com'}/translate?sl=auto&tl=${window.appConfig.langCode}&js=y&prev=_t&ie=UTF-8&u=${encodeURIComponent(tabs[0].url as string)}&edit-text=&act=url`)
+ // }
+ // })
+ }
-export function openYoudao() {
- // inject youdao script, defaults to the active tab of the current window.
- browser.tabs
- .executeScript({ file: '/assets/fanyi.youdao.2.0/main.js' })
- .then(result => {
- if (!result || ((result as any) !== 1 && result[0] !== 1)) {
- throw new Error()
- }
- })
- .catch(() => {
- // error msg
- browser.notifications.create({
- type: 'basic',
- eventTime: Date.now() + 4000,
- iconUrl: browser.runtime.getURL(`assets/icon-128.png`),
- title: 'Saladict',
- message: i18n.t('menus:notification_youdao_err')
+ static openYoudao() {
+ // inject youdao script, defaults to the active tab of the current window.
+ browser.tabs
+ .executeScript({ file: '/assets/fanyi.youdao.2.0/main.js' })
+ .then(result => {
+ if (!result || ((result as any) !== 1 && result[0] !== 1)) {
+ throw new Error()
+ }
})
- })
-}
-
-export function openBaiduPage() {
- browser.tabs.query({ active: true, currentWindow: true }).then(tabs => {
- if (tabs.length > 0 && tabs[0].url) {
- const langCode =
- window.appConfig.langCode === 'zh-CN'
- ? 'zh'
- : window.appConfig.langCode === 'zh-TW'
- ? 'cht'
- : 'en'
- openURL(
- `https://fanyi.baidu.com/transpage?query=${encodeURIComponent(tabs[0]
- .url as string)}&from=auto&to=${langCode}&source=url&render=1`
- )
- }
- })
-}
+ .catch(() => {
+ // error msg
+ browser.notifications.create({
+ type: 'basic',
+ eventTime: Date.now() + 4000,
+ iconUrl: browser.runtime.getURL(`assets/icon-128.png`),
+ title: 'Saladict',
+ message: I18nManager.getInstance().i18n.t(
+ 'menus:notification_youdao_err'
+ )
+ })
+ })
+ }
-export function openSogouPage() {
- browser.tabs.query({ active: true, currentWindow: true }).then(tabs => {
- if (tabs.length > 0 && tabs[0].url) {
- const langCode = window.appConfig.langCode === 'zh-CN' ? 'zh-CHS' : 'en'
- openURL(
- `https://translate.sogoucdn.com/pcvtsnapshot?from=auto&to=${langCode}&tfr=translatepc&url=${encodeURIComponent(
- tabs[0].url as string
- )}&domainType=sogou`
- )
- }
- })
-}
+ static openBaiduPage() {
+ browser.tabs.query({ active: true, currentWindow: true }).then(tabs => {
+ if (tabs.length > 0 && tabs[0].url) {
+ const langCode =
+ window.appConfig.langCode === 'zh-CN'
+ ? 'zh'
+ : window.appConfig.langCode === 'zh-TW'
+ ? 'cht'
+ : 'en'
+ openURL(
+ `https://fanyi.baidu.com/transpage?query=${encodeURIComponent(tabs[0]
+ .url as string)}&from=auto&to=${langCode}&source=url&render=1`
+ )
+ }
+ })
+ }
-export function openMicrosoftPage() {
- browser.tabs.query({ active: true, currentWindow: true }).then(tabs => {
- if (tabs.length > 0 && tabs[0].url) {
- const langCode =
- window.appConfig.langCode === 'zh-CN'
- ? 'zh-CHS'
- : window.appConfig.langCode === 'zh-TW'
- ? 'zh-CHT'
- : 'en'
- openURL(
- `https://www.microsofttranslator.com/bv.aspx?from=auto&to=${langCode}&r=true&a=${encodeURIComponent(
- tabs[0].url as string
- )}`
- )
- }
- })
-}
+ static openSogouPage() {
+ browser.tabs.query({ active: true, currentWindow: true }).then(tabs => {
+ if (tabs.length > 0 && tabs[0].url) {
+ const langCode = window.appConfig.langCode === 'zh-CN' ? 'zh-CHS' : 'en'
+ openURL(
+ `https://translate.sogoucdn.com/pcvtsnapshot?from=auto&to=${langCode}&tfr=translatepc&url=${encodeURIComponent(
+ tabs[0].url as string
+ )}&domainType=sogou`
+ )
+ }
+ })
+ }
-function requestSelection() {
- browser.tabs.query({ active: true, currentWindow: true }).then(tabs => {
- if (tabs.length > 0 && tabs[0].id != null) {
- message.send(tabs[0].id as number, { type: 'EMIT_SELECTION' })
- }
- })
-}
+ static openMicrosoftPage() {
+ browser.tabs.query({ active: true, currentWindow: true }).then(tabs => {
+ if (tabs.length > 0 && tabs[0].url) {
+ const langCode =
+ window.appConfig.langCode === 'zh-CN'
+ ? 'zh-CHS'
+ : window.appConfig.langCode === 'zh-TW'
+ ? 'zh-CHT'
+ : 'en'
+ openURL(
+ `https://www.microsofttranslator.com/bv.aspx?from=auto&to=${langCode}&r=true&a=${encodeURIComponent(
+ tabs[0].url as string
+ )}`
+ )
+ }
+ })
+ }
-async function setContextMenus(
- contextMenus: ContextMenusConfig,
- t: TFunction
-): Promise<void> {
- if (!browser.extension.inIncognitoContext) {
- // In 'split' incognito mode, this will also remove the items on normal mode windows
- await browser.contextMenus.removeAll()
+ static requestSelection() {
+ browser.tabs.query({ active: true, currentWindow: true }).then(tabs => {
+ if (tabs.length > 0 && tabs[0].id != null) {
+ message.send(tabs[0].id as number, { type: 'EMIT_SELECTION' })
+ }
+ })
}
- const ctx: browser.contextMenus.ContextType[] = [
- 'audio',
- 'editable',
- 'frame',
- 'image',
- 'link',
- 'selection',
- 'page',
- 'video'
- ]
-
- const containerCtx = new Set<browser.contextMenus.ContextType>(['selection'])
- const optionList: CreateMenuOptions[] = []
-
- let browserActionItems: string[] = []
- for (const id of contextMenus.selected) {
- let contexts: browser.contextMenus.ContextType[]
- switch (id) {
+
+ private handleContextMenusClick(info: ContextMenusClickInfo) {
+ const menuItemId = String(info.menuItemId).replace(/_ba$/, '')
+ const selectionText = info.selectionText || ''
+ const linkUrl = info.linkUrl || ''
+ switch (menuItemId) {
case 'google_page_translate':
+ ContextMenus.openGoogle()
+ break
case 'google_cn_page_translate':
+ ContextMenus.openGoogle()
+ break
case 'youdao_page_translate':
- case 'sogou_page_translate':
+ ContextMenus.openYoudao()
+ break
case 'baidu_page_translate':
+ ContextMenus.openBaiduPage()
+ break
+ case 'sogou_page_translate':
+ ContextMenus.openSogouPage()
+ break
case 'microsoft_page_translate':
- // two for browser action
- contexts = ctx
- browserActionItems.push(id)
+ ContextMenus.openMicrosoftPage()
break
case 'view_as_pdf':
- containerCtx.add('link')
- containerCtx.add('page')
- contexts = ['link', 'page']
+ ContextMenus.openPDF(linkUrl, info.menuItemId !== 'view_as_pdf_ba')
+ break
+ case 'saladict':
+ ContextMenus.requestSelection()
+ break
+ case 'search_history':
+ openURL(browser.runtime.getURL('history.html'))
+ break
+ case 'notebook':
+ openURL(browser.runtime.getURL('notebook.html'))
break
default:
- contexts = ['selection']
+ const item = window.appConfig.contextMenus.all[menuItemId]
+ if (item) {
+ const url = typeof item === 'string' ? item : item.url
+ if (url) {
+ openURL(url.replace('%s', selectionText))
+ }
+ }
break
}
- optionList.push({
- id,
- title: getTitle(id),
- contexts
- })
}
- if (optionList.length > 1) {
- if (browserActionItems.length > 0) {
- ctx.forEach(type => containerCtx.add(type))
- }
+ private static instance: ContextMenus
- await createContextMenu({
- id: 'saladict_container',
- title: t('saladict'),
- contexts: [...containerCtx]
- })
+ private i18nManager: I18nManager
- for (const opt of optionList) {
- opt.parentId = 'saladict_container'
- await createContextMenu(opt)
- }
- } else if (optionList.length > 0) {
- // only one item, no need for parent container
- await createContextMenu(optionList[0])
+ // singleton
+ private constructor() {
+ this.i18nManager = I18nManager.getInstance()
+
+ const contextMenusChanged$ = createConfigStream().pipe(
+ distinctUntilChanged(
+ (config1, config2) =>
+ config1 &&
+ config2 &&
+ isEqual(config1.contextMenus.selected, config2.contextMenus.selected)
+ ),
+ filter(config => !!config)
+ )
+
+ combineLatest(contextMenusChanged$, this.i18nManager.getFixedT$$('menus'))
+ .pipe(concatMap(this.setContextMenus))
+ .subscribe()
+
+ browser.contextMenus.onClicked.addListener(payload =>
+ this.handleContextMenusClick(payload)
+ )
+
+ message.addListener('CONTEXT_MENUS_CLICK', ({ payload }) =>
+ this.handleContextMenusClick(payload)
+ )
}
- await createContextMenu({
- id: 'view_as_pdf_ba',
- title: t('view_as_pdf'),
- contexts: ['browser_action', 'page_action']
- })
+ private async setContextMenus([{ contextMenus }, t]: [
+ AppConfig,
+ TFunction
+ ]): Promise<void> {
+ if (!browser.extension.inIncognitoContext) {
+ // In 'split' incognito mode, this will also remove the items on normal mode windows
+ await browser.contextMenus.removeAll()
+ }
+
+ const ctx: browser.contextMenus.ContextType[] = [
+ 'audio',
+ 'editable',
+ 'frame',
+ 'image',
+ 'link',
+ 'selection',
+ 'page',
+ 'video'
+ ]
+
+ const containerCtx = new Set<browser.contextMenus.ContextType>([
+ 'selection'
+ ])
+
+ const optionList: CreateMenuOptions[] = []
+
+ const browserActionItems: string[] = []
+
+ for (const id of contextMenus.selected) {
+ let contexts: browser.contextMenus.ContextType[]
+ switch (id) {
+ case 'google_page_translate':
+ case 'google_cn_page_translate':
+ case 'youdao_page_translate':
+ case 'sogou_page_translate':
+ case 'baidu_page_translate':
+ case 'microsoft_page_translate':
+ // two for browser action
+ contexts = ctx
+ browserActionItems.push(id)
+ break
+ case 'view_as_pdf':
+ containerCtx.add('link')
+ containerCtx.add('page')
+ contexts = ['link', 'page']
+ break
+ default:
+ contexts = ['selection']
+ break
+ }
+ optionList.push({
+ id,
+ title: getTitle(id),
+ contexts
+ })
+ }
+
+ if (optionList.length > 1) {
+ if (browserActionItems.length > 0) {
+ ctx.forEach(type => containerCtx.add(type))
+ }
+
+ await createContextMenu({
+ id: 'saladict_container',
+ title: t('saladict'),
+ contexts: [...containerCtx]
+ })
+
+ for (const opt of optionList) {
+ opt.parentId = 'saladict_container'
+ await createContextMenu(opt)
+ }
+ } else if (optionList.length > 0) {
+ // only one item, no need for parent container
+ await createContextMenu(optionList[0])
+ }
- if (browserActionItems.length > 2) {
await createContextMenu({
- id: 'saladict_ba_container',
- title: t('page_translations'),
+ id: 'view_as_pdf_ba',
+ title: t('view_as_pdf'),
contexts: ['browser_action', 'page_action']
})
- for (const id of browserActionItems) {
+ if (browserActionItems.length > 2) {
await createContextMenu({
- id: id + '_ba',
- parentId: 'saladict_ba_container',
- title: getTitle(id),
+ id: 'saladict_ba_container',
+ title: t('page_translations'),
contexts: ['browser_action', 'page_action']
})
- }
- } else if (browserActionItems.length > 0) {
- for (const id of browserActionItems) {
+
+ for (const id of browserActionItems) {
+ await createContextMenu({
+ id: id + '_ba',
+ parentId: 'saladict_ba_container',
+ title: getTitle(id),
+ contexts: ['browser_action', 'page_action']
+ })
+ }
+ } else if (browserActionItems.length > 0) {
+ for (const id of browserActionItems) {
+ await createContextMenu({
+ id: id + '_ba',
+ title: getTitle(id),
+ contexts: ['browser_action', 'page_action']
+ })
+ }
+ } else {
+ // Add only to browser action if not selected
await createContextMenu({
- id: id + '_ba',
- title: getTitle(id),
+ id: 'google_cn_page_translate_ba',
+ title: t('google_cn_page_translate'),
+ contexts: ['browser_action', 'page_action']
+ })
+ await createContextMenu({
+ id: 'youdao_page_translate_ba',
+ title: t('youdao_page_translate'),
contexts: ['browser_action', 'page_action']
})
}
- } else {
- // Add only to browser action if not selected
+
await createContextMenu({
- id: 'google_cn_page_translate_ba',
- title: t('google_cn_page_translate'),
- contexts: ['browser_action', 'page_action']
+ type: 'separator',
+ id: Date.now().toString(),
+ contexts: ['browser_action']
})
+
+ // search history
await createContextMenu({
- id: 'youdao_page_translate_ba',
- title: t('youdao_page_translate'),
- contexts: ['browser_action', 'page_action']
+ id: 'search_history',
+ title: t('history_title'),
+ contexts: ['browser_action']
})
- }
- await createContextMenu({
- type: 'separator',
- id: Date.now().toString(),
- contexts: ['browser_action']
- })
-
- // search history
- await createContextMenu({
- id: 'search_history',
- title: t('history_title'),
- contexts: ['browser_action']
- })
-
- // Manual
- await createContextMenu({
- id: 'notebook',
- title: t('notebook_title'),
- contexts: ['browser_action']
- })
-
- function getTitle(id: string): string {
- const item = contextMenus.all[id]
- return !item || typeof item === 'string' ? t(id) : item.name
- }
-}
-
-function createContextMenu(createProperties: CreateMenuOptions): Promise<void> {
- return new Promise(resolve => {
- browser.contextMenus.create(createProperties, () => {
- if (browser.runtime.lastError && process.env.DEV_BUILD) {
- console.error(browser.runtime.lastError)
- }
- resolve()
+ // Manual
+ await createContextMenu({
+ id: 'notebook',
+ title: t('notebook_title'),
+ contexts: ['browser_action']
})
- })
-}
-interface ContextMenusClickInfo {
- menuItemId: string | number
- selectionText?: string
- linkUrl?: string
-}
+ function getTitle(id: string): string {
+ const item = contextMenus.all[id]
+ return !item || typeof item === 'string' ? t(id) : item.name
+ }
-function handleContextMenusClick(info: ContextMenusClickInfo) {
- const menuItemId = String(info.menuItemId).replace(/_ba$/, '')
- const selectionText = info.selectionText || ''
- const linkUrl = info.linkUrl || ''
- switch (menuItemId) {
- case 'google_page_translate':
- openGoogle()
- break
- case 'google_cn_page_translate':
- openGoogle()
- break
- case 'youdao_page_translate':
- openYoudao()
- break
- case 'baidu_page_translate':
- openBaiduPage()
- break
- case 'sogou_page_translate':
- openSogouPage()
- break
- case 'microsoft_page_translate':
- openMicrosoftPage()
- break
- case 'view_as_pdf':
- openPDF(linkUrl, info.menuItemId !== 'view_as_pdf_ba')
- break
- case 'search_history':
- openURL(browser.runtime.getURL('history.html'))
- break
- case 'notebook':
- openURL(browser.runtime.getURL('notebook.html'))
- break
- case 'saladict':
- requestSelection()
- break
- default:
- const item = window.appConfig.contextMenus.all[menuItemId]
- if (item) {
- const url = typeof item === 'string' ? item : item.url
- if (url) {
- openURL(url.replace('%s', selectionText))
- }
- }
+ function createContextMenu(
+ createProperties: CreateMenuOptions
+ ): Promise<void> {
+ return new Promise(resolve => {
+ browser.contextMenus.create(createProperties, () => {
+ if (browser.runtime.lastError) {
+ console.error(browser.runtime.lastError)
+ }
+ resolve()
+ })
+ })
+ }
}
}
diff --git a/src/background/i18n-manager.ts b/src/background/i18n-manager.ts
new file mode 100644
index 000000000..7692afc48
--- /dev/null
+++ b/src/background/i18n-manager.ts
@@ -0,0 +1,32 @@
+import i18next, { TFunction } from 'i18next'
+import { i18nLoader, Namespace } from '@/_helpers/i18n'
+import { BehaviorSubject, Observable } from 'rxjs'
+import { map } from 'rxjs/operators'
+
+export class I18nManager {
+ private static instance: I18nManager
+
+ static getInstance() {
+ return I18nManager.instance || (I18nManager.instance = new I18nManager())
+ }
+
+ readonly i18n: i18next.i18n
+
+ readonly i18n$$: BehaviorSubject<i18next.i18n>
+
+ // singleton
+ private constructor() {
+ this.i18n = i18nLoader()
+
+ this.i18n$$ = new BehaviorSubject(this.i18n)
+
+ this.i18n.on('languageChanged', () => {
+ this.i18n$$.next(this.i18n)
+ })
+ }
+
+ getFixedT$$(ns: Namespace | Namespace[]): Observable<TFunction> {
+ this.i18n.loadNamespaces(ns)
+ return this.i18n$$.pipe(map(i18n => i18n.getFixedT(i18n.language, ns)))
+ }
+}
diff --git a/src/background/index.ts b/src/background/index.ts
index 7bf448b76..93a5097d3 100644
--- a/src/background/index.ts
+++ b/src/background/index.ts
@@ -7,16 +7,17 @@ import {
} from '@/_helpers/profile-manager'
import { injectAnalytics } from '@/_helpers/analytics'
import { startSyncServiceInterval } from './sync-manager'
-import { init as initMenus } from './context-menus'
+import { ContextMenus } from './context-menus'
import { init as initPdf } from './pdf-sniffer'
import { initBadge } from './badge'
import './types'
startSyncServiceInterval()
+ContextMenus.init()
+
getConfig().then(async config => {
window.appConfig = config
- initMenus(config.contextMenus)
initPdf(config)
injectAnalytics('/background')
initBadge()
diff --git a/src/background/initialization.ts b/src/background/initialization.ts
index cc82448f6..2b3b4d8a9 100644
--- a/src/background/initialization.ts
+++ b/src/background/initialization.ts
@@ -5,7 +5,7 @@ import checkUpdate from '@/_helpers/check-update'
import { updateConfig, initConfig } from '@/_helpers/config-manager'
import { initProfiles } from '@/_helpers/profile-manager'
import { injectDictPanel } from '@/_helpers/injectSaladictInternal'
-import { openPDF, openGoogle, openYoudao } from './context-menus'
+import { ContextMenus } from './context-menus'
import { openQSPanel, searchClipboard } from './server'
import './types'
@@ -75,13 +75,13 @@ function onCommand(command: string) {
openQSPanel()
break
case 'open-google':
- openGoogle()
+ ContextMenus.openGoogle()
break
case 'open-youdao':
- openYoudao()
+ ContextMenus.openYoudao()
break
case 'open-pdf':
- openPDF()
+ ContextMenus.openPDF()
break
case 'search-clipboard':
searchClipboard()
|
refactor
|
clean code
|
0adcb56c8c1c8f7de468870f59cee7963be08686
|
2018-01-21 12:08:01
|
CRIMX
|
build(package): add vue-plugin-webextension-i18n
| false
|
diff --git a/package.json b/package.json
index d9dbd87cd..a2bcb7f64 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,6 @@
"test": "node scripts/test.js --env=jsdom",
"commit": "git-cz",
"release": "standard-version",
-
"commitmsg": "commitlint -e $GIT_PARAMS"
},
"engines": {
@@ -44,6 +43,7 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"vue": "^2.5.13",
+ "vue-plugin-webextension-i18n": "^0.1.0",
"vue-qriously": "^1.1.1",
"vue-stash": "^2.0.1-beta",
"vuedraggable": "^2.16.0",
diff --git a/yarn.lock b/yarn.lock
index 8559eb3fe..77de01623 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8117,6 +8117,10 @@ vue-parser@^1.1.5:
dependencies:
parse5 "^3.0.3"
+vue-plugin-webextension-i18n@^0.1.0:
+ version "0.1.0"
+ resolved "https://registry.npmjs.org/vue-plugin-webextension-i18n/-/vue-plugin-webextension-i18n-0.1.0.tgz#b3d4be737727b76ddcd823a9da088a4634577d63"
+
vue-qriously@^1.1.1:
version "1.1.1"
resolved "https://registry.npmjs.org/vue-qriously/-/vue-qriously-1.1.1.tgz#b3a84b05280cb1edfd153bbc003f031995ea7ce7"
|
build
|
add vue-plugin-webextension-i18n
|
47f8f1bffd75cf41c676fe2577f09df8ba6e4e1b
|
2018-08-26 17:01:35
|
CRIMX
|
feat(panel): add wordEditor deleteCards
| false
|
diff --git a/src/_locales/content/messages.json b/src/_locales/content/messages.json
index 066c43454..e7a02c92d 100644
--- a/src/_locales/content/messages.json
+++ b/src/_locales/content/messages.json
@@ -59,13 +59,16 @@
"zh_TW": "關閉字典視窗",
"en": "Close the panel"
},
-
"fromSaladict": {
"zh_CN": "来自沙拉查词面板",
"zh_TW": "来自沙拉查詞介面",
"en": "From Saladict Panel"
},
-
+ "wordEditorDeleteConfirm": {
+ "zh_CN": "从单词本中移除？",
+ "zh_TW": "于單字本中移除？",
+ "en": "Delete from Notebook?"
+ },
"wordEditorTitle": {
"zh_CN": "保存到生词本",
"zh_TW": "保存到單字本",
diff --git a/src/content/components/WordCards/_style.scss b/src/content/components/WordCards/_style.scss
index f4212ecf6..ef7bf5e43 100644
--- a/src/content/components/WordCards/_style.scss
+++ b/src/content/components/WordCards/_style.scss
@@ -24,6 +24,7 @@
.wordCards-Card {
list-style-type: none;
+ position: relative;
display: block;
overflow: hidden;
margin: 0 0 10px 0;
@@ -35,6 +36,18 @@
background: #fcf8e3;
}
+.wordCards-CardClose {
+ position: absolute;
+ top: 5px;
+ right: 5px;
+ border: none;
+ font-size: 20px;
+ font-weight: bold;
+ color: #8a6d3b;
+ background: transparent;
+ cursor: pointer;
+}
+
.wordCards-CardTitle {
margin: 0 0 0.5em;
text-align: center;
diff --git a/src/content/components/WordCards/index.tsx b/src/content/components/WordCards/index.tsx
index 01b4cf78d..f21a15e24 100644
--- a/src/content/components/WordCards/index.tsx
+++ b/src/content/components/WordCards/index.tsx
@@ -1,10 +1,11 @@
import React from 'react'
import { translate } from 'react-i18next'
import { TranslationFunction } from 'i18next'
-import { Word } from '@/background/database'
+import { Word } from '@/_helpers/record-manager'
export interface WordCardsProps {
words: Word[]
+ deleteCard: (word: Word) => any
}
export class WordCards extends React.PureComponent<WordCardsProps & { t: TranslationFunction }> {
@@ -12,6 +13,7 @@ export class WordCards extends React.PureComponent<WordCardsProps & { t: Transla
const {
t,
words,
+ deleteCard,
} = this.props
return (
@@ -24,6 +26,7 @@ export class WordCards extends React.PureComponent<WordCardsProps & { t: Transla
<li className='wordCards-Card'
key={word.date}
>
+ <button type='button' className='wordCards-CardClose' onClick={() => deleteCard(word)}>×</button>
<h2 className='wordCards-CardTitle'>{word.text}</h2>
{word.trans &&
<div className='wordCards-CardItem'>
diff --git a/src/content/components/WordEditor/index.tsx b/src/content/components/WordEditor/index.tsx
index 54972be69..e2a20ef31 100644
--- a/src/content/components/WordEditor/index.tsx
+++ b/src/content/components/WordEditor/index.tsx
@@ -2,7 +2,7 @@ import React from 'react'
import { translate } from 'react-i18next'
import { TranslationFunction } from 'i18next'
import { SelectionInfo } from '@/_helpers/selection'
-import { Word } from '@/background/database'
+import { Word, deleteWords } from '@/_helpers/record-manager'
import WordCards from '../WordCards'
export interface WordEditorDispatchers {
@@ -75,12 +75,17 @@ export class WordEditor extends React.PureComponent<WordEditorProps & { t: Trans
if (word.date) {
words = words.filter(({ date }) => date !== word.date)
}
- if (words.length > 0) {
- this.setState({ relatedWords: words })
- }
+ this.setState({ relatedWords: words })
})
}
+ deleteCard = (word: Word) => {
+ if (window.confirm(this.props.t('wordEditorDeleteConfirm'))) {
+ deleteWords('notebook', [word.date])
+ .then(this.getRelatedWords)
+ }
+ }
+
componentDidMount () {
this.getRelatedWords()
}
@@ -170,7 +175,7 @@ export class WordEditor extends React.PureComponent<WordEditorProps & { t: Trans
onChange={this.mapValueToState}
/>
</form>
- {relatedWords.length > 0 && <WordCards words={relatedWords} /> }
+ {relatedWords.length > 0 && <WordCards words={relatedWords} deleteCard={this.deleteCard} /> }
</div>
<footer className='wordEditor-Footer'>
<button type='button'
|
feat
|
add wordEditor deleteCards
|
383422652dc7d2a11707ca7bbc108dcfdc691fa0
|
2019-08-02 15:51:27
|
crimx
|
refactor(storybook): pass down panel settings
| false
|
diff --git a/src/_helpers/storybook.tsx b/src/_helpers/storybook.tsx
index 5f1b30aab..9125e2b94 100644
--- a/src/_helpers/storybook.tsx
+++ b/src/_helpers/storybook.tsx
@@ -68,22 +68,31 @@ export function withSideEffect(fn: React.EffectCallback) {
export function withSaladictPanel(children: React.ReactNode) {
return function SaladcitPanel(story: Function) {
const width = number('Panel Width', 450)
+ const height = number('Panel Height', 450 * 1.68)
+ const withAnimation = boolean('Enable Animation', true)
+ const fontSize = number('Panel Font Size', 13)
+
return (
<root.div style={{ width, margin: '10px auto' }}>
<style>{require('@/_sass_global/_reset.scss').toString()}</style>
<div
- className={boolean('Enable Animation', true) ? 'isAnimate' : ''}
+ className={withAnimation ? 'isAnimate' : ''}
style={{
- fontSize: number('Panel Font Size', 13),
+ fontSize,
width,
'--panel-width': `${width}px`,
- '--panel-height': `${number('Panel Height', 450 * 1.68)}px`,
+ '--panel-height': `${height}px`,
'--panel-color': text('Panel Color', '#333'),
'--panel-background-color': text('Panel Background Color', '#fff')
}}
>
{children}
- {story()}
+ {story({
+ width,
+ height,
+ fontSize,
+ withAnimation
+ })}
</div>
</root.div>
)
diff --git a/src/components/dictionaries/dictionaries.stories.tsx b/src/components/dictionaries/dictionaries.stories.tsx
index 2c1909e09..0a4e3e92b 100644
--- a/src/components/dictionaries/dictionaries.stories.tsx
+++ b/src/components/dictionaries/dictionaries.stories.tsx
@@ -29,10 +29,21 @@ const stories = storiesOf('Content Scripts|Dictionaries', module)
.addDecorator(withi18nNS('content'))
Object.keys(getAllDicts()).forEach(id => {
- stories.add(id, () => <Dict dictID={id as DictID} />)
+ // @ts-ignore: wrong storybook typing
+ stories.add(id, ({ fontSize, withAnimation }) => (
+ <Dict
+ dictID={id as DictID}
+ fontSize={fontSize}
+ withAnimation={withAnimation}
+ />
+ ))
})
-function Dict(props: { dictID: DictID }) {
+function Dict(props: {
+ dictID: DictID
+ fontSize: number
+ withAnimation: boolean
+}) {
const {
mockSearchTexts,
mockRequest
@@ -81,7 +92,8 @@ function Dict(props: { dictID: DictID }) {
<DictItem
dictID={props.dictID}
text={searchText}
- fontSize={number('Font Size', 13)}
+ fontSize={props.fontSize}
+ withAnimation={props.withAnimation}
preferredHeight={number('Preferred Height', 256)}
searchStatus={status}
searchResult={result}
diff --git a/src/content/components/DictItem/DictItem.stories.tsx b/src/content/components/DictItem/DictItem.stories.tsx
index 36066fd40..dd07be7f2 100644
--- a/src/content/components/DictItem/DictItem.stories.tsx
+++ b/src/content/components/DictItem/DictItem.stories.tsx
@@ -17,16 +17,18 @@ storiesOf('Content Scripts|DictItem', module)
.addDecorator(withPropsTable)
.addDecorator(jsxDecorator)
.addDecorator(withKnobs)
+ .addDecorator(withi18nNS('content'))
.addDecorator(
withSaladictPanel(<style>{require('./DictItem.scss').toString()}</style>)
)
- .addDecorator(withi18nNS('content'))
- .add('DictItem', () => {
+ // @ts-ignore: wrong storybook typing
+ .add('DictItem', ({ fontSize, withAnimation }) => {
return (
<DictItem
dictID="baidu"
text={text('Search Text', 'test')}
- fontSize={number('Font Size', 13)}
+ fontSize={fontSize}
+ withAnimation={withAnimation}
preferredHeight={number('Preferred Height', 256)}
searchStatus={select(
'Search Status',
diff --git a/src/content/components/DictItem/DictItemBody.tsx b/src/content/components/DictItem/DictItemBody.tsx
index fcee5fc5e..9662e0a2c 100644
--- a/src/content/components/DictItem/DictItemBody.tsx
+++ b/src/content/components/DictItem/DictItemBody.tsx
@@ -9,6 +9,7 @@ export interface DictItemBodyProps {
dictID: DictID
fontSize: number
+ withAnimation: boolean
searchStatus: 'IDLE' | 'SEARCHING' | 'FINISH'
searchResult?: object | null
@@ -54,7 +55,9 @@ export const DictItemBody: FC<DictItemBodyProps> = props => {
font-family: "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Hiragino Sans GB W3", "Microsoft YaHei UI", "Microsoft YaHei", sans-serif;
}`}
</style>
- <div className="dictRoot">
+ <div
+ className={`dictRoot${props.withAnimation ? ' isAnimate' : ''}`}
+ >
<Dict result={props.searchResult} searchText={props.searchText} />
</div>
</root.div>
|
refactor
|
pass down panel settings
|
5790cfe377766fec7c76b182493d4e190dae7914
|
2019-08-03 10:51:18
|
crimx
|
fix: dom purify parse innerHTML
| false
|
diff --git a/src/components/dictionaries/helpers.ts b/src/components/dictionaries/helpers.ts
index ac384ec0e..797e6b4e8 100644
--- a/src/components/dictionaries/helpers.ts
+++ b/src/components/dictionaries/helpers.ts
@@ -168,16 +168,12 @@ export function getHTML(
node.querySelectorAll('img').forEach(fillLink)
}
- const purifyResult = DOMPurify.sanitize((node as unknown) as Node, config)
-
- const content =
- typeof purifyResult === 'string'
- ? purifyResult
- : purifyResult[mode]
- ? purifyResult[mode]
- : purifyResult.firstElementChild
- ? purifyResult.firstElementChild.outerHTML
- : ''
+ const fragment = DOMPurify.sanitize((node as unknown) as Node, {
+ ...config,
+ RETURN_DOM_FRAGMENT: true
+ })
+
+ const content = fragment.firstChild ? fragment.firstChild[mode] : ''
return toChz ? chsToChz(content) : content
}
|
fix
|
dom purify parse innerHTML
|
05560382cd9d07b279f4527be71e119a692ab190
|
2019-02-17 12:55:51
|
CRIMX
|
test(dicts): more granular machine trans testing
| false
|
diff --git a/test/specs/components/dictionaries/baidu/engine.spec.ts b/test/specs/components/dictionaries/baidu/engine.spec.ts
index 962d8b4a7..8715067e5 100644
--- a/test/specs/components/dictionaries/baidu/engine.spec.ts
+++ b/test/specs/components/dictionaries/baidu/engine.spec.ts
@@ -13,6 +13,7 @@ describe('Dict/Baidu/engine', () => {
expect(searchResult.audio).toBeUndefined()
expect(isContainChinese(searchResult.result.searchText.text)).toBeTruthy()
expect(isContainEnglish(searchResult.result.trans.text)).toBeTruthy()
+ expect(searchResult.result.trans.text).toMatch(/love/)
expect(searchResult.result.id).toBe('baidu')
expect(searchResult.result.sl).toBe('zh')
expect(searchResult.result.tl).toBe('en')
diff --git a/test/specs/components/dictionaries/google/engine.spec.ts b/test/specs/components/dictionaries/google/engine.spec.ts
index 3c58cebb9..4b3f9a5de 100644
--- a/test/specs/components/dictionaries/google/engine.spec.ts
+++ b/test/specs/components/dictionaries/google/engine.spec.ts
@@ -25,6 +25,7 @@ describe('Dict/Google/engine', () => {
.then(searchResult => {
if (process.env.CI) {
expect(isContainEnglish(searchResult.result.trans.text)).toBeTruthy()
+ expect(searchResult.result.trans.text).toMatch(/love/)
} else {
expect(searchResult.result.trans.text).toBe('“当你不需要的时候，这就是你所读到的东西，当你无法帮助它时，它将决定你将会是什么。”\n - 奥斯卡·王尔德\n 成功一夜成名需要很长时间。')
}
diff --git a/test/specs/components/dictionaries/sogou/engine.spec.ts b/test/specs/components/dictionaries/sogou/engine.spec.ts
index 502a03cd2..25f1b47f2 100644
--- a/test/specs/components/dictionaries/sogou/engine.spec.ts
+++ b/test/specs/components/dictionaries/sogou/engine.spec.ts
@@ -5,12 +5,18 @@ import { getDefaultProfile } from '@/app-config/profiles'
import { isContainEnglish, isContainJapanese, isContainChinese } from '@/_helpers/lang-check'
describe('Dict/Sogou/engine', () => {
+ beforeEach(() => {
+ browser.storage.local.get.callsFake(() => Promise.resolve({}))
+ browser.storage.local.set.callsFake(() => Promise.resolve())
+ })
+
it('should parse result correctly', () => {
if (process.env.CI) {
return retry(() =>
search('我爱你', getDefaultConfig(), getDefaultProfile(), { isPDF: false })
.then(searchResult => {
expect(isContainEnglish(searchResult.result.trans.text)).toBeTruthy()
+ expect(searchResult.result.trans.text).toMatch(/love/)
expect(searchResult.audio).toBeUndefined()
expect(searchResult.result.id).toBe('sogou')
expect(searchResult.result.sl).toBe('auto')
|
test
|
more granular machine trans testing
|
d7c4ba178bb88ec121f25a5798924a998bba2c92
|
2018-04-22 01:06:41
|
CRIMX
|
style(type): type safe
| false
|
diff --git a/src/content/redux/modules/widget.ts b/src/content/redux/modules/widget.ts
index f9abdb66f..496e33f50 100644
--- a/src/content/redux/modules/widget.ts
+++ b/src/content/redux/modules/widget.ts
@@ -1,5 +1,4 @@
import * as recordManager from '@/_helpers/record-manager'
-import { SelectionInfo } from '@/_helpers/selection'
import { StoreState } from './index'
/*-----------------------------------------------*\
@@ -16,13 +15,13 @@ export const enum Actions {
\*-----------------------------------------------*/
export type WidgetState = {
- isPinned: boolean
- isFav: boolean
+ readonly isPinned: boolean
+ readonly isFav: boolean
}
const initState: WidgetState = {
isPinned: false,
- isFav: false
+ isFav: false,
}
export default function reducer (state = initState, action): WidgetState {
@@ -63,14 +62,14 @@ type Dispatcher = (
export function addToNotebook (): Dispatcher {
return (dispatch, getState) => {
- return recordManager.addToNotebook(getState().selection.selectionInfo)
+ return recordManager.addToNotebook(getState().dictionaries.lastSearchInfo)
.then(() => dispatch(favWord(true)))
}
}
export function removeFromNotebook (): Dispatcher {
return (dispatch, getState) => {
- return recordManager.removeFromNotebook(getState().selection.selectionInfo)
+ return recordManager.removeFromNotebook(getState().dictionaries.lastSearchInfo)
.then(() => dispatch(favWord(false)))
}
}
@@ -78,7 +77,7 @@ export function removeFromNotebook (): Dispatcher {
/** Fire when panel is loaded */
export function updateFaveInfo (): Dispatcher {
return (dispatch, getState) => {
- return recordManager.isInNotebook(getState().selection.selectionInfo)
+ return recordManager.isInNotebook(getState().dictionaries.lastSearchInfo)
.then(flag => dispatch(favWord(flag)))
}
}
diff --git a/src/typings/message.ts b/src/typings/message.ts
index 35941815c..9c8d08893 100644
--- a/src/typings/message.ts
+++ b/src/typings/message.ts
@@ -56,32 +56,32 @@ export interface PostMsgSelection {
}
interface MsgOpenUrlWithPlaceholder {
- type: MsgType.OpenURL
- url: string
- placeholder: true
+ readonly type: MsgType.OpenURL
+ readonly url: string
+ readonly placeholder: true
/** text to replace the placeholder */
- text: string
+ readonly text: string
/** use browser.runtime.getURL? */
- self?: boolean
+ readonly self?: boolean
}
interface MsgOpenUrlWithoutPlaceholder {
- type: MsgType.OpenURL
- url: string
- placeholder?: false
+ readonly type: MsgType.OpenURL
+ readonly url: string
+ readonly placeholder?: false
/** use browser.runtime.getURL? */
- self?: boolean
+ readonly self?: boolean
}
export type MsgOpenUrl = MsgOpenUrlWithoutPlaceholder | MsgOpenUrlWithPlaceholder
export interface MsgAudioPlay {
- type: MsgType.PlayAudio
- src: string
+ readonly type: MsgType.PlayAudio
+ readonly src: string
}
export interface MsgFetchDictResult {
- type: MsgType.FetchDictResult
- dict: DictID
- text: string
+ readonly type: MsgType.FetchDictResult
+ readonly id: DictID
+ readonly text: string
}
|
style
|
type safe
|
f50a30c5bfd0b2134b02e92434dab31d0efc4c32
|
2019-10-18 16:56:56
|
crimx
|
refactor(profiles): update default profiles
| false
|
diff --git a/src/app-config/profiles.ts b/src/app-config/profiles.ts
index 11e8535ea..320e774e0 100644
--- a/src/app-config/profiles.ts
+++ b/src/app-config/profiles.ts
@@ -150,6 +150,7 @@ export function scholar(): ProfileStorage {
const allDict = profile.dicts.all
allDict.macmillan.defaultUnfold = {
+ matchAll: false,
english: false,
chinese: false,
japanese: false,
@@ -160,6 +161,7 @@ export function scholar(): ProfileStorage {
others: false
}
allDict.oald.defaultUnfold = {
+ matchAll: false,
english: false,
chinese: false,
japanese: false,
@@ -170,6 +172,7 @@ export function scholar(): ProfileStorage {
others: false
}
allDict.websterlearner.defaultUnfold = {
+ matchAll: false,
english: false,
chinese: false,
japanese: false,
@@ -196,7 +199,7 @@ export function translation(): ProfileStorage {
'sogou',
'baidu',
'caiyun',
- 'youdao',
+ 'youdaotrans',
'zdic',
'guoyu',
'liangan'
|
refactor
|
update default profiles
|
14cece8f02b8f1f85b6bbb0a9554634a49c8b027
|
2018-01-21 12:09:19
|
CRIMX
|
docs(helpers): better describe vars
| false
|
diff --git a/src/_helpers/browser-api.ts b/src/_helpers/browser-api.ts
index 134a64d1d..5706b9a11 100644
--- a/src/_helpers/browser-api.ts
+++ b/src/_helpers/browser-api.ts
@@ -36,20 +36,20 @@ function noop () { /* do nothing */ }
/**
* key: {function} user's callback function
- * values: {Map} listeners, key: msg, values: generated or user's callback functions
+ * values: {Map} listeners, key: message type, values: generated or user's callback functions
*/
const messageListeners: Map<browser.runtime.onMessageEvent, Map<string, browser.runtime.onMessageEvent>> = new Map()
/**
* For self page messaging
* key: {function} user's callback function
- * values: {Map} listeners, key: msg, values: generated or user's callback functions
+ * values: {Map} listeners, key: message type, values: generated or user's callback functions
*/
const messageSelfListeners: Map<browser.runtime.onMessageEvent, Map<string, browser.runtime.onMessageEvent>> = new Map()
/**
* key: {function} user's callback function
- * values: {Map} listeners, key: msg, values: generated or user's callback functions
+ * values: {Map} listeners, key: message type, values: generated or user's callback functions
*/
const storageListeners: Map<StorageListenerCb, Map<string, StorageListenerCb>> = new Map()
|
docs
|
better describe vars
|
4d58cafded8f3621b0f96ccb5479f8e165759d37
|
2019-02-12 10:36:55
|
CRIMX
|
refactor(profiles): add baidu to translation profile
| false
|
diff --git a/src/app-config/profiles.ts b/src/app-config/profiles.ts
index cf3d8f66c..945b4f443 100644
--- a/src/app-config/profiles.ts
+++ b/src/app-config/profiles.ts
@@ -122,7 +122,7 @@ export function translation (): ProfileStorage {
idItem.name = '%%_translation_%%'
const profile = getDefaultProfile(idItem.id) as ProfileMutable
- profile.dicts.selected = ['google', 'sogou', 'youdao', 'zdic', 'guoyu', 'liangan']
+ profile.dicts.selected = ['google', 'sogou', 'baidu', 'youdao', 'zdic', 'guoyu', 'liangan']
profile.mtaAutoUnfold = 'always'
return { idItem, profile }
|
refactor
|
add baidu to translation profile
|
03c7a123d72ac9714620ae11001b32d0ffaaf670
|
2019-07-15 21:28:18
|
CRIMX
|
refactor: menu bar search box
| false
|
diff --git a/src/content/components/MenuBar/SearchBox.scss b/src/content/components/MenuBar/SearchBox.scss
new file mode 100644
index 000000000..c748ad0ce
--- /dev/null
+++ b/src/content/components/MenuBar/SearchBox.scss
@@ -0,0 +1,41 @@
+.menuBar-SearchBox_Wrap {
+ position: relative;
+ width: 4em;
+}
+
+.menuBar-SearchBox {
+ padding: 0 5px;
+ border: 0 none;
+ outline: 0 none;
+ color: #fff;
+ background-color: rgba(225, 225, 225, 0.1);
+}
+
+.menuBar-SearchBox_Suggests {
+ position: absolute;
+ left: 0;
+ top: 150%;
+ z-index: 1000;
+}
+
+.isAnimate {
+ .panel-MenuBar_SearchBox {
+ transition: flex 1s;
+ }
+
+ .menuBar-SearchBox_Suggest-enter {
+ opacity: 0;
+ transition: opacity 0.4s;
+ }
+
+ .menuBar-SearchBox_Suggest-enter-active,
+ .menuBar-SearchBox_Suggest-exit {
+ opacity: 1;
+ transition: opacity 0.4s;
+ }
+
+ .menuBar-SearchBox_Suggest-exit-active {
+ opacity: 0;
+ transition: opacity 0.4s;
+ }
+}
diff --git a/src/content/components/MenuBar/SearchBox.stories.tsx b/src/content/components/MenuBar/SearchBox.stories.tsx
new file mode 100644
index 000000000..8aa431091
--- /dev/null
+++ b/src/content/components/MenuBar/SearchBox.stories.tsx
@@ -0,0 +1,82 @@
+import React, { useState } from 'react'
+import i18next from 'i18next'
+import { storiesOf } from '@storybook/react'
+import { action } from '@storybook/addon-actions'
+import { withInfo } from '@storybook/addon-info'
+import { withKnobs, boolean } from '@storybook/addon-knobs'
+import {
+ withLocalStyle,
+ withi18nNS,
+ withSideEffect,
+ withSaladictPanel
+} from '@/_helpers/storybook'
+import { SuggestItem } from './Suggest'
+import { SearchBox } from './SearchBox'
+import { Message } from '@/typings/message'
+
+storiesOf('Content Scripts|Menubar', module)
+ .addParameters({
+ backgrounds: [
+ { name: 'MenuBar', value: '#5caf9e', default: true },
+ { name: 'Black', value: '#000' }
+ ]
+ })
+ .addDecorator(
+ withInfo({
+ inline: true,
+ header: false
+ })
+ )
+ .addDecorator(withKnobs)
+ .addDecorator(withSaladictPanel)
+ .addDecorator(withLocalStyle(require('./Suggest.scss')))
+ .addDecorator(withLocalStyle(require('./SearchBox.scss')))
+ .addDecorator(withLocalStyle(require('@/_sass_global/_reset.scss')))
+ .addDecorator(withi18nNS('content'))
+ .addDecorator(
+ withSideEffect(() => {
+ // @ts-ignore
+ browser.runtime.sendMessage.callsFake((message: Message) => {
+ if (message.type === 'GET_SUGGESTS') {
+ return new Promise(resolve => {
+ setTimeout(() => {
+ resolve(fakeSuggest(message.payload))
+ }, Math.random() * 1500)
+ })
+ }
+ return Promise.resolve()
+ })
+
+ return () =>
+ // @ts-ignore
+ browser.runtime.sendMessage.callsFake(() => Promise.resolve())
+ })
+ )
+ // @ts-ignore
+ .addDecorator(Story => <Story />)
+ .add('SearchBox', () => {
+ const [text, setText] = useState('text')
+ return (
+ <SearchBox
+ t={i18next.getFixedT(i18next.language, 'content')}
+ text={text}
+ isFocusOnMount={boolean('Focus On Mount', true)}
+ enableSuggest={boolean('Enable Suggest', true)}
+ onInput={text => {
+ setText(text)
+ action('Input')(text)
+ }}
+ onSearch={text => {
+ setText(text)
+ action('Search')(text)
+ }}
+ />
+ )
+ })
+
+function fakeSuggest(text: string): SuggestItem[] {
+ return Array.from(Array(10)).map((v, i) => ({
+ explain: `单词 ${text} 的各种相近的建议#${i}`,
+ entry: `Word ${text}#${i}`
+ }))
+}
diff --git a/src/content/components/MenuBar/SearchBox.tsx b/src/content/components/MenuBar/SearchBox.tsx
new file mode 100644
index 000000000..af45619bb
--- /dev/null
+++ b/src/content/components/MenuBar/SearchBox.tsx
@@ -0,0 +1,106 @@
+import React, { FC, useRef, useEffect } from 'react'
+import { CSSTransition } from 'react-transition-group'
+import i18next from 'i18next'
+import { useEventCallback } from 'rxjs-hooks'
+import { Observable, empty, timer } from 'rxjs'
+import { map, debounce } from 'rxjs/operators'
+import { Suggest } from './Suggest'
+
+export interface SearchBoxProps {
+ t: i18next.TFunction
+ /** Search box text */
+ text: string
+ /** Focus search box on mount */
+ isFocusOnMount: boolean
+ /** Show suggest panel when typing */
+ enableSuggest: boolean
+ onInput: (text: string) => any
+ /** Start searching */
+ onSearch: (text: string) => any
+}
+
+/**
+ * Seach box
+ */
+export const SearchBox: FC<SearchBoxProps> = props => {
+ // Textarea also shares the text so only replace here
+ const text = props.text.replace(/\s+/g, ' ')
+
+ const inputRef = useRef<HTMLInputElement>(null)
+
+ const [onFocusBlur, showSuggest] = useEventCallback(
+ (event$: Observable<{ type: string; _immediate?: boolean }>) =>
+ event$.pipe(
+ // synthetic event
+ map(e => [e.type !== 'blur', e._immediate]),
+ debounce(e => (e[1] ? empty() : timer(100))),
+ map(e => e[0])
+ ),
+ false
+ )
+
+ useEffect(() => {
+ if (props.isFocusOnMount && inputRef.current) {
+ inputRef.current.focus()
+ inputRef.current.select()
+ }
+ }, [])
+
+ return (
+ <div className="menuBar-SearchBox_Wrap">
+ <input
+ type="text"
+ className="menuBar-SearchBox"
+ key="search-box"
+ ref={inputRef}
+ onChange={e => {
+ props.onInput(e.currentTarget.value)
+ onFocusBlur({ type: 'focus', _immediate: true })
+ }}
+ onKeyUp={e => {
+ if (e.key === 'Enter') {
+ props.onSearch(props.text)
+ onFocusBlur({ type: 'blur', _immediate: true })
+ }
+ }}
+ onKeyDown={e => {
+ if (e.key === 'ArrowDown') {
+ const doc = e.currentTarget.ownerDocument
+ if (doc) {
+ const firstSuggestBtn = doc.querySelector<HTMLButtonElement>(
+ '.menuBar-SuggestsBtn'
+ )
+ if (firstSuggestBtn) {
+ firstSuggestBtn.focus()
+ }
+ }
+ e.preventDefault()
+ e.stopPropagation()
+ }
+ }}
+ onBlur={onFocusBlur}
+ value={text}
+ />
+
+ <CSSTransition
+ classNames="menuBar-SearchBox_Suggest"
+ in={!!(props.enableSuggest && showSuggest && props.text)}
+ timeout={100}
+ mountOnEnter={true}
+ unmountOnExit={true}
+ >
+ <div className="menuBar-SearchBox_Suggests">
+ <Suggest
+ text={text}
+ onSelect={text => {
+ onFocusBlur({ type: 'blur', _immediate: true })
+ props.onSearch(text)
+ }}
+ onFocus={onFocusBlur}
+ onBlur={onFocusBlur}
+ />
+ </div>
+ </CSSTransition>
+ </div>
+ )
+}
diff --git a/src/content/components/MenuBar/Suggest.tsx b/src/content/components/MenuBar/Suggest.tsx
index 810f407be..d5aaf9baa 100644
--- a/src/content/components/MenuBar/Suggest.tsx
+++ b/src/content/components/MenuBar/Suggest.tsx
@@ -11,6 +11,7 @@ import {
} from 'rxjs/operators'
import { message } from '@/_helpers/browser-api'
import AnimateHeight from 'react-animate-height'
+import { search } from '@/components/dictionaries/longman/engine'
export interface SuggestItem {
explain: string
@@ -83,17 +84,23 @@ export const Suggest: FC<SuggestProps> = props => {
}
e.preventDefault()
e.stopPropagation()
- return
- }
-
- if (e.key === 'ArrowUp') {
+ } else if (e.key === 'ArrowUp') {
const $prevLi = e.currentTarget.previousSibling
if ($prevLi) {
;($prevLi as HTMLButtonElement).focus()
}
e.preventDefault()
e.stopPropagation()
- return
+ } else if (e.key === 'Escape') {
+ const doc = e.currentTarget.ownerDocument
+ if (doc) {
+ const searchBox = doc.querySelector<HTMLInputElement>(
+ '.menuBar-SearchBox'
+ )
+ if (searchBox) {
+ searchBox.focus()
+ }
+ }
}
}}
data-entry={s.entry}
|
refactor
|
menu bar search box
|
879b41d4c706d7da7a2555e22f2364cf87cb43f8
|
2019-07-14 23:41:47
|
CRIMX
|
refactor: update message types
| false
|
diff --git a/src/_helpers/browser-api.ts b/src/_helpers/browser-api.ts
index 737edacd3..b2b809589 100644
--- a/src/_helpers/browser-api.ts
+++ b/src/_helpers/browser-api.ts
@@ -2,14 +2,10 @@
* @file Wraps some of the extension apis
*/
-// import { Observable, fromEventPattern } from 'rxjs'
-// import { map } from 'rxjs/operators'
-import { Observable } from 'rxjs/Observable'
-import { fromEventPattern } from 'rxjs/observable/fromEventPattern'
-import { map } from 'rxjs/operators/map'
-import { filter } from 'rxjs/operators/filter'
+import { Observable, fromEventPattern } from 'rxjs'
+import { map, filter } from 'rxjs/operators'
-import { MsgType } from '@/typings/message'
+import { Message, MessageResponse, MsgType } from '@/typings/message'
/* --------------------------------------- *\
* #Types
@@ -18,56 +14,62 @@ import { MsgType } from '@/typings/message'
export type StorageArea = 'all' | 'local' | 'sync'
export type StorageChange<T> = {
- oldValue?: T,
- newValue?: T,
+ oldValue?: T
+ newValue?: T
}
export type StorageUpdate<T> = {
- oldValue?: T,
- newValue: T,
+ oldValue?: T
+ newValue: T
}
export type StorageListenerCb<T = any, K extends string = string> = (
changes: {
[field in K]: StorageChange<T>
},
- areaName: 'sync' | 'local',
+ areaName: 'sync' | 'local'
) => void
-export interface Message {
- type: MsgType
- [propName: string]: any
-}
-
type onMessageEvent<T extends Message = Message> = (
- message: T,
- sender: browser.runtime.MessageSender,
+ message: T & { __pageId__?: string },
+ sender: browser.runtime.MessageSender
) => Promise<any> | boolean | void
/* --------------------------------------- *\
* #Globals
\* --------------------------------------- */
-const noop = () => { /* do nothing */ }
+const noop = () => {
+ /* do nothing */
+}
/**
* key: {function} user's callback function
* values: {Map} listeners, key: message type, values: generated or user's callback functions
*/
-const messageListeners: Map<onMessageEvent, Map<Message['type'], onMessageEvent>> = new Map()
+const messageListeners: Map<
+ onMessageEvent,
+ Map<MsgType, onMessageEvent>
+> = new Map()
/**
* For self page messaging
* key: {function} user's callback function
* values: {Map} listeners, key: message type, values: generated or user's callback functions
*/
-const messageSelfListeners: Map<onMessageEvent, Map<Message['type'], onMessageEvent>> = new Map()
+const messageSelfListeners: Map<
+ onMessageEvent,
+ Map<MsgType, onMessageEvent>
+> = new Map()
/**
* key: {function} user's callback function
* values: {Map} listeners, key: message type, values: generated or user's callback functions
*/
-const storageListeners: Map<StorageListenerCb, Map<string, StorageListenerCb>> = new Map()
+const storageListeners: Map<
+ StorageListenerCb,
+ Map<string, StorageListenerCb>
+> = new Map()
/* --------------------------------------- *\
* #Exports
@@ -84,7 +86,9 @@ export const storage = {
/** Only for sync area */
removeListener: storageRemoveListener,
createStream: storageCreateStream,
- get __storageArea__ (): 'sync' { return 'sync' },
+ get __storageArea__(): 'sync' {
+ return 'sync'
+ }
},
local: {
clear: storageClear,
@@ -96,15 +100,19 @@ export const storage = {
/** Only for local area */
removeListener: storageRemoveListener,
createStream: storageCreateStream,
- get __storageArea__ (): 'local' { return 'local' },
+ get __storageArea__(): 'local' {
+ return 'local'
+ }
},
/** Clear all area */
clear: storageClear,
addListener: storageAddListener,
removeListener: storageRemoveListener,
createStream: storageCreateStream,
- get __storageArea__ (): 'all' { return 'all' },
-}
+ get __storageArea__(): 'all' {
+ return 'all'
+ }
+} as const
/**
* Wraps in-app runtime.sendMessage and tabs.sendMessage
@@ -115,7 +123,9 @@ export const message = {
addListener: messageAddListener,
removeListener: messageRemoveListener,
createStream: messageCreateStream,
- get __self__ (): false { return false },
+ get __self__(): false {
+ return false
+ },
self: {
initClient,
@@ -124,67 +134,77 @@ export const message = {
addListener: messageAddListener,
removeListener: messageRemoveListener,
createStream: messageCreateStream,
- get __self__ (): true { return true },
+ get __self__(): true {
+ return true
+ }
}
-}
+} as const
/**
* Open a url on new tab or highlight a existing tab if already opened
*/
-export async function openURL (url: string, self?: boolean): Promise<void> {
- if (self) { url = browser.runtime.getURL(url) }
+export async function openURL(url: string, self?: boolean): Promise<void> {
+ if (self) {
+ url = browser.runtime.getURL(url)
+ }
const tabs = await browser.tabs.query({ url })
- // Only Chrome supports tab.highlight for now
- if (tabs.length > 0 && typeof browser.tabs.highlight === 'function') {
+ if (tabs.length > 0) {
const { index, windowId } = tabs[0]
- await browser.tabs.highlight({ tabs: index, windowId })
+ if (typeof browser.tabs['highlight'] === 'function') {
+ // Only Chrome supports tab.highlight for now
+ await browser.tabs['highlight']({ tabs: index, windowId })
+ }
await browser.windows.update(windowId, { focused: true })
} else {
await browser.tabs.create({ url })
}
}
-export default {
- openURL,
- storage,
- message
-}
-
/* --------------------------------------- *\
* #Storage
\* --------------------------------------- */
type StorageThisTwo = typeof storage.sync | typeof storage.local
type StorageThisThree = StorageThisTwo | typeof storage
-function storageClear (): Promise<void>
-function storageClear (this: StorageThisThree): Promise<void> {
+function storageClear(): Promise<void>
+function storageClear(this: StorageThisThree): Promise<void> {
return this.__storageArea__ === 'all'
? Promise.all([
- browser.storage.local.clear(),
- browser.storage.sync.clear(),
- ]).then(noop)
+ browser.storage.local.clear(),
+ browser.storage.sync.clear()
+ ]).then(noop)
: browser.storage[this.__storageArea__].clear()
}
-function storageRemove (keys: string | string[]): Promise<void>
-function storageRemove (this: StorageThisTwo, keys: string | string[]): Promise<void> {
+function storageRemove(keys: string | string[]): Promise<void>
+function storageRemove(
+ this: StorageThisTwo,
+ keys: string | string[]
+): Promise<void> {
return browser.storage[this.__storageArea__].remove(keys)
}
-function storageGet<T = any> (key?: string | string[] | null): Promise<Partial<T>>
-function storageGet<T extends Object> (key: T | any): Promise<Partial<T>>
-function storageGet<T = any> (this: StorageThisTwo, ...args): Promise<Partial<T>> {
- return browser.storage[this.__storageArea__].get(...args)
+function storageGet<T = any>(
+ key?: string | string[] | null
+): Promise<Partial<T>>
+function storageGet<T extends Object>(key: T | any): Promise<Partial<T>>
+function storageGet<T = any>(this: StorageThisTwo, ...args) {
+ return browser.storage[this.__storageArea__].get(...args) as Promise<
+ Partial<T>
+ >
}
-function storageSet (keys: any): Promise<void>
-function storageSet (this: StorageThisTwo, keys: any): Promise<void> {
+function storageSet(keys: any): Promise<void>
+function storageSet(this: StorageThisTwo, keys: any): Promise<void> {
return browser.storage[this.__storageArea__].set(keys)
}
-function storageAddListener<T = any> (cb: StorageListenerCb<T>): void
-function storageAddListener<T = any, K extends string = string> (key: K, cb: StorageListenerCb<T, K>): void
-function storageAddListener (this: StorageThisThree, ...args): void {
+function storageAddListener<T = any>(cb: StorageListenerCb<T>): void
+function storageAddListener<T = any, K extends string = string>(
+ key: K,
+ cb: StorageListenerCb<T, K>
+): void
+function storageAddListener(this: StorageThisThree, ...args): void {
let key: string
let cb: StorageListenerCb
if (typeof args[0] === 'function') {
@@ -206,8 +226,9 @@ function storageAddListener (this: StorageThisThree, ...args): void {
let listener = listeners.get(listenerKey)
if (!listener) {
listener = (changes, areaName) => {
- if ((this.__storageArea__ === 'all' || areaName === this.__storageArea__) &&
- (!key || key in changes)
+ if (
+ (this.__storageArea__ === 'all' || areaName === this.__storageArea__) &&
+ (!key || key in changes)
) {
cb(changes, areaName)
}
@@ -217,9 +238,9 @@ function storageAddListener (this: StorageThisThree, ...args): void {
return browser.storage.onChanged.addListener(listener)
}
-function storageRemoveListener (key: string, cb: StorageListenerCb): void
-function storageRemoveListener (cb: StorageListenerCb): void
-function storageRemoveListener (this: StorageThisThree, ...args): void {
+function storageRemoveListener(key: string, cb: StorageListenerCb): void
+function storageRemoveListener(cb: StorageListenerCb): void
+function storageRemoveListener(this: StorageThisThree, ...args): void {
let key: string
let cb: StorageListenerCb
if (typeof args[0] === 'function') {
@@ -258,15 +279,20 @@ function storageRemoveListener (this: StorageThisThree, ...args): void {
browser.storage.onChanged.removeListener(cb)
}
-function storageCreateStream<T = any> (key: string): Observable<StorageChange<T>>
-function storageCreateStream (this: StorageThisThree, key: string) {
- if (!key) { throw new Error('Missing key') }
- return fromEventPattern(
+function storageCreateStream<T = any>(key: string): Observable<StorageChange<T>>
+function storageCreateStream<T = any>(
+ this: StorageThisThree,
+ key: string
+): Observable<StorageChange<T>> {
+ if (!key) {
+ throw new Error('Missing key')
+ }
+ return fromEventPattern<StorageChange<T>>(
handler => this.addListener(key, handler as StorageListenerCb),
- handler => this.removeListener(key, handler as StorageListenerCb),
+ handler => this.removeListener(key, handler as StorageListenerCb)
).pipe(
filter(args => (Array.isArray(args) ? args[0] : args).hasOwnProperty(key)),
- map(args => Array.isArray(args) ? args[0][key] : args[key]),
+ map(args => (Array.isArray(args) ? args[0][key] : args[key]))
)
}
@@ -275,13 +301,17 @@ function storageCreateStream (this: StorageThisThree, key: string) {
\* --------------------------------------- */
type MessageThis = typeof message | typeof message.self
-function messageSend<T extends Message, U = any> (tabId: number, message: T): Promise<U>
-function messageSend<T extends Message, U = any> (message: T): Promise<U>
-function messageSend (...args): Promise<any> {
- return (
- args.length === 1
- ? browser.runtime.sendMessage(args[0])
- : browser.tabs.sendMessage(args[0], args[1])
+function messageSend<T extends MsgType>(
+ message: Message<T>
+): Promise<MessageResponse<T>>
+function messageSend<T extends MsgType>(
+ tabId: number,
+ message: Message<T>
+): Promise<MessageResponse<T>>
+function messageSend(...args): Promise<any> {
+ return (args.length === 1
+ ? browser.runtime.sendMessage(args[0])
+ : browser.tabs.sendMessage(args[0], args[1])
).catch(err => {
if (process.env.DEV_BUILD) {
console.warn(err, ...args)
@@ -291,25 +321,36 @@ function messageSend (...args): Promise<any> {
})
}
-async function messageSendSelf<T extends Message, U = any> (message: T): Promise<U> {
+async function messageSendSelf<T extends MsgType>(
+ message: Message<T>
+): Promise<MessageResponse<T>> {
if (window.pageId === undefined) {
await initClient()
}
- return browser.runtime.sendMessage(Object.assign({}, message, {
- __pageId__: window.pageId,
- type: `[[${message.type}]]`
- })).catch(err => {
- if (process.env.DEV_BUILD) {
- console.warn(err, message)
- } else if (process.env.NODE_ENV !== 'production') {
- return Promise.reject(err) as any
- }
- })
+ return browser.runtime
+ .sendMessage(
+ Object.assign({}, message, {
+ __pageId__: window.pageId,
+ type: `[[${message.type}]]`
+ })
+ )
+ .catch(err => {
+ if (process.env.DEV_BUILD) {
+ console.warn(err, message)
+ } else if (process.env.NODE_ENV !== 'production') {
+ return Promise.reject(err) as any
+ }
+ })
}
-function messageAddListener<T extends Message = Message> (messageType: Message['type'], cb: onMessageEvent<T>): void
-function messageAddListener<T extends Message = Message> (cb: onMessageEvent<T>): void
-function messageAddListener (this: MessageThis, ...args): void {
+function messageAddListener<T extends MsgType>(
+ messageType: T,
+ cb: onMessageEvent<Message<T>>
+): void
+function messageAddListener<T extends MsgType>(
+ cb: onMessageEvent<Message>
+): void
+function messageAddListener(this: MessageThis, ...args): void {
if (window.pageId === undefined) {
initClient()
}
@@ -321,25 +362,33 @@ function messageAddListener (this: MessageThis, ...args): void {
listeners = new Map()
allListeners.set(cb, listeners)
}
- let listener = listeners.get(messageType || MsgType.Default)
+ let listener = listeners.get(messageType || '__DEFAULT_MSGTYPE__')
if (!listener) {
- listener = (
- (message, sender) => {
- if (message && (this.__self__ ? window.pageId === message.__pageId__ : !message.__pageId__)) {
- if (messageType == null || message.type === messageType) {
- return cb(message, sender)
- }
+ listener = ((message, sender) => {
+ if (
+ message &&
+ (this.__self__
+ ? window.pageId === message.__pageId__
+ : !message.__pageId__)
+ ) {
+ if (messageType == null || message.type === messageType) {
+ return cb(message, sender)
}
}
- ) as onMessageEvent
+ }) as onMessageEvent
listeners.set(messageType, listener)
}
+ // buggy object type https://github.com/kelseasy/web-ext-types/blob/f4573176659c28b3df684cf1e0ad7ba312bbd724/global/index.d.ts#L1376-L1398
+ // @ts-ignore
return browser.runtime.onMessage.addListener(listener)
}
-function messageRemoveListener (messageType: Message['type'], cb: onMessageEvent): void
-function messageRemoveListener (cb: onMessageEvent): void
-function messageRemoveListener (this: MessageThis, ...args): void {
+function messageRemoveListener(
+ messageType: Message['type'],
+ cb: onMessageEvent
+): void
+function messageRemoveListener(cb: onMessageEvent): void
+function messageRemoveListener(this: MessageThis, ...args): void {
const allListeners = this.__self__ ? messageSelfListeners : messageListeners
const messageType = args.length === 1 ? undefined : args[0]
const cb = args.length === 1 ? args[0] : args[1]
@@ -348,6 +397,7 @@ function messageRemoveListener (this: MessageThis, ...args): void {
if (messageType) {
const listener = listeners.get(messageType)
if (listener) {
+ // @ts-ignore
browser.runtime.onMessage.removeListener(listener)
listeners.delete(messageType)
if (listeners.size <= 0) {
@@ -357,7 +407,10 @@ function messageRemoveListener (this: MessageThis, ...args): void {
}
} else {
// delete all cb related callbacks
- listeners.forEach(listener => browser.runtime.onMessage.removeListener(listener))
+ listeners.forEach(listener =>
+ // @ts-ignore
+ browser.runtime.onMessage.removeListener(listener)
+ )
allListeners.delete(cb)
return
}
@@ -365,33 +418,38 @@ function messageRemoveListener (this: MessageThis, ...args): void {
browser.runtime.onMessage.removeListener(cb)
}
-function messageCreateStream<T = any> (messageType?: Message['type']): Observable<T>
-function messageCreateStream (this: MessageThis, messageType = MsgType.Null) {
- const pattern$ = messageType !== MsgType.Null
+function messageCreateStream<T = any>(messageType?: MsgType): Observable<T>
+function messageCreateStream(this: MessageThis, messageType?: MsgType) {
+ const pattern$ = messageType
? fromEventPattern(
- handler => this.addListener(messageType, handler as onMessageEvent),
- handler => this.removeListener(messageType, handler as onMessageEvent),
- )
+ handler => this.addListener(messageType, handler as onMessageEvent),
+ handler => this.removeListener(messageType, handler as onMessageEvent)
+ )
: fromEventPattern(
- handler => this.addListener(handler as onMessageEvent),
- handler => this.removeListener(handler as onMessageEvent),
- )
+ handler => this.addListener(handler as onMessageEvent),
+ handler => this.removeListener(handler as onMessageEvent)
+ )
- return pattern$.pipe(map(args => Array.isArray(args) ? args[0] : args))
+ return pattern$.pipe(map(args => (Array.isArray(args) ? args[0] : args)))
}
/**
* Deploy page script for self-messaging
* This method is called on the first sendMessage
*/
-function initClient (): Promise<typeof window.pageId> {
+function initClient(): Promise<typeof window.pageId> {
if (window.pageId === undefined) {
- return browser.runtime.sendMessage({ type: MsgType.__PageInfo__ })
+ return message
+ .send<'PAGE_INFO'>({ type: 'PAGE_INFO' })
.then(({ pageId, faviconURL, pageTitle, pageURL }) => {
window.pageId = pageId
window.faviconURL = faviconURL
- if (pageTitle) { window.pageTitle = pageTitle }
- if (pageURL) { window.pageURL = pageURL }
+ if (pageTitle) {
+ window.pageTitle = pageTitle
+ }
+ if (pageURL) {
+ window.pageURL = pageURL
+ }
return pageId
})
} else {
@@ -403,49 +461,59 @@ function initClient (): Promise<typeof window.pageId> {
* Deploy background proxy for self-messaging
* This method should be invoked in background script
*/
-function initServer (): void {
+function initServer(): void {
window.pageId = 'background page'
const selfMsgTester = /^\[\[(.+)\]\]$/
- browser.runtime.onMessage.addListener((message, sender) => {
- if (!message) { return }
+ browser.runtime.onMessage.addListener(
+ (message: object, sender: browser.runtime.MessageSender) => {
+ if (!message || !message['type']) {
+ return
+ }
- if (message.type === MsgType.__PageInfo__) {
- return Promise.resolve(_getPageInfo(sender))
- }
+ if ((message as Message).type === 'PAGE_INFO') {
+ return Promise.resolve(_getPageInfo(sender))
+ }
- const selfMsg = selfMsgTester.exec(message.type)
- if (selfMsg) {
- const msgType = Number(selfMsg[1])
- message.type = isNaN(msgType) ? selfMsg[1] : msgType as MsgType
- const tabId = sender.tab && sender.tab.id
- if (tabId) {
- return messageSend(tabId, message)
- } else {
- return messageSend(message)
+ const selfMsg = selfMsgTester.exec((message as Message).type)
+ if (selfMsg) {
+ ;(message as Message).type = selfMsg[1] as MsgType
+ const tabId = sender.tab && sender.tab.id
+ if (tabId) {
+ return messageSend(tabId, message as Message)
+ } else {
+ return messageSend(message as Message)
+ }
}
}
- })
+ )
}
-function _getPageInfo (sender) {
+function _getPageInfo(sender: browser.runtime.MessageSender) {
const result = {
- pageId: '',
+ pageId: '' as string | number,
faviconURL: '',
pageTitle: '',
- pageURL: '',
+ pageURL: ''
}
const tab = sender.tab
if (tab) {
- result.pageId = tab.id
- if (tab.favIconUrl) { result.faviconURL = tab.favIconUrl }
- if (tab.url) { result.pageURL = tab.url }
- if (tab.title) { result.pageTitle = tab.title }
+ result.pageId = tab.id || ''
+ if (tab.favIconUrl) {
+ result.faviconURL = tab.favIconUrl
+ }
+ if (tab.url) {
+ result.pageURL = tab.url
+ }
+ if (tab.title) {
+ result.pageTitle = tab.title
+ }
} else {
// FRAGILE: Assume only browser action page is tabless
result.pageId = 'popup'
if (sender.url && !sender.url.startsWith('http')) {
- result.faviconURL = 'https://raw.githubusercontent.com/crimx/ext-saladict/2ba9d2e85ad4ac2e4bb16ee43498ac4b58ed21a6/public/static/icon-16.png'
+ result.faviconURL =
+ 'https://raw.githubusercontent.com/crimx/ext-saladict/2ba9d2e85ad4ac2e4bb16ee43498ac4b58ed21a6/public/static/icon-16.png'
}
}
return result
diff --git a/src/typings/helpers.ts b/src/typings/helpers.ts
index dc5e6e91e..29c237d0d 100644
--- a/src/typings/helpers.ts
+++ b/src/typings/helpers.ts
@@ -1,20 +1,24 @@
interface DeepReadonlyArray<T> extends ReadonlyArray<DeepReadonly<T>> {}
type DeepReadonlyObject<T> = {
- readonly [P in keyof T]: DeepReadonly<T[P]>
+ readonly [P in keyof T]: DeepReadonly<T[P]>
}
-export type DeepReadonly<T> =
- T extends (infer R)[]
- ? DeepReadonlyArray<R>
- : T extends Function
- ? T
- : T extends object
- ? DeepReadonlyObject<T>
- : T
+export type DeepReadonly<T> = T extends (infer R)[]
+ ? DeepReadonlyArray<R>
+ : T extends Function
+ ? T
+ : T extends object
+ ? DeepReadonlyObject<T>
+ : T
export type Diff<T, K> = Exclude<T, K>
export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>
export type Mutable<T> = { -readonly [P in keyof T]: T[P] }
+
+export type UnionKeys<T> = T extends any ? keyof T : never
+export type UnionPick<T, K extends UnionKeys<T>> = T extends any
+ ? Pick<T, Extract<K, keyof T>>
+ : never
diff --git a/src/typings/message.ts b/src/typings/message.ts
index 505a81e77..ab595658a 100644
--- a/src/typings/message.ts
+++ b/src/typings/message.ts
@@ -1,284 +1,321 @@
-import { SelectionInfo } from '@/_helpers/selection'
-import { DictID } from '@/app-config'
-import { Word, Area as DBArea } from '@/_helpers/record-manager'
-import { Omit } from '@/typings/helpers'
-import { DictSearchResult } from '@/typings/server'
-
-export const enum MsgType {
- /** Nothing */
- Null,
- /** Default */
- Default,
-
- /** is dict panel pinned? */
- IsPinned,
-
- /** is a standalone panel running? */
- QSPanelIDChanged,
-
- /** query background for standalone panel appearance */
- QueryQSPanel,
-
- OpenQSPanel,
- CloseQSPanel,
-
- QSPanelSearchText,
-
- /** Mouse down, selection maybe empty */
- Selection,
-
- /** Ctrl/Command has been hit 3 times */
- TripleCtrl,
-
- /** Escape key is pressed */
- EscapeKey,
-
- /** Response the pageInfo of a page */
- PageInfo,
-
- /** Create a tab with the url or highlight an existing one */
- OpenURL,
- /** open a dictionary source page */
- OpenSrcPage,
- /** Request background to play a audio src */
- PlayAudio,
- /** Background to a dict panel on one page */
- PlayWaveform,
- /** Search text with a dictionary and response the result */
- FetchDictResult,
- /** Call a custom method of a dict engine */
- DictEngineMethod,
- /** Request background proxy for current selection */
- PreloadSelection,
- /** Get clipboard content */
- GetClipboard,
-
- RequestCSS,
-
- IsInNotebook,
- SaveWord,
- WordSaved,
- DeleteWords,
- GetWordsByText,
- GetWords,
- GetSuggests,
-
- /** Popup page */
- TempDisabledState,
-
- /** Word page */
- EditWord,
-
- /** Query panel state */
- QueryPanelState,
-
- /** Manually emit selection event */
- EmitSelection,
-
- SyncServiceInit,
- SyncServiceDownload,
- SyncServiceUpload,
-
- /** Manually trigger context menus click */
- ContextMenusClick,
-
- /**
- * Background proxy sends back underlyingly
- */
- __PageInfo__,
-}
-
-/** iframe messaging */
-export const enum PostMsgType {
- Selection = 'SALADICT_SELECTION',
-}
-
-export interface MsgSelection {
- readonly type: MsgType.Selection
- readonly selectionInfo: SelectionInfo
- readonly mouseX: number
- readonly mouseY: number
- /** inside panel? */
- readonly self: boolean
- readonly dbClick: boolean
- readonly shiftKey: boolean
- readonly ctrlKey: boolean
- readonly metaKey: boolean
- /** skip salad bowl and show panel directly */
- readonly instant: boolean
- /** force panel to skip reconciling position */
- readonly force: boolean
-}
-
-export interface PostMsgSelection extends Omit<MsgSelection, 'type'> {
- readonly type: PostMsgType.Selection
-}
-
-export interface MsgOpenUrl {
- readonly type: MsgType.OpenURL
- readonly url: string
- /** use browser.runtime.getURL? */
- readonly self?: boolean
-}
-
-export interface MsgOpenSrcPage {
- readonly type: MsgType.OpenSrcPage
- readonly text: string
- readonly id: DictID
-}
-
-export interface MsgAudioPlay {
- readonly type: MsgType.PlayAudio
- /** empty string for stoping */
- readonly src: string
+// import { SelectionInfo } from '@/_helpers/selection'
+// import { DictID } from '@/app-config'
+// import { Word, Area as DBArea } from '@/_helpers/record-manager'
+import { UnionPick } from '@/typings/helpers'
+// import { DictSearchResult } from '@/typings/server'
+
+export type MessageConfig = {
+ PAGE_INFO: {
+ /** Request backend for page info */
+ type: 'PAGE_INFO'
+ response: {
+ pageId: string | number
+ faviconURL?: string
+ pageTitle?: string
+ pageURL?: string
+ }
+ }
+ GET_SUGGESTS: {
+ /** Request backend to fetch suggest */
+ type: 'GET_SUGGESTS'
+ /** Search text */
+ payload: string
+ /** Response with suggest items */
+ response: Array<{
+ explain: string
+ entry: string
+ }>
+ }
}
-export interface MsgWaveFormPlay {
- readonly type: MsgType.PlayWaveform
- readonly src: string
- readonly tabId: string | number
-}
+export type MsgType = keyof MessageConfig
-export interface MsgFetchDictResult {
- readonly type: MsgType.FetchDictResult
- readonly id: DictID
- readonly text: string
- /** pass to engine search function as the third argument */
- readonly payload: {
- isPDF: boolean
- [index: string]: any
- }
-}
+export type Message<T = undefined> = T extends MsgType
+ ? Pick<MessageConfig[T], Extract<'type' | 'payload', keyof MessageConfig[T]>>
+ : UnionPick<MessageConfig[MsgType], 'type' | 'payload'>
-export interface MsgFetchDictResultResponse<R = any> {
- id: DictID
- result: R | null
- audio?: DictSearchResult<R>['audio']
-}
+export type MessageResponse<T extends MsgType> = MessageConfig[T][Extract<
+ 'response',
+ keyof MessageConfig[T]
+>]
-export interface MsgDictEngineMethod {
- readonly type: MsgType.DictEngineMethod
- readonly id: DictID
- readonly method: string
- readonly args?: any[]
-}
+// export enum MsgType {
+// /** Nothing */
+// Null,
+// /** Default */
+// Default,
-export interface MsgIsInNotebook {
- readonly type: MsgType.IsInNotebook
- readonly info: SelectionInfo
-}
+// /** is dict panel pinned? */
+// IsPinned,
-export interface MsgSaveWord {
- readonly type: MsgType.SaveWord
- readonly area: DBArea
- readonly info: SelectionInfo & { readonly date?: number }
-}
+// /** is a standalone panel running? */
+// QSPanelIDChanged,
-export interface MsgDeleteWords {
- readonly type: MsgType.DeleteWords
- readonly area: DBArea
- readonly dates?: number[]
-}
+// /** query background for standalone panel appearance */
+// QueryQSPanel,
-export interface MsgGetWordsByText {
- readonly type: MsgType.GetWordsByText
- readonly area: DBArea
- readonly text: string
-}
+// OpenQSPanel,
+// CloseQSPanel,
-export interface MsgGetWords {
- readonly type: MsgType.GetWords
- readonly area: DBArea
- readonly itemsPerPage?: number
- readonly pageNum?: number
- readonly filters?: { [field: string]: string[] | undefined }
- readonly sortField?: string
- readonly sortOrder?: 'ascend' | 'descend' | false
- readonly searchText?: string
-}
+// QSPanelSearchText,
-export interface MsgGetSuggests {
- readonly type: MsgType.GetSuggests
- readonly text: string
-}
+// /** Mouse down, selection maybe empty */
+// Selection,
-export interface MsgGetWordsResponse {
- readonly total: number
- readonly words: Word[]
-}
+// /** Ctrl/Command has been hit 3 times */
+// TripleCtrl,
-export type MsgTempDisabledState = {
- readonly type: MsgType.TempDisabledState
- readonly op: 'get'
-} | {
- readonly type: MsgType.TempDisabledState
- readonly op: 'set'
- readonly value: boolean
-}
+// /** Escape key is pressed */
+// EscapeKey,
-export interface MsgEditWord {
- readonly type: MsgType.EditWord
- readonly word: Word
-}
+// /** Response the pageInfo of a page */
+// PageInfo,
-export interface MsgIsPinned {
- readonly type: MsgType.IsPinned
- readonly isPinned: boolean
-}
+// /** Create a tab with the url or highlight an existing one */
+// OpenURL,
+// /** open a dictionary source page */
+// OpenSrcPage,
+// /** Request background to play a audio src */
+// PlayAudio,
+// /** Background to a dict panel on one page */
+// PlayWaveform,
+// /** Search text with a dictionary and response the result */
+// FetchDictResult,
+// /** Call a custom method of a dict engine */
+// DictEngineMethod,
+// /** Request background proxy for current selection */
+// PreloadSelection,
+// /** Get clipboard content */
+// GetClipboard,
-export interface MsgQSPanelIDChanged {
- readonly type: MsgType.QSPanelIDChanged
- readonly flag: boolean
-}
+// RequestCSS,
-export interface MsgQueryQSPanel {
- readonly type: MsgType.QueryQSPanel
-}
+// IsInNotebook,
+// SaveWord,
+// WordSaved,
+// DeleteWords,
+// GetWordsByText,
+// GetWords,
+// GetSuggests,
-export interface MsgQSPanelSearchText {
- readonly type: MsgType.QSPanelSearchText
- readonly info: SelectionInfo
-}
+// /** Popup page */
+// TempDisabledState,
-export type MsgQueryQSPanelResponse = boolean
+// /** Word page */
+// EditWord,
-export interface MsgQueryPanelState {
- readonly type: MsgType.QueryPanelState
- /** object path, default returns the whole state */
- readonly path?: string
-}
+// /** Query panel state */
+// QueryPanelState,
-export interface MsgSyncServiceInit<C = any> {
- readonly type: MsgType.SyncServiceInit
- readonly serviceID: string
- readonly config: C
-}
+// /** Manually emit selection event */
+// EmitSelection,
-export interface MsgSyncServiceDownload {
- readonly type: MsgType.SyncServiceDownload
- readonly serviceID: string
- readonly noCache?: boolean
-}
+// SyncServiceInit,
+// SyncServiceDownload,
+// SyncServiceUpload,
-export const enum SyncServiceUploadOp {
- Add,
- Delete,
-}
+// /** Manually trigger context menus click */
+// ContextMenusClick,
-export interface MsgSyncServiceUpload {
- readonly type: MsgType.SyncServiceUpload
- readonly op: SyncServiceUploadOp
- readonly serviceID?: string
- /** When op is Add */
- readonly words?: Word[]
- /** When op is Delete */
- readonly dates?: number[]
- readonly force?: boolean
-}
+// /**
+// * Background proxy sends back underlyingly
+// */
+// __PageInfo__
+// }
-export interface MsgContextMenusClick {
- readonly type: MsgType.ContextMenusClick
- readonly menuItemId: string
- readonly selectionText?: string
- readonly linkUrl?: string
-}
+/** iframe messaging */
+// export enum PostMsgType {
+// Selection = 'SALADICT_SELECTION'
+// }
+
+// export interface MsgSelection {
+// readonly type: MsgType.Selection
+// readonly selectionInfo: SelectionInfo
+// readonly mouseX: number
+// readonly mouseY: number
+// /** inside panel? */
+// readonly self: boolean
+// readonly dbClick: boolean
+// readonly shiftKey: boolean
+// readonly ctrlKey: boolean
+// readonly metaKey: boolean
+// /** skip salad bowl and show panel directly */
+// readonly instant: boolean
+// /** force panel to skip reconciling position */
+// readonly force: boolean
+// }
+
+// export interface PostMsgSelection extends Omit<MsgSelection, 'type'> {
+// readonly type: PostMsgType.Selection
+// }
+
+// export interface MsgOpenUrl {
+// readonly type: MsgType.OpenURL
+// readonly url: string
+// /** use browser.runtime.getURL? */
+// readonly self?: boolean
+// }
+
+// export interface MsgOpenSrcPage {
+// readonly type: MsgType.OpenSrcPage
+// readonly text: string
+// readonly id: DictID
+// }
+
+// export interface MsgAudioPlay {
+// readonly type: MsgType.PlayAudio
+// /** empty string for stoping */
+// readonly src: string
+// }
+
+// export interface MsgWaveFormPlay {
+// readonly type: MsgType.PlayWaveform
+// readonly src: string
+// readonly tabId: string | number
+// }
+
+// export interface MsgFetchDictResult {
+// readonly type: MsgType.FetchDictResult
+// readonly id: DictID
+// readonly text: string
+// /** pass to engine search function as the third argument */
+// readonly payload: {
+// isPDF: boolean
+// [index: string]: any
+// }
+// }
+
+// export interface MsgFetchDictResultResponse<R = any> {
+// id: DictID
+// result: R | null
+// audio?: DictSearchResult<R>['audio']
+// }
+
+// export interface MsgDictEngineMethod {
+// readonly type: MsgType.DictEngineMethod
+// readonly id: DictID
+// readonly method: string
+// readonly args?: any[]
+// }
+
+// export interface MsgIsInNotebook {
+// readonly type: MsgType.IsInNotebook
+// readonly info: SelectionInfo
+// }
+
+// export interface MsgSaveWord {
+// readonly type: MsgType.SaveWord
+// readonly area: DBArea
+// readonly info: SelectionInfo & { readonly date?: number }
+// }
+
+// export interface MsgDeleteWords {
+// readonly type: MsgType.DeleteWords
+// readonly area: DBArea
+// readonly dates?: number[]
+// }
+
+// export interface MsgGetWordsByText {
+// readonly type: MsgType.GetWordsByText
+// readonly area: DBArea
+// readonly text: string
+// }
+
+// export interface MsgGetWords {
+// readonly type: MsgType.GetWords
+// readonly area: DBArea
+// readonly itemsPerPage?: number
+// readonly pageNum?: number
+// readonly filters?: { [field: string]: string[] | undefined }
+// readonly sortField?: string
+// readonly sortOrder?: 'ascend' | 'descend' | false
+// readonly searchText?: string
+// }
+
+// export interface MsgGetSuggests {
+// readonly type: MsgType.GetSuggests
+// readonly text: string
+// }
+
+// export interface MsgGetWordsResponse {
+// readonly total: number
+// readonly words: Word[]
+// }
+
+// export type MsgTempDisabledState =
+// | {
+// readonly type: MsgType.TempDisabledState
+// readonly op: 'get'
+// }
+// | {
+// readonly type: MsgType.TempDisabledState
+// readonly op: 'set'
+// readonly value: boolean
+// }
+
+// export interface MsgEditWord {
+// readonly type: MsgType.EditWord
+// readonly word: Word
+// }
+
+// export interface MsgIsPinned {
+// readonly type: MsgType.IsPinned
+// readonly isPinned: boolean
+// }
+
+// export interface MsgQSPanelIDChanged {
+// readonly type: MsgType.QSPanelIDChanged
+// readonly flag: boolean
+// }
+
+// export interface MsgQueryQSPanel {
+// readonly type: MsgType.QueryQSPanel
+// }
+
+// export interface MsgQSPanelSearchText {
+// readonly type: MsgType.QSPanelSearchText
+// readonly info: SelectionInfo
+// }
+
+// export type MsgQueryQSPanelResponse = boolean
+
+// export interface MsgQueryPanelState {
+// readonly type: MsgType.QueryPanelState
+// /** object path, default returns the whole state */
+// readonly path?: string
+// }
+
+// export interface MsgSyncServiceInit<C = any> {
+// readonly type: MsgType.SyncServiceInit
+// readonly serviceID: string
+// readonly config: C
+// }
+
+// export interface MsgSyncServiceDownload {
+// readonly type: MsgType.SyncServiceDownload
+// readonly serviceID: string
+// readonly noCache?: boolean
+// }
+
+// export const enum SyncServiceUploadOp {
+// Add,
+// Delete
+// }
+
+// export interface MsgSyncServiceUpload {
+// readonly type: MsgType.SyncServiceUpload
+// readonly op: SyncServiceUploadOp
+// readonly serviceID?: string
+// /** When op is Add */
+// readonly words?: Word[]
+// /** When op is Delete */
+// readonly dates?: number[]
+// readonly force?: boolean
+// }
+
+// export interface MsgContextMenusClick {
+// readonly type: MsgType.ContextMenusClick
+// readonly menuItemId: string
+// readonly selectionText?: string
+// readonly linkUrl?: string
+// }
|
refactor
|
update message types
|
e6d62507e8be21132b0ca4db941b98564e313696
|
2019-09-27 20:47:58
|
crimx
|
fix(dicts): update sogou api
| false
|
diff --git a/src/components/dictionaries/sogou/engine.ts b/src/components/dictionaries/sogou/engine.ts
index c66e098fe..f7c8fc298 100644
--- a/src/components/dictionaries/sogou/engine.ts
+++ b/src/components/dictionaries/sogou/engine.ts
@@ -187,22 +187,44 @@ async function getSogouToken(): Promise<string> {
let { dict_sogou } = await storage.local.get<{ dict_sogou: SogouStorage }>(
'dict_sogou'
)
- if (!dict_sogou || Date.now() - dict_sogou.tokenDate > 6 * 3600000) {
- let token = '8511813095151'
+ if (!dict_sogou || Date.now() - dict_sogou.tokenDate > 3600000) {
+ let token = '8511813095152'
+
try {
- const response = await axios.get(
- 'https://github.com/crimx/ext-saladict/blob/dev/src/components/dictionaries/sogou/seccode.json'
- )
- if (response.data && response.data.seccode) {
- token = response.data.seccode
+ const { data } = await axios.get('https://fanyi.sogou.com/logtrace', {
+ headers: {
+ Referer: 'https://fanyi.sogou.com',
+ Origin: 'https://fanyi.sogou.com'
+ },
+ withCredentials: false,
+ transformResponse: [(data: string): string => data],
+ responseType: 'text'
+ })
+
+ if (data) {
+ const matchSeccode = /window\.seccode=(\d+)/.exec(data)
+ if (matchSeccode) {
+ token = matchSeccode[1]
+ }
}
- } catch (e) {
- /* nothing */
+ } catch (e) {}
+
+ if (!token) {
+ try {
+ const { data } = await axios.get(
+ 'https://raw.githubusercontent.com/OpenTranslate/OpenTranslate/master/packages/service-sogou/src/seccode.json'
+ )
+ if (data && data.seccode) {
+ token = data.seccode
+ }
+ } catch (e) {}
}
+
dict_sogou = {
token,
tokenDate: Date.now()
}
+
storage.local.set({ dict_sogou })
}
|
fix
|
update sogou api
|
5916c00cb7384ac80c3ce9421fa8aa5b160fa6ab
|
2019-01-23 15:58:08
|
CRIMX
|
style: remove unused var
| false
|
diff --git a/src/options/components/options/Popup/index.tsx b/src/options/components/options/Popup/index.tsx
index cc9a8bbf8..917d58132 100644
--- a/src/options/components/options/Popup/index.tsx
+++ b/src/options/components/options/Popup/index.tsx
@@ -1,5 +1,4 @@
import React from 'react'
-import { openURL } from '@/_helpers/browser-api'
import { Props } from '../typings'
import { updateConfigOrProfile, formItemLayout } from '../helpers'
|
style
|
remove unused var
|
d298201356d153a00687875402aa54592c4886a2
|
2018-05-25 17:44:55
|
CRIMX
|
fix(panel): remove animation on popup page
| false
|
diff --git a/src/content/components/DictPanelPortal/index.tsx b/src/content/components/DictPanelPortal/index.tsx
index 23bd08c7d..1108e5d48 100644
--- a/src/content/components/DictPanelPortal/index.tsx
+++ b/src/content/components/DictPanelPortal/index.tsx
@@ -101,7 +101,8 @@ export default class DictPanelPortal extends React.Component<DictPanelPortalProp
panelImmediateCtrl = (key: string) => {
if (!this.props.isAnimation ||
!this.props.shouldPanelShow ||
- this.props.isPanelAppear
+ this.props.isPanelAppear ||
+ isSaladictPopupPage
) {
return true
}
|
fix
|
remove animation on popup page
|
37f51e032cf0e88810b241498a18ee59d94a81db
|
2020-08-03 18:24:26
|
crimx
|
improvement(dicts): toggle translation on guoyu and liangan
| false
|
diff --git a/src/components/dictionaries/guoyu/_locales.json b/src/components/dictionaries/guoyu/_locales.json
index 746d20a99..5dd8a71a7 100644
--- a/src/components/dictionaries/guoyu/_locales.json
+++ b/src/components/dictionaries/guoyu/_locales.json
@@ -3,5 +3,19 @@
"en": "國語辭典",
"zh-CN": "国语辞典",
"zh-TW": "國語辭典"
+ },
+ "options": {
+ "trans": {
+ "en": "Show Translation",
+ "zh-CN": "显示翻译",
+ "zh-TW": "顯示翻譯"
+ }
+ },
+ "helps": {
+ "trans": {
+ "en": "Show translation of other languages.",
+ "zh-CN": "显示其它语言的翻译。",
+ "zh-TW": "顯示其它語言的翻譯。"
+ }
}
-}
\ No newline at end of file
+}
diff --git a/src/components/dictionaries/guoyu/config.ts b/src/components/dictionaries/guoyu/config.ts
index d65a78d7f..bade6f9e1 100644
--- a/src/components/dictionaries/guoyu/config.ts
+++ b/src/components/dictionaries/guoyu/config.ts
@@ -1,6 +1,9 @@
import { DictItem } from '@/app-config/dicts'
-export type GuoyuConfig = DictItem
+export type GuoyuConfig = DictItem<{
+ /** show translation */
+ trans: boolean
+}>
export default (): GuoyuConfig => ({
lang: '00100000',
@@ -30,5 +33,8 @@ export default (): GuoyuConfig => ({
selectionWC: {
min: 1,
max: 5
+ },
+ options: {
+ trans: true
}
})
diff --git a/src/components/dictionaries/guoyu/engine.ts b/src/components/dictionaries/guoyu/engine.ts
index c944ebf33..ee2afe89a 100644
--- a/src/components/dictionaries/guoyu/engine.ts
+++ b/src/components/dictionaries/guoyu/engine.ts
@@ -8,6 +8,7 @@ import {
} from '../helpers'
import { AppConfig } from '@/app-config'
import axios from 'axios'
+import { Profile } from '@/app-config/profiles'
export const getSrcPage: GetSrcPageFunction = async text => {
const transform = await getChsToChz()
@@ -53,42 +54,51 @@ export const search: SearchFunction<GuoYuResult> = (
profile,
payload
) => {
- return moedictSearch<GuoYuResult>('a', text, config)
+ return moedictSearch<GuoYuResult>(
+ 'a',
+ text,
+ config,
+ profile.dicts.all.guoyu.options
+ )
}
export async function moedictSearch<R extends GuoYuResult>(
moedictID: string,
text: string,
- config: AppConfig
+ config: AppConfig,
+ options: Profile['dicts']['all']['guoyu']['options']
): Promise<DictSearchResult<R>> {
const chsToChz = await getChsToChz()
- return axios
+ const { data } = await axios
.get<R>(
`https://www.moedict.tw/${moedictID}/${encodeURIComponent(
chsToChz(text.replace(/\s+/g, ''))
)}.json`
)
.catch(handleNetWorkError)
- .then<DictSearchResult<R>>(({ data }) => {
- if (!data || !data.h) {
- return handleNoResult()
- }
- const result: DictSearchResult<R> = { result: data }
+ if (!data || !data.h) {
+ return handleNoResult()
+ }
+
+ if (!options.trans) {
+ data.translation = undefined
+ }
- data.h.forEach(h => {
- if (h['=']) {
- h[
- '='
- ] = `https://203146b5091e8f0aafda-15d41c68795720c6e932125f5ace0c70.ssl.cf1.rackcdn.com/${h['=']}.ogg`
- }
- if (!result.audio) {
- result.audio = {
- py: h['=']
- }
- }
- })
+ const result: DictSearchResult<R> = { result: data }
+
+ for (const h of data.h) {
+ if (h['=']) {
+ h[
+ '='
+ ] = `https://203146b5091e8f0aafda-15d41c68795720c6e932125f5ace0c70.ssl.cf1.rackcdn.com/${h['=']}.ogg`
+ }
+ if (!result.audio) {
+ result.audio = {
+ py: h['=']
+ }
+ }
+ }
- return result
- })
+ return result
}
diff --git a/src/components/dictionaries/liangan/_locales.json b/src/components/dictionaries/liangan/_locales.json
index 2aecc7c10..f98e8218e 100644
--- a/src/components/dictionaries/liangan/_locales.json
+++ b/src/components/dictionaries/liangan/_locales.json
@@ -3,5 +3,19 @@
"en": "兩岸詞典",
"zh-CN": "两岸词典",
"zh-TW": "兩岸詞典"
+ },
+ "options": {
+ "trans": {
+ "en": "Show Translation",
+ "zh-CN": "显示翻译",
+ "zh-TW": "顯示翻譯"
+ }
+ },
+ "helps": {
+ "trans": {
+ "en": "Show translation of other languages.",
+ "zh-CN": "显示其它语言的翻译。",
+ "zh-TW": "顯示其它語言的翻譯。"
+ }
}
-}
\ No newline at end of file
+}
diff --git a/src/components/dictionaries/liangan/config.ts b/src/components/dictionaries/liangan/config.ts
index ccc68ef37..87d654985 100644
--- a/src/components/dictionaries/liangan/config.ts
+++ b/src/components/dictionaries/liangan/config.ts
@@ -1,6 +1,8 @@
import { DictItem } from '@/app-config/dicts'
-export type LianganConfig = DictItem
+export type LianganConfig = DictItem<{
+ trans: boolean
+}>
export default (): LianganConfig => ({
lang: '00100000',
@@ -30,5 +32,8 @@ export default (): LianganConfig => ({
selectionWC: {
min: 1,
max: 5
+ },
+ options: {
+ trans: false
}
})
diff --git a/src/components/dictionaries/liangan/engine.ts b/src/components/dictionaries/liangan/engine.ts
index 5d9082432..106696ab8 100644
--- a/src/components/dictionaries/liangan/engine.ts
+++ b/src/components/dictionaries/liangan/engine.ts
@@ -14,7 +14,12 @@ export const search: SearchFunction<LiangAnResult> = (
profile,
payload
) => {
- return moedictSearch<LiangAnResult>('c', text, config).then(result => {
+ return moedictSearch<LiangAnResult>(
+ 'c',
+ text,
+ config,
+ profile.dicts.all.liangan.options
+ ).then(result => {
if (result.result.h) {
result.result.h.forEach(h => {
if (h.p) {
|
improvement
|
toggle translation on guoyu and liangan
|
f20a00ff5c8eb720e9d82ab748d028e1c0b3ce98
|
2018-05-16 22:58:31
|
CRIMX
|
build(webpack): speedup ts compiling
| false
|
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index acfe491f5..875222070 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -195,6 +195,9 @@ module.exports = {
},
{
loader: require.resolve('ts-loader'),
+ options: {
+ transpileOnly: true,
+ },
}
],
},
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index e5219bd9c..b5a8fca94 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -161,6 +161,7 @@ module.exports = {
loader: require.resolve('ts-loader'),
options: {
appendTsSuffixTo: [/\.vue$/],
+ transpileOnly: argv.devbuild,
}
}
],
|
build
|
speedup ts compiling
|
f2e2836b400a1ba1ba1bda634f2a48d15cf6a102
|
2019-09-06 10:10:12
|
crimx
|
fix: context menus locale name
| false
|
diff --git a/src/background/context-menus.ts b/src/background/context-menus.ts
index 1b6eb3985..1c3b73a32 100644
--- a/src/background/context-menus.ts
+++ b/src/background/context-menus.ts
@@ -36,14 +36,14 @@ interface CreateMenuOptions {
let setMenus$$: Observable<void>
const i18n = i18nLoader()
-i18n.loadNamespaces('context')
+i18n.loadNamespaces('menus')
const i18n$$ = new BehaviorSubject<TFunction>(
- i18n.getFixedT(i18n.language, 'context')
+ i18n.getFixedT(i18n.language, 'menus')
)
i18n.on('languageChanged', () =>
- i18n$$.next(i18n.getFixedT(i18n.language, 'context'))
+ i18n$$.next(i18n.getFixedT(i18n.language, 'menus'))
)
browser.contextMenus.onClicked.addListener(handleContextMenusClick)
|
fix
|
context menus locale name
|
f962df476d95c1b87b5138a722a580ffb3376b06
|
2019-12-13 10:54:38
|
crimx
|
docs: add issue template
| false
|
diff --git a/.github/ISSUE_TEMPLATE/_new_dict_chs.md b/.github/ISSUE_TEMPLATE/_new_dict_chs.md
new file mode 100644
index 000000000..68167daab
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/_new_dict_chs.md
@@ -0,0 +1,52 @@
+---
+name: 词典推荐
+about: 请求沙拉查词添加新词典。
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+推荐前请请在沙拉查词设置中查看是否已经支持了该词典
+
+- 使用说明： https://saladict.crimx.com/manual.html
+
+请根据模板描述问题，以便别人理解、定位和解决问题。
+请根据模板描述问题，以便别人理解、定位和解决问题。
+请根据模板描述问题，以便别人理解、定位和解决问题。
+-->
+
+<!-- 这是隐藏的信息 -->
+<!-- 👆这样括起来的信息将被隐藏，填写时注意不要写在里面，也可以整个删掉无所谓。 -->
+
+## 词典名称以及链接
+
+
+
+## 沙拉查词的已有的词典为什么不能满足？
+<!--
+推荐词典有什么特殊功能是当前词典无法满足的
+-->
+
+
+
+## 单词举例
+<!--
+列出几个当前词典无法找到释义的单词，或者能体现推荐词典特性的单词
+
+- 单词1，在已有词典下无法找到 xxxx 的用法。
+- 单词2，推荐词典可以显示 xxxx 功能。
+-->
+
+
+
+## 截图
+<!-- 需要情况下，可借助截图描述问题 -->
+
+
+
+## 额外信息
+<!-- 更多有助于理解问题的描述和资料 -->
+
+
|
docs
|
add issue template
|
d6e2fbbdfbd26051171080c04e1e68ad8a7f0c2a
|
2019-07-30 17:08:29
|
crimx
|
refactor: update message channel
| false
|
diff --git a/src/typings/message.ts b/src/typings/message.ts
index 5158a7eac..c3fae0767 100644
--- a/src/typings/message.ts
+++ b/src/typings/message.ts
@@ -2,6 +2,7 @@ import { Word, DBArea } from '@/_helpers/record-manager'
// import { DictID } from '@/app-config'
// import { Word, Area as DBArea } from '@/_helpers/record-manager'
import { UnionPick } from '@/typings/helpers'
+import { DictID } from '@/app-config'
// import { DictSearchResult } from '@/typings/server'
export type MessageConfig = {
@@ -13,6 +14,14 @@ export type MessageConfig = {
self?: boolean
}
}
+ OPEN_DICT_SRC_PAGE: {
+ /** Open the source page of a dictionary */
+ type: 'OPEN_DICT_SRC_PAGE'
+ payload: {
+ id: DictID
+ text: string
+ }
+ }
PAGE_INFO: {
/** Request backend for page info */
|
refactor
|
update message channel
|
d69dfb9a4952531073cd975600c23b1e1f3f9d37
|
2020-07-10 22:39:20
|
crimx
|
chore(release): 7.14.0
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb542ead1..f15796e49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,32 @@
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.
+## [7.14.0](https://github.com/crimx/ext-saladict/compare/v7.13.4...v7.14.0) (2020-07-10)
+
+
+### Features
+
+* **background:** add background permission ([9d41e09](https://github.com/crimx/ext-saladict/commit/9d41e0980e17dffbcce2804a66b850f9e33c147e)), closes [#892](https://github.com/crimx/ext-saladict/issues/892)
+* **menus:** add saladict standlone panel ([0d4a732](https://github.com/crimx/ext-saladict/commit/0d4a73278a523405b1ab1d28ade9d514826ecd4a)), closes [#864](https://github.com/crimx/ext-saladict/issues/864)
+* **panel:** add dict item catalog ([f07ea25](https://github.com/crimx/ext-saladict/commit/f07ea25751fcb746363e09b3804da03520b35249))
+
+
+### Bug Fixes
+
+* **components:** fix select padding in firefox ([dd366d3](https://github.com/crimx/ext-saladict/commit/dd366d396e8ca63298aeb70a575dfaad858f75b7))
+* **components:** typo ([0229cc2](https://github.com/crimx/ext-saladict/commit/0229cc28124567cbe6a79c71d474c935da094756))
+* **dicts:** update tts for tencent and caiyun ([afdac41](https://github.com/crimx/ext-saladict/commit/afdac41d4099aef1efa6021c60b741e3ad6fda22))
+* **options:** update sortable list on store changes ([075aef7](https://github.com/crimx/ext-saladict/commit/075aef764d8327f78288e0d6d183ae51f9f82f48))
+* **panel:** correct panel history ([1b2781f](https://github.com/crimx/ext-saladict/commit/1b2781f48e875f07536be14a733e93a901db5958)), closes [#881](https://github.com/crimx/ext-saladict/issues/881)
+* **panel:** fix catalog scrolling ([ded090d](https://github.com/crimx/ext-saladict/commit/ded090d81b7d2bd66b0c12806a1c3fa457257328))
+
+
+### Tests
+
+* **panel:** update dict item stories ([507c638](https://github.com/crimx/ext-saladict/commit/507c638ba34a9b903cbee06b36056ede15c66a2d))
+* update stories ([49b2ad2](https://github.com/crimx/ext-saladict/commit/49b2ad2eb68e0b39117b224ad1c05264b8ed678f))
+* **dicts:** log runtime messages ([5c23327](https://github.com/crimx/ext-saladict/commit/5c23327db3f6b44f25487b3cc0866ab38741adc9))
+
### [7.13.4](https://github.com/crimx/ext-saladict/compare/v7.13.3...v7.13.4) (2020-06-23)
diff --git a/package.json b/package.json
index 46071ef77..e0b3b3c7e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "7.13.4",
+ "version": "7.14.0",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
7.14.0
|
5a99f6c9662d0fca5153f5bd29d9b2cc5e3e157f
|
2019-08-20 11:52:21
|
crimx
|
refactor(message): re-structure message channel
| false
|
diff --git a/src/_helpers/browser-api.ts b/src/_helpers/browser-api.ts
index 0486f0289..0dbffd6a5 100644
--- a/src/_helpers/browser-api.ts
+++ b/src/_helpers/browser-api.ts
@@ -302,13 +302,13 @@ function storageCreateStream<T = any>(
\* --------------------------------------- */
type MessageThis = typeof message | typeof message.self
-function messageSend<T extends MsgType, R = undefined>(
+function messageSend<T extends MsgType>(
message: Message<T>
-): Promise<R extends undefined ? MessageResponse<T> : R>
-function messageSend<T extends MsgType, R = undefined>(
+): Promise<MessageResponse<T>>
+function messageSend<T extends MsgType>(
tabId: number,
message: Message<T>
-): Promise<R extends undefined ? MessageResponse<T> : R>
+): Promise<MessageResponse<T>>
function messageSend<T extends MsgType>(
...args: [Message<T>] | [number, Message<T>]
): Promise<any> {
diff --git a/src/typings/message.ts b/src/typings/message.ts
index 5cbbb8737..50d3c3336 100644
--- a/src/typings/message.ts
+++ b/src/typings/message.ts
@@ -10,27 +10,25 @@ export type MessageConfig = {
Backend - From other pages to background script
\* ------------------------------------------------ */
+ /** Open url in new tab or update existing tab */
OPEN_URL: {
payload: {
url: string
/** use browser.runtime.getURL? */
self?: boolean
}
- response: void
}
+ /** Open the source page of a dictionary */
OPEN_DICT_SRC_PAGE: {
- /** Open the source page of a dictionary */
payload: {
id: DictID
text: string
}
- response: void
}
+ /** Request backend for page info */
PAGE_INFO: {
- /** Request backend for page info */
- payload?: undefined
response: {
pageId: string | number
faviconURL?: string
@@ -39,8 +37,8 @@ export type MessageConfig = {
}
}
+ /** Request backend to fetch suggest */
GET_SUGGESTS: {
- /** Request backend to fetch suggest */
/** Search text */
payload: string
/** Response with suggest items */
@@ -54,7 +52,7 @@ export type MessageConfig = {
payload: {
id: DictID
text: string
- /** search function payload */
+ /** engine search function payload */
payload: {
isPDF: boolean
[index: string]: any
@@ -67,8 +65,8 @@ export type MessageConfig = {
}
}
+ /** call any method exported from the engine */
DICT_ENGINE_METHOD: {
- /** call any method exported from the engine */
payload: {
id: DictID
method: string
@@ -81,19 +79,18 @@ export type MessageConfig = {
Backend IndexedDB: Notebook or History
\* ------------------------------------------------ */
+ /** Is a word in Notebook */
IS_IN_NOTEBOOK: {
- /** Is a word in Notebook */
payload: Word
response: boolean
}
+ /** Save a word to Notebook or History */
SAVE_WORD: {
- /** Save a word to Notebook or History */
payload: {
area: DBArea
word: Word
}
- response: void
}
DELETE_WORDS: {
@@ -101,7 +98,6 @@ export type MessageConfig = {
area: DBArea
dates?: number[]
}
- response: void
}
GET_WORDS_BY_TEXT: {
@@ -109,7 +105,6 @@ export type MessageConfig = {
area: DBArea
text: string
}
- response: void
}
GET_WORDS: {
@@ -122,7 +117,6 @@ export type MessageConfig = {
sortOrder?: 'ascend' | 'descend' | false
searchText?: string
}
- response: void
}
/* ------------------------------------------------ *\
@@ -132,18 +126,15 @@ export type MessageConfig = {
PLAY_AUDIO: {
/** url: to backend */
payload: string
- response: void
}
WAVEFORM_PLAY_AUDIO: {
/** url: to waveform */
payload: string
- response: void
}
+ /** waveform to panel */
LAST_PLAY_AUDIO: {
- /** waveform to panel */
- payload?: undefined
/** url */
response?: string
}
@@ -152,8 +143,8 @@ export type MessageConfig = {
Text Selection
\* ------------------------------------------------ */
+ /** To dict panel */
SELECTION: {
- /** To dict panel */
payload: {
word: Word
mouseX: number
@@ -169,26 +160,35 @@ export type MessageConfig = {
/** force panel to skip reconciling position */
force: boolean
}
- response: void
}
/* ------------------------------------------------ *\
Dict Panel
\* ------------------------------------------------ */
+ /** From dict panel when it is pinned or unpinned */
PIN_STATE: {
- /** From dict panel when it is pinned or unpinned */
payload: boolean
- response: void
}
+ /** Other pages or frames query for panel state */
QUERY_PANEL_STATE: {
- /** Other pages or frames query for panel state */
/** object path, default returns the whole state */
payload?: string
- response: void
}
+ /* ------------------------------------------------ *\
+ Quick Search Dict Panel
+ \* ------------------------------------------------ */
+
+ /** Send new words to standalone panel */
+ QS_PANEL_SEARCH_TEXT: {
+ payload: Word
+ }
+
+ /** Open or update Quick Search Panel */
+ OPEN_QS_PANEL: {}
+
/* ------------------------------------------------ *\
Sync services
\* ------------------------------------------------ */
@@ -198,7 +198,6 @@ export type MessageConfig = {
serviceID: string
config: any
}
- response: void
}
SYNC_SERVICE_DOWNLOAD: {
@@ -206,7 +205,6 @@ export type MessageConfig = {
serviceID?: string
noCache?: boolean
}
- response: void
}
SYNC_SERVICE_ADD: {
@@ -215,7 +213,6 @@ export type MessageConfig = {
serviceID?: string
words: Word[]
}
- response: void
}
SYNC_SERVICE_DELETE: {
@@ -225,7 +222,6 @@ export type MessageConfig = {
dates?: number[]
force?: boolean
}
- response: void
}
}
@@ -234,19 +230,19 @@ export type MsgType = keyof MessageConfig
// 'extends' hack to generate union
// https://www.typescriptlang.org/docs/handbook/advanced-types.html#distributive-conditional-types
export type Message<T extends MsgType = MsgType> = T extends any
- ? MessageConfig[T]['payload'] extends undefined
- ? Readonly<{
- type: T
- payload?: MessageConfig[T]['payload']
- }>
- : Readonly<{
+ ? Readonly<
+ {
type: T
- payload: MessageConfig[T]['payload']
- }>
+ } & ('payload' extends keyof MessageConfig[T]
+ ? Pick<MessageConfig[T], Extract<'payload', keyof MessageConfig[T]>>
+ : { payload?: null })
+ >
: never
export type MessageResponse<T extends MsgType> = Readonly<
- MessageConfig[T]['response']
+ 'response' extends keyof MessageConfig[T]
+ ? MessageConfig[T][Extract<'response', keyof MessageConfig[T]>]
+ : void
>
// export enum MsgType {
@@ -261,11 +257,8 @@ export type MessageResponse<T extends MsgType> = Readonly<
// /** query background for standalone panel appearance */
// QueryQSPanel,
-// OpenQSPanel,
// CloseQSPanel,
-// QSPanelSearchText,
-
// /** Ctrl/Command has been hit 3 times */
// TripleCtrl,
@@ -454,11 +447,6 @@ export type MessageResponse<T extends MsgType> = Readonly<
// readonly type: MsgType.QueryQSPanel
// }
-// export interface MsgQSPanelSearchText {
-// readonly type: MsgType.QSPanelSearchText
-// readonly info: SelectionInfo
-// }
-
// export type MsgQueryQSPanelResponse = boolean
// export interface MsgQueryPanelState {
|
refactor
|
re-structure message channel
|
c735f1c79221ecb88b6124d4ccc070eaee897185
|
2019-12-05 14:01:51
|
crimx
|
refactor(dicts): use dotenv to load credentials
| false
|
diff --git a/.env.example b/.env.example
new file mode 100644
index 000000000..827b4f8e1
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,21 @@
+# http://api.fanyi.baidu.com/api/trans/product/prodinfo
+BAIDU_APPID=
+BAIDU_KEY=
+
+# https://fanyi.caiyunapp.com/#/api
+CAIYUN_TOKEN=
+
+# https://cloud.google.com/translate/
+GOOGLE_TOKEN=
+
+# https://deepi.sogou.com/?from=translatepc
+SOGOU_PID=
+SOGOU_KEY=
+
+# https://cloud.tencent.com/document/api/213/30654
+TENCENT_SECRETID=
+TENCENT_SECRETKEY=
+
+# http://ai.youdao.com/gw.s
+YOUDAO_APPKEY=
+YOUDAO_KEY=
diff --git a/README.md b/README.md
index a13db6ce4..53afa9119 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,25 @@ Saladict 7 is a complete rewrite with sophisticated interaction and buttery smoo
[CHANGELOG.md](./CHANGELOG.md)
-## How can I contribute / build from source?
+## build from source
+
+```bash
+git clone [email protected]:crimx/ext-saladict.git
+cd ext-saladict
+yarn install
+```
+
+add a `.env` file following the `.env.example` format.
+
+```bash
+yarn build
+```
+
+Artifacts can be found in `build/`
+
+If you want to add a dictionary, follow the [contribution guide](./CONTRIBUTING.md).
+
+## How can I contribute / ?
[CONTRIBUTING.md](./CONTRIBUTING.md)
diff --git a/src/components/dictionaries/baidu/engine.ts b/src/components/dictionaries/baidu/engine.ts
index 699b81dc1..fff49393b 100644
--- a/src/components/dictionaries/baidu/engine.ts
+++ b/src/components/dictionaries/baidu/engine.ts
@@ -10,7 +10,18 @@ import { BaiduLanguage } from './config'
let _translator: Baidu | undefined
const getTranslator = () =>
- (_translator = _translator || new Baidu({ env: 'ext' }))
+ (_translator =
+ _translator ||
+ new Baidu({
+ env: 'ext',
+ config:
+ process.env.BAIDU_APPID && process.env.BAIDU_KEY
+ ? {
+ appid: process.env.BAIDU_APPID,
+ key: process.env.BAIDU_KEY
+ }
+ : undefined
+ }))
export const getSrcPage: GetSrcPageFunction = (text, config, profile) => {
const lang =
diff --git a/src/components/dictionaries/caiyun/engine.ts b/src/components/dictionaries/caiyun/engine.ts
index 1b02c40be..e2020c450 100644
--- a/src/components/dictionaries/caiyun/engine.ts
+++ b/src/components/dictionaries/caiyun/engine.ts
@@ -11,7 +11,16 @@ import { CaiyunLanguage } from './config'
let _translator: Caiyun | undefined
const getTranslator = () =>
- (_translator = _translator || new Caiyun({ env: 'ext' }))
+ (_translator =
+ _translator ||
+ new Caiyun({
+ env: 'ext',
+ config: process.env.CAIYUN_TOKEN
+ ? {
+ token: process.env.CAIYUN_TOKEN
+ }
+ : undefined
+ }))
export const getSrcPage: GetSrcPageFunction = () => {
return 'https://fanyi.caiyunapp.com/'
diff --git a/src/components/dictionaries/google/engine.ts b/src/components/dictionaries/google/engine.ts
index a34cae2fe..e45a773b0 100644
--- a/src/components/dictionaries/google/engine.ts
+++ b/src/components/dictionaries/google/engine.ts
@@ -42,6 +42,7 @@ export const search: SearchFunction<
try {
const result = await translator.translate(text, sl, tl, {
+ token: process.env.GOOGLE_TOKEN!,
concurrent: options.concurrent,
order: options.cnfirst ? ['cn', 'com'] : ['com', 'cn'],
apiAsFallback: true
diff --git a/src/components/dictionaries/sogou/engine.ts b/src/components/dictionaries/sogou/engine.ts
index 3bb0f4723..28ff3e8fc 100644
--- a/src/components/dictionaries/sogou/engine.ts
+++ b/src/components/dictionaries/sogou/engine.ts
@@ -10,7 +10,18 @@ import { SogouLanguage } from './config'
let _translator: Sogou | undefined
const getTranslator = () =>
- (_translator = _translator || new Sogou({ env: 'ext' }))
+ (_translator =
+ _translator ||
+ new Sogou({
+ env: 'ext',
+ config:
+ process.env.SOGOU_PID && process.env.SOGOU_KEY
+ ? {
+ pid: process.env.SOGOU_PID,
+ key: process.env.SOGOU_KEY
+ }
+ : undefined
+ }))
export const getSrcPage: GetSrcPageFunction = (text, config, profile) => {
const lang =
diff --git a/src/components/dictionaries/tencent/engine.ts b/src/components/dictionaries/tencent/engine.ts
index c6eecf5b1..d50d78257 100644
--- a/src/components/dictionaries/tencent/engine.ts
+++ b/src/components/dictionaries/tencent/engine.ts
@@ -10,7 +10,18 @@ import { TencentLanguage } from './config'
let _translator: Tencent | undefined
const getTranslator = () =>
- (_translator = _translator || new Tencent({ env: 'ext' }))
+ (_translator =
+ _translator ||
+ new Tencent({
+ env: 'ext',
+ config:
+ process.env.TENCENT_SECRETID && process.env.TENCENT_SECRETKEY
+ ? {
+ secretId: process.env.TENCENT_SECRETID,
+ secretKey: process.env.TENCENT_SECRETKEY
+ }
+ : undefined
+ }))
export const getSrcPage: GetSrcPageFunction = (text, config, profile) => {
const lang =
diff --git a/src/components/dictionaries/youdaotrans/engine.ts b/src/components/dictionaries/youdaotrans/engine.ts
index 57f0bfc53..38d6f1f9c 100644
--- a/src/components/dictionaries/youdaotrans/engine.ts
+++ b/src/components/dictionaries/youdaotrans/engine.ts
@@ -10,7 +10,18 @@ import { YoudaotransLanguage } from './config'
let _translator: Youdao | undefined
const getTranslator = () =>
- (_translator = _translator || new Youdao({ env: 'ext' }))
+ (_translator =
+ _translator ||
+ new Youdao({
+ env: 'ext',
+ config:
+ process.env.YOUDAO_APPKEY && process.env.YOUDAO_KEY
+ ? {
+ appKey: process.env.YOUDAO_APPKEY,
+ key: process.env.YOUDAO_KEY
+ }
+ : undefined
+ }))
export const getSrcPage: GetSrcPageFunction = (text, config, profile) => {
return `http://fanyi.youdao.com`
|
refactor
|
use dotenv to load credentials
|
cce7997ceecd5b6a31aad1335c677ae7ccc85461
|
2018-05-12 16:48:17
|
CRIMX
|
refactor(config): make COBUILD public
| false
|
diff --git a/src/app-config.ts b/src/app-config.ts
index 751d354ec..7d7912cd8 100644
--- a/src/app-config.ts
+++ b/src/app-config.ts
@@ -36,7 +36,6 @@ const allDicts = {
},
cobuild: {
page: 'https://www.collinsdictionary.com/dictionary/%s',
- secret: true,
defaultUnfold: true,
preferredHeight: 300,
selectionLang: {
@@ -362,7 +361,7 @@ export function appConfigFactory (): AppConfig {
active: true,
- noTypeField: false,
+ noTypeField: true,
animation: true,
|
refactor
|
make COBUILD public
|
724b115068d828141ab43a928f95d39e2c92b3ee
|
2018-07-08 19:31:47
|
CRIMX
|
chore(release): 6.5.0
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bcdfd188..f1717e5d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,30 @@
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.5.0"></a>
+# [6.5.0](https://github.com/crimx/ext-saladict/compare/v6.4.1...v6.5.0) (2018-07-08)
+
+
+### Bug Fixes
+
+* **options:** missing files breaks CI build ([ae35a49](https://github.com/crimx/ext-saladict/commit/ae35a49))
+* update ci ([ba3108e](https://github.com/crimx/ext-saladict/commit/ba3108e))
+* update ci ([97e5201](https://github.com/crimx/ext-saladict/commit/97e5201))
+* update ci ([7dd28a8](https://github.com/crimx/ext-saladict/commit/7dd28a8))
+* **popup:** fix preloading selection on popup page ([5912183](https://github.com/crimx/ext-saladict/commit/5912183))
+
+
+### Features
+
+* **$browser:** longman dictionary's exmaples add speaker ([8601078](https://github.com/crimx/ext-saladict/commit/8601078))
+* **$browser:** longman max level is 3 ([c9a4a80](https://github.com/crimx/ext-saladict/commit/c9a4a80))
+* **context:** add context menus saladict search [#152](https://github.com/crimx/ext-saladict/issues/152) ([6125ca8](https://github.com/crimx/ext-saladict/commit/6125ca8))
+* **dicts:** add google dict ([355740c](https://github.com/crimx/ext-saladict/commit/355740c)), closes [#145](https://github.com/crimx/ext-saladict/issues/145)
+* **options:** add balck-white list [#155](https://github.com/crimx/ext-saladict/issues/155) ([a2c8d13](https://github.com/crimx/ext-saladict/commit/a2c8d13))
+* **selection:** support Monaco editor ([edd0012](https://github.com/crimx/ext-saladict/commit/edd0012))
+
+
+
<a name="6.4.1"></a>
## [6.4.1](https://github.com/crimx/ext-saladict/compare/v6.4.0...v6.4.1) (2018-06-28)
diff --git a/package.json b/package.json
index 24205fec7..79b907042 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.4.1",
+ "version": "6.5.0",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.5.0
|
38f068c8c3dde420f7528bc34ab98aaa1d7618fe
|
2019-05-24 11:39:20
|
CRIMX
|
refactor(dicts): add ru entry
| false
|
diff --git a/src/app-config/dicts.ts b/src/app-config/dicts.ts
index c1009ba0f..5dda7e44e 100644
--- a/src/app-config/dicts.ts
+++ b/src/app-config/dicts.ts
@@ -70,10 +70,10 @@ export function getALlDicts () {
options: {
/** Keep linebreaks on PDF */
pdfNewline: false,
- tl: 'default' as 'default' | 'zh' | 'cht' | 'en' | 'jp' | 'kor' | 'fra' | 'de' | 'spa',
+ tl: 'default' as 'default' | 'zh' | 'cht' | 'en' | 'jp' | 'kor' | 'fra' | 'de' | 'spa' | 'ru',
},
options_sel: {
- tl: ['default', 'zh', 'cht', 'en', 'jp', 'kor', 'fra', 'de', 'spa'],
+ tl: ['default', 'zh', 'cht', 'en', 'jp', 'kor', 'fra', 'de', 'spa', 'ru'],
},
},
bing: {
@@ -334,10 +334,10 @@ export function getALlDicts () {
/** Keep linebreaks on PDF */
pdfNewline: false,
cnfirst: true,
- tl: 'default' as 'default' | 'zh-CN' | 'zh-TW' | 'en' | 'ja' | 'ko' | 'fr' | 'de' | 'es',
+ tl: 'default' as 'default' | 'zh-CN' | 'zh-TW' | 'en' | 'ja' | 'ko' | 'fr' | 'de' | 'es' | 'ru',
},
options_sel: {
- tl: ['default', 'zh-CN', 'zh-TW', 'en', 'ja', 'ko', 'fr', 'de', 'es'],
+ tl: ['default', 'zh-CN', 'zh-TW', 'en', 'ja', 'ko', 'fr', 'de', 'es', 'ru'],
},
},
googledict: {
@@ -697,10 +697,10 @@ export function getALlDicts () {
options: {
/** Keep linebreaks on PDF */
pdfNewline: false,
- tl: 'default' as 'default' | 'zh-CHS' | 'zh-CHT' | 'en' | 'ja' | 'ko' | 'fr' | 'de' | 'es',
+ tl: 'default' as 'default' | 'zh-CHS' | 'zh-CHT' | 'en' | 'ja' | 'ko' | 'fr' | 'de' | 'es' | 'ru',
},
options_sel: {
- tl: ['default', 'zh-CHS', 'zh-CHT', 'en', 'ja', 'ko', 'fr', 'de', 'es'],
+ tl: ['default', 'zh-CHS', 'zh-CHT', 'en', 'ja', 'ko', 'fr', 'de', 'es', 'ru'],
},
},
urban: {
diff --git a/src/components/dictionaries/baidu/_locales.json b/src/components/dictionaries/baidu/_locales.json
index 9d9cc7bef..cf09366a5 100644
--- a/src/components/dictionaries/baidu/_locales.json
+++ b/src/components/dictionaries/baidu/_locales.json
@@ -59,6 +59,11 @@
"en": "Spanish",
"zh_CN": "西班牙文",
"zh_TW": "西班牙文"
+ },
+ "tl-ru": {
+ "en": "Russian",
+ "zh_CN": "俄语",
+ "zh_TW": "俄語"
}
}
}
diff --git a/src/components/dictionaries/google/_locales.json b/src/components/dictionaries/google/_locales.json
index 4dd4142cd..7f6744414 100644
--- a/src/components/dictionaries/google/_locales.json
+++ b/src/components/dictionaries/google/_locales.json
@@ -64,6 +64,11 @@
"en": "Spanish",
"zh_CN": "西班牙文",
"zh_TW": "西班牙文"
+ },
+ "tl-ru": {
+ "en": "Russian",
+ "zh_CN": "俄语",
+ "zh_TW": "俄語"
}
}
}
diff --git a/src/components/dictionaries/sogou/_locales.json b/src/components/dictionaries/sogou/_locales.json
index 319a8ac6c..87216429a 100644
--- a/src/components/dictionaries/sogou/_locales.json
+++ b/src/components/dictionaries/sogou/_locales.json
@@ -59,6 +59,11 @@
"en": "Spanish",
"zh_CN": "西班牙文",
"zh_TW": "西班牙文"
+ },
+ "tl-ru": {
+ "en": "Russian",
+ "zh_CN": "俄语",
+ "zh_TW": "俄語"
}
}
}
|
refactor
|
add ru entry
|
a5ab18aa40feaccbffb8ce070a867b8014048898
|
2019-12-10 13:48:55
|
crimx
|
chore: ignore watching build
| false
|
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ef901ce4c..d452e160e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,5 +4,11 @@
"fileMatch": ["src/components/dictionaries/**/_locales.json"],
"url": ".vscode/locales.schema.json"
}
- ]
+ ],
+ "files.watcherExclude": {
+ "**/.git/objects/**": true,
+ "**/.git/subtree-cache/**": true,
+ "**/node_modules/*/**": true,
+ "**/build/*/**": true
+ }
}
|
chore
|
ignore watching build
|
e3549b5237e780ac77b95a81418f796ac68e9774
|
2018-05-12 20:44:16
|
CRIMX
|
build(webpack): fix vue working with ts
| false
|
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index bb7a9dfec..3d2e5a6c7 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -159,6 +159,9 @@ module.exports = {
},
{
loader: require.resolve('ts-loader'),
+ options: {
+ appendTsSuffixTo: [/\.vue$/],
+ }
}
],
},
|
build
|
fix vue working with ts
|
0ee83331699d2fae8a27ddbbed44978bf69d811a
|
2019-12-28 21:05:04
|
crimx
|
refactor(content): move context to top
| false
|
diff --git a/src/content/components/WordEditor/Notes.tsx b/src/content/components/WordEditor/Notes.tsx
index 09755ac06..88f65a031 100644
--- a/src/content/components/WordEditor/Notes.tsx
+++ b/src/content/components/WordEditor/Notes.tsx
@@ -184,6 +184,15 @@ export const Notes: FC<NotesProps> = props => {
onChange={formChanged}
onKeyDown={stopPropagation}
/>
+ <label htmlFor="wordEditorNote_Context">{t('note.context')}</label>
+ <textarea
+ rows={3}
+ name="context"
+ id="wordEditorNote_Context"
+ value={word.context}
+ onChange={formChanged}
+ onKeyDown={stopPropagation}
+ />
<div className="wordEditorNote_LabelWithBtn">
<label htmlFor="wordEditorNote_Trans">
{t('note.trans')}
@@ -217,15 +226,6 @@ export const Notes: FC<NotesProps> = props => {
onChange={formChanged}
onKeyDown={stopPropagation}
/>
- <label htmlFor="wordEditorNote_Context">{t('note.context')}</label>
- <textarea
- rows={5}
- name="context"
- id="wordEditorNote_Context"
- value={word.context}
- onChange={formChanged}
- onKeyDown={stopPropagation}
- />
<label htmlFor="wordEditorNote_SrcTitle">{t('note.srcTitle')}</label>
<input
type="text"
|
refactor
|
move context to top
|
3b6d1a87e04cec5f5158f7de8b8fb2172a3b95ca
|
2019-03-04 11:40:45
|
CRIMX
|
fix(dicts): omit cookies
| false
|
diff --git a/src/components/dictionaries/googledict/_style.scss b/src/components/dictionaries/googledict/_style.scss
index 47dbc53e5..622881fad 100644
--- a/src/components/dictionaries/googledict/_style.scss
+++ b/src/components/dictionaries/googledict/_style.scss
@@ -948,7 +948,10 @@
margin-bottom: 5px;
}
- .ellip, .D8IBCf {
+ .xLmoFb,
+ .PUDfGe,
+ .ellip,
+ .D8IBCf {
display: none !important;
}
}
diff --git a/src/components/dictionaries/googledict/engine.ts b/src/components/dictionaries/googledict/engine.ts
index 753a9520b..f35413120 100644
--- a/src/components/dictionaries/googledict/engine.ts
+++ b/src/components/dictionaries/googledict/engine.ts
@@ -27,7 +27,10 @@ export const search: SearchFunction<GoogleDictSearchResult> = (
text, config, profile, payload
) => {
const isen = profile.dicts.all.googledict.options.enresult ? 'hl=en&gl=en&' : ''
- return fetch(`https://www.google.com/search?${isen}q=define+` + encodeURIComponent(text.replace(/\s+/g, '+')))
+ return fetch(
+ `https://www.google.com/search?${isen}q=define+` + encodeURIComponent(text.replace(/\s+/g, '+')),
+ { credentials: 'omit' }
+ )
.then(r => r.ok ? r.text() : handleNetWorkError())
.then(handleDOM)
}
|
fix
|
omit cookies
|
9ff0813568da22d4fd430e2e8d0ed697fdfb264f
|
2020-07-07 14:27:21
|
crimx
|
style(options): wording
| false
|
diff --git a/src/_locales/en/options.ts b/src/_locales/en/options.ts
index 9a5ab5f2f..1613eddbc 100644
--- a/src/_locales/en/options.ts
+++ b/src/_locales/en/options.ts
@@ -43,7 +43,7 @@ export const locale: typeof _locale = {
'When turned off, new words will be added to notebook directly.',
searchHistory: 'Keep search history',
searchHistory_help:
- 'Search histry might unintentionally reveal your browsing history.',
+ 'Your browsing history could be unintentionally revealed in Search history.',
searchHistoryInco: 'Also in incognito mode',
ctxTrans: 'Context Translate Engines',
ctxTrans_help:
@@ -402,7 +402,7 @@ export const locale: typeof _locale = {
third_party_privacy: 'Third Party Privacy',
third_party_privacy_help:
- 'Saladict will not collect further information but search text and releated cookies will be sent to third party dictionary services(just like how you would search on their websites). If you do not want third party services to collect you data, remove the dictionaries at "Dictionaries" settings.',
+ 'Saladict will not collect further information but search text and releated cookies will be sent to third party dictionary services(just like how you would search on their websites). If you do not want third party services to collect you data, remove the corresponding dictionaries at "Dictionaries" settings.',
third_party_privacy_extra:
'Cannot be turned off as it is the core functionality of Saladict.'
}
|
style
|
wording
|
35bf4473532eeb15cf6a2eb06a8ada29252cb944
|
2019-03-04 18:47:52
|
CRIMX
|
test(dicts): update COBUILD test
| false
|
diff --git a/test/specs/components/dictionaries/cobuild/engine.spec.ts b/test/specs/components/dictionaries/cobuild/engine.spec.ts
index 26326261a..fec727fef 100644
--- a/test/specs/components/dictionaries/cobuild/engine.spec.ts
+++ b/test/specs/components/dictionaries/cobuild/engine.spec.ts
@@ -18,22 +18,10 @@ describe('Dict/COBUILD/engine', () => {
it('should parse result correctly', () => {
const profile = getDefaultProfile() as ProfileMutable
- profile.dicts.all.cobuild.options = {
- sentence: 4
- }
return retry(() =>
search('love', getDefaultConfig(), profile, { isPDF: false })
.then(searchResult => {
- expect(searchResult.audio).toHaveProperty('us', expect.stringContaining('mp3'))
- expect(searchResult.audio).toHaveProperty('uk', expect.stringContaining('mp3'))
-
- const result = searchResult.result
- expect(typeof result.title).toBe('string')
- expect(typeof result.level).toBe('string')
- // rating has been removed
- // expect(typeof result.star).toBe('number')
- expect(result.defs).toHaveLength(4)
- expect(result.prons).toHaveLength(2)
+ expect(searchResult.result).toBeTruthy()
})
)
})
|
test
|
update COBUILD test
|
18520c9643418364ad46167eae6244ad59164075
|
2019-09-28 16:12:26
|
crimx
|
refactor(waveform): disable playing default audio on load
| false
|
diff --git a/src/components/Waveform/Waveform.tsx b/src/components/Waveform/Waveform.tsx
index 3c19408fa..cddd6ad05 100644
--- a/src/components/Waveform/Waveform.tsx
+++ b/src/components/Waveform/Waveform.tsx
@@ -36,6 +36,8 @@ export class Waveform extends React.PureComponent<
soundTouchNode: AnyObject | null | undefined
/** Sync Wavesurfer & SoundTouch position */
shouldSTSync: boolean = false
+ /** play when file is loaded */
+ playOnLoad = true
src?: string
state: WaveformState = {
@@ -106,11 +108,19 @@ export class Waveform extends React.PureComponent<
this.shouldSTSync = true
})
- wavesurfer.on('ready', this.play)
+ wavesurfer.on('ready', this.onLoad)
wavesurfer.on('finish', this.onPlayEnd)
}
+ onLoad = () => {
+ if (this.playOnLoad) {
+ this.play()
+ }
+ // reset state
+ this.playOnLoad = true
+ }
+
play = () => {
this.setState({ isPlaying: true })
if (this.wavesurfer) {
@@ -240,7 +250,7 @@ export class Waveform extends React.PureComponent<
this.shouldSTSync = false
}
- load = (src: string, playOnLoad = true) => {
+ load = (src: string) => {
if (src) {
if (this.wavesurfer) {
this.reset()
@@ -251,7 +261,10 @@ export class Waveform extends React.PureComponent<
if (this.wavesurfer) {
this.wavesurfer.load(src)
// https://github.com/katspaugh/wavesurfer.js/issues/1657
- if (this.wavesurfer.backend.ac.state === 'suspended' && playOnLoad) {
+ if (
+ this.wavesurfer.backend.ac.state === 'suspended' &&
+ this.playOnLoad
+ ) {
// fallback
new Audio(src).play()
}
@@ -276,10 +289,10 @@ export class Waveform extends React.PureComponent<
) {
this.load(response.src)
} else {
+ this.playOnLoad = false
this.load(
// Nothing to play
- `https://fanyi.sogou.com/reventondc/synthesis?text=Nothing%20to%20play&speed=1&lang=en&from=translateweb`,
- false
+ `https://fanyi.sogou.com/reventondc/synthesis?text=Nothing%20to%20play&speed=1&lang=en&from=translateweb`
)
}
})
|
refactor
|
disable playing default audio on load
|
f19639e39e117e617605c2016b925efa47a8876a
|
2019-08-08 20:26:06
|
crimx
|
chore(release): 6.33.3
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26505428b..6305f5a2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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.33.3"></a>
+## 6.33.3 (2019-08-08)
+
+
+### Bug Fixes
+
+* **manifest:** remvoe update url ([f83a485](https://github.com/crimx/ext-saladict/commit/f83a485))
+
+
+
<a name="6.33.2"></a>
## [6.33.2](https://github.com/crimx/ext-saladict/compare/v6.33.1...v6.33.2) (2019-06-27)
diff --git a/package.json b/package.json
index b4c039ae2..e36473557 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.33.2",
+ "version": "6.33.3",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.33.3
|
b36deb68df02254da2577cad4b9eb65722e5155a
|
2020-07-12 13:25:09
|
crimx
|
fix(panel): fix machine source text fade color
| false
|
diff --git a/src/components/MachineTrans/MachineTrans.scss b/src/components/MachineTrans/MachineTrans.scss
index 42ef4af7c..99bad3603 100644
--- a/src/components/MachineTrans/MachineTrans.scss
+++ b/src/components/MachineTrans/MachineTrans.scss
@@ -33,7 +33,7 @@
right: 0;
bottom: 0;
margin: auto;
- background: linear-gradient(90deg, rgba(255,255,255,0) 50%, #fff 90%);
+ background: linear-gradient(90deg, rgba(255,255,255,0) 50%, var(--color-background) 90%);
pointer-events: none;
}
@@ -68,7 +68,7 @@
.MachineTrans-Lines-collapse {
&::after {
- background: linear-gradient(270deg, rgba(255,255,255,0) 50%, #fff 90%);
+ background: linear-gradient(270deg, rgba(255,255,255,0) 50%, var(--color-background) 90%);
}
}
}
|
fix
|
fix machine source text fade color
|
a9f6f34e83f336a54a67eba4f3c29b15b592a2b7
|
2021-07-03 10:55:05
|
crimx
|
refactor(googledict): fix g-img height
| false
|
diff --git a/src/components/dictionaries/googledict/_style.shadow.scss b/src/components/dictionaries/googledict/_style.shadow.scss
index 1ea28322..8ac9f300 100644
--- a/src/components/dictionaries/googledict/_style.shadow.scss
+++ b/src/components/dictionaries/googledict/_style.shadow.scss
@@ -90,3 +90,7 @@ img {
.jEdCLc, .D1MTm {
color: var(--color-font-grey) !important;
}
+
+.g-img {
+ height: unset !important;
+}
|
refactor
|
fix g-img height
|
d58726fcbe45b567721f9e38343d1e9d5f7c4451
|
2020-05-30 00:09:55
|
crimx
|
refactor(dicts): add default tts to tencent
| false
|
diff --git a/src/components/dictionaries/tencent/engine.ts b/src/components/dictionaries/tencent/engine.ts
index 56c9a043c..7ad414c4e 100644
--- a/src/components/dictionaries/tencent/engine.ts
+++ b/src/components/dictionaries/tencent/engine.ts
@@ -8,6 +8,7 @@ import {
import memoizeOne from 'memoize-one'
import { Tencent } from '@opentranslate/tencent'
import { TencentLanguage } from './config'
+import { getTranslator as getBaiduTranslator } from '../baidu/engine'
export const getTranslator = memoizeOne(
() =>
@@ -59,6 +60,22 @@ export const search: SearchFunction<
try {
const result = await translator.translate(text, sl, tl, translatorConfig)
+ if (!result.origin.tts || !result.trans.tts) {
+ const baidu = getBaiduTranslator()
+ if (!result.origin.tts) {
+ result.origin.tts = await baidu.textToSpeech(
+ result.origin.paragraphs.join('\n'),
+ result.from
+ )
+ }
+ if (!result.trans.tts) {
+ result.trans.tts = await baidu.textToSpeech(
+ result.trans.paragraphs.join('\n'),
+ result.to
+ )
+ }
+ }
+
return {
result: {
id: 'tencent',
|
refactor
|
add default tts to tencent
|
aeb73a9585e0448b39452df415b75e832b8db1ca
|
2018-01-15 01:43:19
|
greenkeeper[bot]
|
chore(package): update dependencies
| false
|
diff --git a/package.json b/package.json
index 9c0e90a65..a6bb69349 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
"url": "https://github.com/crimx/create-react-typescript-sass-webextension/issues"
},
"dependencies": {
- "@types/node": "^4.0.35",
+ "@types/node": "^9.3.0",
"@types/react": "^16.0.34",
"@types/react-dom": "^16.0.3",
"bootstrap-sass": "^3.3.7",
@@ -43,38 +43,38 @@
},
"devDependencies": {
"@types/jest": "^22.0.1",
- "autoprefixer": "7.1.6",
+ "autoprefixer": "7.2.5",
"babel-core": "6.26.0",
- "babel-jest": "20.0.3",
+ "babel-jest": "22.0.6",
"babel-loader": "7.1.2",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-env": "^1.6.1",
"babel-preset-react": "^6.24.1",
"babel-runtime": "6.26.0",
"case-sensitive-paths-webpack-plugin": "2.1.1",
- "chalk": "1.1.3",
+ "chalk": "2.3.0",
"copy-webpack-plugin": "^4.3.1",
- "css-loader": "0.28.7",
+ "css-loader": "0.28.8",
"dotenv": "4.0.0",
"extract-text-webpack-plugin": "3.0.2",
- "file-loader": "1.1.5",
- "fork-ts-checker-webpack-plugin": "^0.2.10",
+ "file-loader": "1.1.6",
+ "fork-ts-checker-webpack-plugin": "^0.3.0",
"fs-extra": "^5.0.0",
"generate-json-webpack-plugin": "^0.2.2",
- "html-webpack-plugin": "2.29.0",
+ "html-webpack-plugin": "2.30.1",
"jest": "^22.0.4",
"jest-webextension-mock": "^3.1.0",
"lodash": "^4.17.4",
"minimist": "^1.2.0",
"node-sass": "^4.7.2",
"postcss-flexbugs-fixes": "3.2.0",
- "postcss-loader": "2.0.8",
+ "postcss-loader": "2.0.10",
"postcss-safe-important": "^1.1.0",
"raf": "3.4.0",
"react-dev-utils": "^4.2.1",
"sass-loader": "^6.0.6",
"semver": "^5.4.1",
- "style-loader": "0.19.0",
+ "style-loader": "0.19.1",
"text-transform-loader": "^2.0.0",
"ts-jest": "^22.0.0",
"ts-lint": "^4.5.1",
@@ -88,8 +88,8 @@
"vue-loader": "^13.6.2",
"vue-style-loader": "^3.0.3",
"vue-template-compiler": "^2.5.13",
- "webpack": "3.8.1",
- "webpack-dev-server": "2.9.4"
+ "webpack": "3.10.0",
+ "webpack-dev-server": "2.11.0"
},
"jest": {
"mapCoverage": true,
|
chore
|
update dependencies
|
d5ad78c13972438451df68a7ff158f8c58077958
|
2021-05-29 19:18:49
|
crimx
|
chore: create FUNDING.md
| false
|
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..795e7f2d
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: saladict
+open_collective: # Replace with a single Open Collective username
+ko_fi: saladict
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://afdian.net/@crimx']
|
chore
|
create FUNDING.md
|
fc4d26ef213ec63e0fd6154f16517c57a62619cd
|
2018-09-04 21:33:45
|
CRIMX
|
refactor(helpers): fix typings
| false
|
diff --git a/src/_helpers/config-manager.ts b/src/_helpers/config-manager.ts
index b40ed6615..71cc491d4 100644
--- a/src/_helpers/config-manager.ts
+++ b/src/_helpers/config-manager.ts
@@ -17,7 +17,6 @@ import { concat } from 'rxjs/observable/concat'
import { map } from 'rxjs/operators/map'
import { fromEventPattern } from 'rxjs/observable/fromEventPattern'
import { mergeConfig } from '@/app-config/merge-config'
-import { isGeneratedKey } from '@/_helpers/uniqueKey'
export interface StorageChanged<T> {
newValue: T,
|
refactor
|
fix typings
|
f48940ad30d63e9646a28cc786bc69981f4a9f52
|
2019-09-29 16:01:27
|
crimx
|
fix(panel): correct standalone css variables
| false
|
diff --git a/src/content/components/DictPanel/DictPanelStandalone.tsx b/src/content/components/DictPanel/DictPanelStandalone.tsx
index ee95c8cf5..99a2e5174 100644
--- a/src/content/components/DictPanel/DictPanelStandalone.tsx
+++ b/src/content/components/DictPanel/DictPanelStandalone.tsx
@@ -2,8 +2,8 @@ import React, { FC, ReactNode } from 'react'
import { SALADICT_PANEL } from '@/_helpers/saladict'
export interface DictPanelStandaloneProps {
- width: number | string
- height: number | string
+ width: string
+ height: string
withAnimation: boolean
darkMode: boolean
@@ -26,8 +26,8 @@ export const DictPanelStandalone: FC<DictPanelStandaloneProps> = props => {
...props.colors,
width: props.width,
height: props.height,
- '--panel-width': props.width + 'px',
- '--panel-max-height': props.height + 'px'
+ '--panel-width': props.width,
+ '--panel-max-height': props.height
}}
>
<div className="dictPanel-Head">{props.menuBar}</div>
diff --git a/src/popup/Popup.tsx b/src/popup/Popup.tsx
index a42376c6a..327c1d046 100644
--- a/src/popup/Popup.tsx
+++ b/src/popup/Popup.tsx
@@ -68,7 +68,10 @@ export const Popup: FC<PopupProps> = props => {
return (
<div className={`popup-root${config.darkMode ? ' dark-mode' : ''}`}>
- <DictPanelStandaloneContainer width={450} height={dictPanelHeight} />
+ <DictPanelStandaloneContainer
+ width="450px"
+ height={dictPanelHeight + 'px'}
+ />
<div
className="switch-container"
onMouseEnter={shrinkDictPanel}
diff --git a/src/quick-search/index.tsx b/src/quick-search/index.tsx
index 2ab970d3d..56c9d45fe 100644
--- a/src/quick-search/index.tsx
+++ b/src/quick-search/index.tsx
@@ -17,7 +17,7 @@ import './quick-search.scss'
ReactDOM.render(
<ProviderRedux store={createStore()}>
<ProviderI18next i18n={i18nLoader()}>
- <DictPanelStandaloneContainer width="100%" height="100%" />
+ <DictPanelStandaloneContainer width="100vw" height="100vh" />
</ProviderI18next>
</ProviderRedux>,
document.getElementById('root')
|
fix
|
correct standalone css variables
|
9f0f42e458d5b4d9b227b8efa71fa85dce01e16e
|
2018-11-01 13:36:57
|
CRIMX
|
fix(wordpage): reset selected rows on full fetch
| false
|
diff --git a/src/components/WordPage/App.tsx b/src/components/WordPage/App.tsx
index ccba2286d..1da654f92 100644
--- a/src/components/WordPage/App.tsx
+++ b/src/components/WordPage/App.tsx
@@ -185,7 +185,8 @@ export class WordPageMain extends React.Component<WordPageMainInnerProps, WordPa
pagination: {
...this.state.pagination,
total,
- }
+ },
+ selectedRows: [],
}))
}
|
fix
|
reset selected rows on full fetch
|
0c650f121e9d9bdb117ff6fb18c3840a16458b46
|
2018-01-31 14:49:48
|
CRIMX
|
build(package): add rxjs and lodash plugins
| false
|
diff --git a/.babelrc b/.babelrc
index adb9ec8e8..c5e1e5fc7 100644
--- a/.babelrc
+++ b/.babelrc
@@ -42,6 +42,7 @@
"react"
],
"plugins": [
+ "lodash",
["transform-object-rest-spread", { "useBuiltIns": true }]
]
}
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index a99ea0152..d7ad98488 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -13,6 +13,7 @@ const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
const paths = require('./paths')
const getClientEnvironment = require('./env')
const argv = require('minimist')(process.argv.slice(2))
+const rxPaths = require('rxjs/_esm2015/path-mapping')
// Webpack uses `publicPath` to determine where the app is being served from.
// It requires a trailing slash, or the file assets will get an incorrect path.
@@ -110,6 +111,7 @@ module.exports = {
// For the origin vue project
'src': path.resolve(__dirname, '../src'),
'vue$': 'vue/dist/vue.runtime.esm.js',
+ ...rxPaths(),
},
plugins: [
// Prevents users from importing files from outside of src/ (or node_modules/).
@@ -145,7 +147,17 @@ module.exports = {
{
test: /\.tsx?$/,
include: paths.appSrc,
- loader: require.resolve('ts-loader'),
+ use: [
+ {
+ loader: require.resolve('babel-loader'),
+ options: {
+ compact: true,
+ },
+ },
+ {
+ loader: require.resolve('ts-loader'),
+ }
+ ],
},
// Process JS with Babel.
{
@@ -241,6 +253,10 @@ module.exports = {
// It is absolutely essential that NODE_ENV was set to production here.
// Otherwise React will be compiled in the very slow development mode.
new webpack.DefinePlugin(env.stringified),
+ // RxJs https://github.com/ReactiveX/rxjs/blob/master/doc/pipeable-operators.md
+ argv.devbuild
+ ? null
+ : new webpack.optimize.ModuleConcatenationPlugin(),
// Minify the code.
argv.devbuild
? null
diff --git a/package.json b/package.json
index e23f30716..0c01bf9fe 100644
--- a/package.json
+++ b/package.json
@@ -32,12 +32,14 @@
}
},
"dependencies": {
+ "@types/lodash": "^4.14.98",
"@types/node": "^9.3.0",
"@types/react": "^16.0.34",
"@types/react-dom": "^16.0.3",
"bootstrap-sass": "^3.3.7",
"highcharts": "^6.0.4",
"html2canvas": "^1.0.0-alpha.9",
+ "lodash": "^4.17.4",
"moment": "^2.20.1",
"normalize.css": "^7.0.0",
"react": "^16.2.0",
@@ -60,6 +62,7 @@
"babel-core": "6.26.0",
"babel-jest": "22.1.0",
"babel-loader": "7.1.2",
+ "babel-plugin-lodash": "^3.3.2",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-env": "^1.6.1",
"babel-preset-react": "^6.24.1",
@@ -80,7 +83,6 @@
"husky": "^0.14.3",
"jest": "^22.0.6",
"jest-fetch-mock": "^1.4.0",
- "lodash": "^4.17.4",
"minimist": "^1.2.0",
"node-sass": "^4.7.2",
"postcss-flexbugs-fixes": "3.3.0",
diff --git a/yarn.lock b/yarn.lock
index 20134add6..29efc9efe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -138,6 +138,10 @@
version "22.0.1"
resolved "https://registry.npmjs.org/@types/jest/-/jest-22.0.1.tgz#6370a6d60cce3845e4cd5d00bf65f654264685bc"
+"@types/lodash@^4.14.98":
+ version "4.14.98"
+ resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.98.tgz#aaf012ae443e657e7885e605a4c1b340db160609"
+
"@types/node@*", "@types/node@^9.3.0":
version "9.3.0"
resolved "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz#3a129cda7c4e5df2409702626892cb4b96546dd5"
@@ -613,6 +617,13 @@ babel-helper-hoist-variables@^6.24.1:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
+babel-helper-module-imports@^7.0.0-beta.3:
+ version "7.0.0-beta.3"
+ resolved "https://registry.npmjs.org/babel-helper-module-imports/-/babel-helper-module-imports-7.0.0-beta.3.tgz#e15764e3af9c8e11810c09f78f498a2bdc71585a"
+ dependencies:
+ babel-types "7.0.0-beta.3"
+ lodash "^4.2.0"
+
babel-helper-optimise-call-expression@^6.24.1:
version "6.24.1"
resolved "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
@@ -695,6 +706,16 @@ babel-plugin-jest-hoist@^22.1.0:
version "22.1.0"
resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.1.0.tgz#c1281dd7887d77a1711dc760468c3b8285dde9ee"
+babel-plugin-lodash@^3.3.2:
+ version "3.3.2"
+ resolved "https://registry.npmjs.org/babel-plugin-lodash/-/babel-plugin-lodash-3.3.2.tgz#da3a5b49ba27447f54463f6c4fa81396ccdd463f"
+ dependencies:
+ babel-helper-module-imports "^7.0.0-beta.3"
+ babel-types "^6.26.0"
+ glob "^7.1.1"
+ lodash "^4.17.4"
+ require-package-name "^2.0.1"
+
babel-plugin-syntax-async-functions@^6.8.0:
version "6.13.0"
resolved "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@@ -1068,6 +1089,14 @@ babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
invariant "^2.2.2"
lodash "^4.17.4"
[email protected]:
+ version "7.0.0-beta.3"
+ resolved "https://registry.npmjs.org/babel-types/-/babel-types-7.0.0-beta.3.tgz#cd927ca70e0ae8ab05f4aab83778cfb3e6eb20b4"
+ dependencies:
+ esutils "^2.0.2"
+ lodash "^4.2.0"
+ to-fast-properties "^2.0.0"
+
babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
version "6.26.0"
resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
@@ -4966,7 +4995,7 @@ [email protected]:
version "4.17.2"
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
[email protected], lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.3, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.4:
[email protected], lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.3, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.4:
version "4.17.4"
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
@@ -6737,6 +6766,10 @@ require-main-filename@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+require-package-name@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"
+
require-uncached@^1.0.3:
version "1.0.3"
resolved "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -7657,6 +7690,10 @@ to-fast-properties@^1.0.3:
version "1.0.3"
resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+to-fast-properties@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+
to-object-path@^0.3.0:
version "0.3.0"
resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
|
build
|
add rxjs and lodash plugins
|
a5dc2065bf370bacc1eda778eba8c57d20aefccd
|
2019-08-05 20:10:50
|
crimx
|
refactor(dicts): weblioejje
| false
|
diff --git a/src/components/dictionaries/weblioejje/View.tsx b/src/components/dictionaries/weblioejje/View.tsx
index 4ff705f85..7c2db82c3 100644
--- a/src/components/dictionaries/weblioejje/View.tsx
+++ b/src/components/dictionaries/weblioejje/View.tsx
@@ -1,28 +1,25 @@
-import React from 'react'
+import React, { FC } from 'react'
import { WeblioejjeResult } from './engine'
import EntryBox from '@/components/EntryBox'
import { ViewPorps } from '@/components/dictionaries/helpers'
-import { withStaticSpeaker } from '@/components/withStaticSpeaker'
+import { StaticSpeakerContainer } from '@/components/Speaker'
-export class DictWeblioejje extends React.PureComponent<ViewPorps<WeblioejjeResult>> {
- render () {
- return (
- <div className='dictWeblioejje-Entry'>
- {this.props.result.map((entry, i) => entry.title
- ? (
- <EntryBox key={entry.title + i} title={entry.title}>
- <div dangerouslySetInnerHTML={{ __html: entry.content }} />
- </EntryBox>
- )
- : <div
- key={i}
- className='dictWeblioejje-Box'
- dangerouslySetInnerHTML={{ __html: entry.content }}
- />
- )}
- </div>
- )
- }
-}
+export const DictWeblioejje: FC<ViewPorps<WeblioejjeResult>> = ({ result }) => (
+ <StaticSpeakerContainer>
+ {result.map((entry, i) =>
+ entry.title ? (
+ <EntryBox key={entry.title + i} title={entry.title}>
+ <div dangerouslySetInnerHTML={{ __html: entry.content }} />
+ </EntryBox>
+ ) : (
+ <div
+ key={i}
+ className="dictWeblioejje-Box"
+ dangerouslySetInnerHTML={{ __html: entry.content }}
+ />
+ )
+ )}
+ </StaticSpeakerContainer>
+)
-export default withStaticSpeaker(DictWeblioejje)
+export default DictWeblioejje
diff --git a/src/components/dictionaries/weblioejje/_style.scss b/src/components/dictionaries/weblioejje/_style.scss
deleted file mode 100644
index 8ed711e80..000000000
--- a/src/components/dictionaries/weblioejje/_style.scss
+++ /dev/null
@@ -1,3621 +0,0 @@
-.dictWeblioejje-Entry {
- .Liscj .liscjWC {
- font-style: italic;
- }
-
- .Jmdct .jmdctYm,.Jmdct .jmdctDm {
- margin: 4px 0 4px 0;
- }
-
- .Jmdct .jmdctGlsL {
- float: left;
- margin: 0;
- vertical-align: top;
- width: 20px;
- }
-
- .Jmdct .jmdctGlsR {
- float: left;
- margin: 0;
- vertical-align: top;
- }
-
- .Jmdct .jmdctL {
- background-color: #f0f0f0;
- border: #666 solid 1px;
- color: #363636;
- font-size: .9em;
- font-weight: normal;
- line-height: 1.0em;
- margin-right: 8px;
- padding: 1px;
- }
-
- .Jmdct table td.jmdctT {
- text-align: right;
- vertical-align: top;
- width: 70px;
- }
-
- .Jmned .jmnedYm,.Jmned .jmnedDm,.Jmned .jmnedGls {
- margin: 0;
- padding: 0;
- }
-
- .Jmned {
- border-collapse: collapse;
- }
-
- .Jmned table {
- border-collapse: collapse;
- border: 1px #696969 solid;
- width: 100%;
- }
-
- .Jmned table th {
- background-color: #f5f5f5;
- border: 1px #696969 solid;
- font-weight: bold;
- padding: 3px;
- white-space: nowrap;
- }
-
- .Jmned table td {
- border: 1px #696969 solid;
- padding: 5px;
- line-height: 1.3em;
- }
-
- .Jmned .jmnedL {
- font-weight: bold;
- }
-
- .Jmned .jmnedC {
- width: 20%;
- }
-
- .Jmned .jmnedR {
- width: 60%;
- }
-
- .Jmned .jmnedInfo {
- background-color: #f5f5f5;
- border: #b5b6b5 solid 1px;
- font-size: .9em;
- line-height: 1.62em;
- margin: 1em 0 0 0;
- padding: 10px;
- }
-
- .Stwdj .stwdjS {
- border-left: #815733 solid 6px;
- font-size: 1.3em;
- font-weight: bold;
- line-height: 1.0em;
- margin: 10px 0 5px 0;
- padding-left: 3px;
- }
-
- .Stwdj .stwdjC,.Stwdj .stwdjC a {
- line-height: 1.0em;
- }
-
- .Stwdj .stwdjHdC {
- background-color: #f0f0f0;
- border: #666 solid 1px;
- color: #363636;
- font-size: .9em;
- padding: 1px;
- }
-
- .Stwdj .stwdjYr {
- margin-top: 10px;
- padding: 5px;
- }
-
- .Stwdj .stwdjYr a {
- color: #000;
- }
-
- .Stwdj .stwdjYr a:hover {
- color: #000;
- }
-
- .Stwdj .stwdjYr a:active {
- color: #000;
- }
-
- .Stwdj .stwdjYr a:visited {
- color: #000;
- }
-
- .Stwdj .stwdjYr div {
- line-height: 1.0em;
- margin-left: 10px;
- }
-
- .Stwdj .stwdjYr sup {
- line-height: 1.0em;
- margin: 0;
- padding: 0;
- }
-
- .Stwdj .stwdjYrHd i,.Stwdj .stwdjYrHdFld i {
- margin-bottom: -2px;
- margin-right: 3px;
- }
-
- .Stwdj .stwdjYrHd:before,.Stwdj .stwdjYrHdFld:before {
- margin-right: 3px;
- }
-
- .Stwdj .stwdjYrHdFld img,.Stwdj .stwdjYrHdFld span {
- cursor: pointer;
- }
-
- .Stwdj .stwdjYrHd .stwdjHdC {
- border: #666 solid 1px;
- color: #363636;
- font-size: .9em;
- margin-left: 16px;
- padding: 1px;
- }
-
- .Stwdj .stwdjYrHdFld .stwdjHdC {
- border: #666 solid 1px;
- color: #363636;
- font-size: .9em;
- padding: 1px;
- }
-
- .Stwdj .stwdjR,.Stwdj .stwdjRF {
- background-image: url(https://weblio.hs.llnwd.net/e7/img/iconCclBlS.png);
- background-position: 2px 8px;
- background-repeat: no-repeat;
- font-family: Arial;
- font-weight: normal;
- margin: 2px 0 0 24px;
- padding: 0 0 0 14px;
- }
-
- .Stwdj .stwdjRF {
- display: none;
- }
-
- .Stwdj .stwdjBld {
- font-weight: bold;
- font-weight: bold;
- }
-
- .Stwdj .stwdjNH,.Stwdj .stwdjAH,.Stwdj .stwdjNB {
- float: left;
- margin: 0;
- padding: 0;
- vertical-align: bottom;
- }
-
- .Stwdj .stwdjNB {
- margin: .3em 0 0 0;
- padding: .1em 0 0 0;
- }
-
- .Edrnt .edrntC {
- background-color: #f0f0f0;
- border: #666 solid 1px;
- color: #363636;
- font-size: .9em;
- padding: 1px;
- }
-
- .Jjabc ruby {
- font-size: 120%;
- }
-
- .infobox.sisterproject {
- font-size: 90%;
- width: 20em;
- }
-
- td.sub_yomi {
- background-image: url(https://weblio.hs.llnwd.net/e7/img/jinmei_haikei1.png);
- background-repeat: repeat-y;
- border-color: #b5d2e2;
- border-width: 1px 1px 0 0;
- border-style: solid;
- color: #4f519b;
- font-weight: bold;
- padding: 5px 5px 5px 15px;
- width: 80px;
- }
-
- td.item_yomi {
- border-top: 1px dashed #c0c0c0;
- padding: 5px 5px 5px 10px;
- }
-
- .Dkijt .kanren {
- text-indent: .75em;
- }
-
- .Jeepm table {
- border: #000 solid 1px;
- border-collapse: collapse;
- text-align: center;
- }
-
- .Jeepm td {
- border: #000 solid 1px;
- text-align: center;
- }
-
- .Jeepm .header {
- border-left: #fff solid 1px;
- border-right: #fff solid 1px;
- border-top: #fff solid 1px;
- font-weight: bold;
- text-align: left;
- }
-
- .LiscjYr .kanren {
- font-family: Arial;
- margin: 5px 0 0 24px;
- }
-
- .Wkgje .wkgjeL {
- float: left;
- margin: 0 0 0 4px;
- padding: 0;
- width: 80px;
- }
-
- .Wkgje .wkgjeR {
- float: left;
- margin: 0 0 0 4px;
- padding: 0;
- width: 500px;
- }
-
- .Jawik .level1Block {
- display: block;
- font-size: 1.2em;
- font-weight: normal;
- margin: 2px 0 2px 10px;
- }
-
- .Jawik .level1Block b {
- font-weight: bold;
- }
-
- .Jawik .level1,.Jawik .level2,.Jawik .level1Ex {
- display: inline;
- }
-
- .Jawik .level1 b,.Jawik .level2 b,.Jawik .level2Block b {
- background-color: #eee;
- border: #999 solid 1px;
- color: #333;
- font-weight: normal;
- padding: 0 2px;
- margin: 0 5px 0 2px;
- }
-
- .Wehgj .wehgjT span,.Wehgj .wehgjE span,.Wehgj .wehgjR span {
- background-color: #f0f0f0;
- border: #666 solid 1px;
- color: #363636;
- font-size: .9em;
- line-height: 1.0em;
- padding: 1px;
- }
-
- .Wehgj .wehgjE,.Wehgj .wehgjR {
- padding: 0 0 0 16px;
- }
-
- .Jfwik .level1Block {
- display: block;
- font-size: 1.2em;
- font-weight: normal;
- margin: 2px 0 2px 10px;
- }
-
- .Jfwik .level1Block b {
- font-weight: bold;
- }
-
- .Jfwik .level1,.Jfwik .level2,.Jfwik .level1Ex {
- display: inline;
- }
-
- .Jfwik .level1 b,.Jfwik .level2 b,.Jfwik .level2Block b {
- background-color: #eee;
- border: #999 solid 1px;
- color: #333;
- font-weight: normal;
- padding: 0 2px;
- margin: 0 5px 0 2px;
- }
-
-
- .wrpCmp {
- border: #06c solid;
- border-width: 0 0 1px 0;
- height: 25px;
- margin: 15px 0 5px 0;
- }
-
- .wrpCmp p {
- border: #06c solid;
- border-width: 0 0 0 5px;
- font-size: 1.3em;
- height: 20px;
- margin: 0;
- padding: 0 0 3px 5px;
- }
-
- .wrpCmp p a {
- color: #000;
- font-weight: bolder;
- }
-
- .wrpCmpCom {
- border: #de7d29 solid;
- border-width: 0 0 1px 0;
- height: 25px;
- margin: 15px 0 5px 0;
- }
-
- .wrpCmpCom p {
- border: #de7d29 solid;
- border-width: 0 0 0 5px;
- font-size: 1.3em;
- height: 20px;
- margin: 0;
- padding: 0 0 3px 5px;
- }
-
- .wrpCmpCom p a {
- color: #000;
- font-weight: bolder;
- }
-
- .wrpEx {
- height: 25px;
- margin: 0;
- }
-
- .wrpEx p {
- color: #525152;
- font-size: 1.0em;
- height: 20px;
- margin: 0 .5em 0 0;
- padding: 3px 0 0 5px;
- }
-
- .wrpEx p a:link,.wrpEx p a:visited,.wrpEx p a:active {
- color: #525152;
- font-size: 1.0em;
- text-decoration: none;
- }
-
- .wrpEx p span {
- color: #9c9a9c;
- font-size: .7em;
- }
-
- .wrpEx p.wrpExFL {
- color: #525152;
- font-size: .8em;
- height: 20px;
- margin: 0 .5em 0 0;
- padding: 3px 0 0 5px;
- }
-
- .kijiEx {
- color: #000;
- font-size: 1.0em;
- line-height: 1.8em;
- margin-bottom: 15px;
- }
-
- .kijiEx * {
- font-size: 100%;
- line-height: 1.8em;
- }
-
- .wrpExTxt {
- margin: 0 0 -8px 0;
- }
-
- .wrpExTxt p {
- font-size: 1.0em;
- margin-right: .5em;
- padding: 0 0 0 5px;
- }
-
- .kijiWrpTxt p.adDes {
- font-size: 95%;
- }
-
- .wrpExTxt p>a {
- text-decoration: none;
- }
-
- .wrpExTxt p a:hover {
- color: #f00;
- }
-
- .wrpExTxt p a:link,.wrpExTxt p a:visited {
- color: #525152;
- }
-
- .kijiWrpTxt {
- font-size: 90%;
- margin: 0 0 15px 0;
- padding: 0;
- }
-
- .wrpAdFTxt p {
- color: #525152;
- font-size: .9em;
- line-height: 1.8em;
- margin: 14px 0 14px 6px;
- }
-
- .wrpIMCmp {
- border: #06c solid;
- border-width: 0 0 1px 0;
- height: 25px;
- margin: 5px 0 5px 0;
- }
-
- .wrpIMCmp p {
- border: #06c solid;
- border-width: 0 0 0 5px;
- font-size: 1.1em;
- font-weight: bolder;
- height: 18px;
- margin: 0;
- padding: 2px 0 5px 5px;
- }
-
- .wrpIMCmp p a {
- color: #000;
- font-size: .8em;
- font-weight: normal;
- }
-
- .wrpIMCmpCom {
- border: #de7d29 solid;
- border-width: 0 0 1px 0;
- height: 25px;
- margin: 5px 0 5px 0;
- }
-
- .wrpIMCmpCom p {
- border: #de7d29 solid;
- border-width: 0 0 0 5px;
- font-size: 1.1em;
- font-weight: bolder;
- height: 18px;
- margin: 0;
- padding: 2px 0 5px 5px;
- }
-
- .wrpIMCmpCom p a {
- color: #000;
- font-size: .8em;
- font-weight: normal;
- }
-
- #main .spoBoxHEYO {
- background-color: #feaa15;
- border: #e38e00 solid;
- border-width: 0 0 1px 0;
- color: #fff;
- font-weight: bold;
- margin: 0 4px 0 20px;
- padding: 5px 3px 5px 7px;
- text-align: left;
- }
-
- #main .spoBoxBEYO {
- border: #ccc solid;
- border-width: 0 1px 1px 1px;
- margin: 0 4px 10px 20px;
- }
-
- #main .spoBoxHEYOT {
- background-color: #9097a2;
- border: #868d99 solid;
- border-width: 0 0 1px 0;
- color: #fff;
- font-weight: bold;
- margin: 0 4px 0 0;
- padding: 5px 3px 5px 7px;
- text-align: left;
- }
-
- #main .spoBoxBEYOT {
- border: #ccc solid;
- border-width: 0 1px 1px 1px;
- margin: 0 4px 10px 0;
- }
-
- .ejjeScCnt {
- margin: 0 0 10px 0;
- width: 99%;
- _width: 100%;
- }
-
- .ejjeScCnt .chsShwcsH {
- background-color: #feaa15;
- border: #feaa15 solid 1px;
- border-bottom: #e38e00 solid 1px;
- color: #fff;
- font-size: 1em;
- font-weight: bold;
- margin: 0;
- padding: 4px 0;
- width: 100%;
- }
-
- .ejjeScCnt .chsShwcsHT {
- padding: 0 5px;
- }
-
- .ejjeScCnt .chsShwcsC {
- border: #ccc solid;
- border-width: 0 1px 1px 1px;
- margin: 0;
- padding: 2px 0 3px 0;
- width: 100%;
- }
-
- .ejjeScCnt .chsShwcsT {
- border-collapse: collapse;
- margin: 2px 0 2px 0;
- padding: 0;
- width: 100%;
- }
-
- .ejjeScCnt .chsShwcsTD {
- border-collapse: collapse;
- margin: 0;
- padding: 2px 0 2px 6px;
- _padding: 2px 0 2px 2px;
- vertical-align: top;
- width: 33%;
- }
-
- .ejjeScCnt .chsShwcsTD a {
- font-size: 1em;
- }
-
- .ejjeScCnt .chsShwcsTD a:active,.ejjeScCnt .chsShwcsTD a:link,.ejjeScCnt .chsShwcsTD a:visited {
- color: #06c;
- }
-
- .ejjeScCnt .chsShwcsTD a:hover {
- color: #d50000;
- }
-
- .ejjeScCnt .chsShwcsTD span {
- font-size: 0.85em;
- font-weight: normal;
- }
-
- .treeBoxC .adIFLeftE {
- color: #06c;
- font-size: .7em;
- text-align: right;
- }
-
- .JWAdsR .highlight {
- background-color: transparent;
- }
-
- .AdR .highlight {
- background-color: transparent;
- }
-
- .clrBc {
- clear: both;
- display: block;
- font-size: 0;
- line-height: 0;
- overflow: hidden;
- }
-
- .highlight-menu {
- background-color: #f8f9ff;
- display: none;
- top: 0;
- height: auto;
- position: absolute;
- left: 0;
- z-index: 10;
- }
-
- .highlight-menu table {
- background-color: #f6f6f6;
- border: #b5b5b5 solid 1px;
- border-collapse: separate;
- border-spacing: 4px;
- }
-
- .highlight-menu table td {
- cursor: pointer;
- height: 24px;
- margin: 0;
- text-align: center;
- padding: 0;
- width: 24px;
- }
-
- .highlight-menu img {
- width: 24px;
- }
-
- .highlight-menu #pick-del img {
- width: 22px;
- }
-
- .red {
- background-color: #fcc;
- }
-
- .highlight-menu-sub {
- position: relative;
- }
-
- .highlight-menu table.hl-tbl-hz td {
- padding-right: 5px;
- }
-
- .highlight-menu table.hl-tbl-hz td:last-child {
- padding-right: 0;
- }
-
- .highlight-dfcl .hl-pick-dfcolor-table {
- margin: 37px 0 15px;
- table-layout: fixed;
- width: 100%;
- }
-
- .highlight-dfcl .hl-pick-dfcolor-table td {
- padding: 0;
- text-align: left;
- }
-
- .highlight-dfcl .dfclsq {
- box-sizing: border-box;
- cursor: pointer;
- display: inline-block;
- height: 40px;
- line-height: 40px;
- text-align: center;
- vertical-align: middle;
- width: 40px;
- }
-
- .highlight-dfcl .dfclsq>span {
- background-color: #585858;
- display: none;
- height: 8px;
- margin-top: 16px;
- width: 8px;
- }
-
- .highlight-dfcl #dfslsq-yellow {
- background-color: #ffe467;
- }
-
- .highlight-dfcl #dfslsq-blue {
- background-color: #75baff;
- }
-
- .highlight-dfcl #dfslsq-green {
- background-color: #82d131;
- }
-
- .highlight-dfcl #dfslsq-red {
- background-color: #ffa4a4;
- }
-
- .highlight-dfcl .dfclmsg-yellow,.highlight-dfcl .dfclmsg-blue,.highlight-dfcl .dfclmsg-green,.highlight-dfcl .dfclmsg-red {
- font-size: 0.78em;
- }
-
- .highlight-dfcl .hl-pick-dfcolor-table td.dfclmsg-td {
- padding-left: 11px;
- }
-
- .highlight-htu .sect {
- line-height: 1.7em;
- margin-bottom: 23px;
- }
-
- .highlight-htu .sect ol {
- margin: 0;
- padding-left: 16px;
- }
-
- .highlight-htu .semi-heading {
- font-size: 1.07em;
- font-weight: bold;
- margin-bottom: 3px;
- }
-
- .highlight-htu .hl-page-heading {
- margin-bottom: 23px;
- }
-
- .highlight-lib .formBlk {
- overflow: hidden;
- }
-
- .highlight-lib .hl-sortWrp {
- float: left;
- }
-
- .highlight-lib .hl-searchWrp {
- float: right;
- }
-
- .highlight-lib .searchHlBtn {
- background-color: #564c46;
- box-shadow: 0 2px 0 0 #000;
- font-size: 0.92em;
- height: 25px;
- line-height: 25px;
- margin: 0;
- padding: 0 10px;
- }
-
- .highlight-lib input[name=q] {
- border: 0;
- border: solid 1px #ccc;
- border-radius: 2px;
- font-family: Arial,sans-serif;
- height: 27px;
- margin: 0 3px 0 0;
- padding-left: 3px;
- }
-
- .highlight-lib .hl-content-wrap {
- margin-top: 18px;
- }
-
- .highlight-lib .hl-content {
- margin-bottom: 39px;
- }
-
- .highlight-lib .hl-title {
- margin-bottom: 12px;
- font-weight: bold;
- }
-
- .highlight-lib .hl-item {
- background-color: #f9f9f9;
- margin-bottom: 5px;
- padding: 7px 10px;
- position: relative;
- }
-
- .highlight-lib .hl-item p {
- border-style: solid;
- border-width: 0 0 0 4px;
- float: left;
- padding-left: 11px;
- width: 93%;
- }
-
- .red-left-border {
- border-color: #ffa4a4;
- }
-
- .highlight-lib .hl-item-edit {
- cursor: pointer;
- display: none;
- float: right;
- }
-
- .highlight-lib .hl-more-less,.highlight-lib .hl-title a {
- border-bottom: #000 dotted 1px;
- font-size: 0.85em;
- padding-bottom: 1px;
- text-decoration: none;
- }
-
- .highlight-lib .highlight-edit {
- display: none;
- right: -38px;
- top: 0;
- position: absolute;
- z-index: 1;
- }
-
- .highlight-lib .highlight-edit table {
- background-color: #f6f6f6;
- border: #b5b5b5 solid 1px;
- border-collapse: separate;
- border-spacing: 4px;
- }
-
- .highlight-lib .highlight-edit table td {
- cursor: pointer;
- height: 24px;
- margin: 0;
- text-align: center;
- padding: 0;
- width: 24px;
- }
-
- .highlight-lib .highlight-edit table div {
- height: 100%;
- line-height: 24px;
- }
-
- .highlight-lib .highlight-edit .edit-del img {
- width: 24px;
- }
-
- .highlight-lib .hlpaginationWrp {
- text-align: center;
- }
-
- .highlight-lib .hl-pagination {
- border-radius: 4px;
- display: inline-block;
- margin: 20px 0;
- padding-left: 0;
- }
-
- .highlight-lib .hl-pagination>li {
- display: inline;
- }
-
- .highlight-lib .hl-pagination>li:first-child>a {
- border-top-left-radius: 4px;
- border-bottom-left-radius: 4px;
- margin-left: 0;
- }
-
- .highlight-lib .hl-pagination>li:last-child>a {
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
- }
-
- .highlight-lib .hl-pagination>li>a {
- background-color: #fff;
- border: 1px solid #ddd;
- color: #337ab7;
- float: left;
- line-height: 1.42857143;
- margin-left: -1px;
- position: relative;
- padding: 2px 10px;
- text-decoration: none;
- }
-
- .highlight-lib .hl-pagination>li i {
- line-height: 1.42857143;
- }
-
- .highlight-lib .hl-pagination a:link,.highlight-lib .hl-pagination a:visited,.highlight-lib .hl-pagination a:hover,.highlight-lib .hl-pagination a:active {
- color: #534a42!important;
- display: inline-block;
- text-decoration: none;
- }
-
- .highlight-lib .hl-pagination a:hover {
- background-color: #aac9e9;
- }
-
- .highlight-lib .hl-pagination .active a {
- background-color: #e4e4e4;
- cursor: default;
- }
-
- #hl-sticky-menu-library .fa {
- color: #534a42;
- font-size: 1.64em;
- }
-
- .stickyMenuSampleWrp .smClPk .fa {
- display: inline-block;
- font-size: 1.92em;
- text-align: center;
- width: 24px;
- }
-
- .introjs-arrow.right {
- right: -10px;
- top: 10px;
- border-top-color: transparent;
- border-right-color: transparent;
- border-bottom-color: transparent;
- border-left-color: white;
- }
-
- .introjs-arrow.right-bottom {
- bottom: 10px;
- right: -10px;
- border-top-color: transparent;
- border-right-color: transparent;
- border-bottom-color: transparent;
- border-left-color: white;
- }
-
- .introjs-arrow.left {
- left: -10px;
- top: 10px;
- border-top-color: transparent;
- border-right-color: white;
- border-bottom-color: transparent;
- border-left-color: transparent;
- }
-
- .introjs-arrow.left-bottom {
- left: -10px;
- bottom: 10px;
- border-top-color: transparent;
- border-right-color: white;
- border-bottom-color: transparent;
- border-left-color: transparent;
- }
-
- .pinned-content-header .fa-thumb-tack,.pinned-content-header span .fa-square {
- color: #534a42;
- }
-
- .fa-rotate-315 {
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3.5);
- -webkit-transform: rotate(315deg);
- -ms-transform: rotate(315deg);
- -moz-transform: rotate(315deg);
- -o-transform: rotate(315deg);
- transform: rotate(315deg);
- }
-
- .pinned-content-button-wrapper>.error {
- font-size: 0.71em;
- background-color: #f8ddde;
- text-align: center;
- margin-bottom: 5px;
- display: none;
- }
-
- .pinned-content-button-wrapper>.error {
- letter-spacing: 1.4;
- padding: 2px 0;
- width: 80%;
- margin: 0 auto 10px;
- }
-
- .pinned-content-button-wrapper>.error a {
- font-weight: bold;
- color: #000;
- }
-
- .pinned-content-button-wrapper.show>.error {
- display: block;
- }
-
- .pinned-content-button-wrapper .add-word-list-button .fa {
- margin-right: 5px;
- }
-
- .modal-wrapper .loading .fa {
- color: #fff;
- font-size: 6.42em;
- left: 38%;
- position: absolute;
- top: 40%;
- }
-
- .modal-wrapper.for-already-exists .modal-close-wrapper .fa-stack {
- position: absolute;
- right: 0;
- top: 0;
- transform: scale(.5);
- cursor: pointer;
- }
-
- .modal-wrapper.for-already-exists .modal-close-wrapper .fa-stack:hover {
- opacity: .7;
- }
-
- .free-member-features-modal .modal-message:not(.registered):not(.login) {
- float: left;
- margin: 10px 0 20px 30px;
- }
-
- .free-member-features-modal .modal-message div {
- font-weight: normal;
- margin: 0!important;
- }
-
- .free-member-features-modal .modal-message div:first-child {
- margin: 0 0 15px 0!important;
- }
-
- .free-member-features-modal .modal-message div:first-child span {
- font-size: 2em;
- }
-
- .free-member-features-modal .modal-message div:first-child span:first-child {
- font-weight: bold;
- }
-
- .free-member-features-modal .modal-message div:not(:first-child) {
- font-size: 1.28em;
-
- }
-
- .free-member-features-modal .modal-message div.sentence-list-features {
- line-height: 2em;
- }
-
- .free-member-features-modal .modal-message:not(.registered) .modal-login-link {
- margin: 0;
- }
-
- .free-member-features-modal .modal-message:not(.registered) .modal-login-link:hover {
- color: #534a42;
- filter: alpha(opacity=70);
- opacity: .7;
- }
-
- .free-member-features-modal .modal-example {
- float: none;
- margin: 5px 0 0;
- }
-
- .free-member-features-modal .modal-example img {
- box-shadow: none;
-
- -webkit-box-shadow: none;
- }
-
- .free-member-features-modal .free-register-wrap:not(.login):not(.registered) {
- border-collapse: separate;
- border-spacing: 15px 0;
- display: table;
- margin-left: 15px;
- }
-
- .free-member-features-modal .free-member-features {
- border: #aaa solid 1px;
- display: table-cell;
- vertical-align: top;
- }
-
- .free-member-features-modal .free-member-features>div:first-child {
- background-color: #ea9035;
- color: #fff;
- font-size: 1.42em;
- padding: 7px 0;
- }
-
- .free-member-features-modal .free-member-features .free-member-feature-content {
- display: inline-block;
- margin: 20px 10px;
-
- }
-
- .free-member-features-modal .free-member-features .free-member-feature-content img {
- margin: 10px 0;
-
- }
-
- .free-member-features-modal .free-member-features .free-member-feature-content div {
- text-align: left;
- }
-
- .free-member-features-modal .free-member-features>div:last-child {
- margin-bottom: 10px;
- }
-
- .free-member-features-modal .free-member-features>div:last-child span {
- font-weight: bold;
- }
-
- .free-member-features-modal .free-register-wrap:not(.login):not(.registered) .free-register {
- border: #48a267 solid 1px;
- display: table-cell;
- position: relative;
-
- }
-
- .free-member-features-modal .free-register>div:first-child {
- left: 3px;
- position: absolute;
- top: -30px;
- }
-
- .free-member-features-modal .free-register-wrap.login .free-register>div:first-child,.free-member-features-modal .free-register-wrap.registered .free-register>div:first-child {
- display: none;
- }
-
- .free-member-features-modal .free-register-wrap:not(.login) .free-register .modal-error-message {
- margin-top: 15px;
- }
-
- .free-member-features-modal .free-register .footer span {
- line-height: 14px;
- }
-
- .free-member-features-modal .free-register .modal-register-button {
- font-weight: normal;
- margin: 10px auto;
-
- }
-
- .free-member-features-modal .free-register .free-register-link {
- display: inline-block;
- margin-bottom: 10px;
- }
-
- .free-member-features-modal .free-register .free-register-link:hover {
- color: #534a42;
- filter: alpha(opacity=70);
- opacity: .7;
- }
-
- .free-member-features-modal.hidden .free-member-features {
- display: none;
- }
-
- .userInfo .right-cell {
- padding-left: 5px;
- }
-
- .userInfo .right-cell .free-description {
- font-size: 1em;
- margin-left: 6px;
- margin-bottom: 8px;
- letter-spacing: 3px;
- }
-
- .userInfo .right-cell .free-description span {
- letter-spacing: 0;
- padding-right: 3px;
- }
-
- .userInfo .right-cell .free-description span span {
- font-size: 0.85em;
- }
-
- .userInfo .right-cell .free-button {
- display: block;
- height: 35px;
-
- margin: 6px 0 0;
- }
-
- .userInfo .right-cell .free-button:hover {
- opacity: .7;
- }
-
- .userInfo .right-cell .free-button:active {
- box-shadow: none!important;
- position: relative;
- top: 2px;
- }
-
- .userInfo .right-cell .merits {
- margin: 4px 0;
- }
-
- .userInfo .right-cell .merits p {
- font-size: 0.78em;
- font-weight: bold;
- margin-bottom: 4px;
- }
-
- .userInfo .right-cell .merits p img {
- width: 12px;
- padding: 0 8px;
- }
-
- .userInfo .left-cell {
- text-align: center;
- }
-
- .userInfo .left-cell .member-state-label {
- color: #fff;
- display: block;
- width: 80px;
- text-align: center;
- height: 30px;
- box-sizing: border-box;
- padding: 5px 0;
- font-size: 90%;
- }
-
- .userInfo .left-cell .member-state-label.free {
- background-color: #48a267;
- }
-
- .userInfo .left-cell .member-state-label.premium {
- background-color: #ea9034;
- font-size: 70%;
- padding: 6.3px 0;
- }
-
- #sideBHPAEjje>.error {
- background-color: #f8ddde;
- display: none;
- font-size: 0.71em;
- letter-spacing: 1.4;
- margin-bottom: 5px;
- padding: 0 5px;
- text-align: center;
- }
-
- #sideBHPAEjje>.error a {
- color: #000;
- font-weight: bold;
- }
-
- #sideBHPAEjje.show>.error {
- display: block;
- }
-
- .footer_banner .title .small {
- font-size: 0.92em;
- }
-
- .footer_banner ul.features {
- font-size: 0.85em;
- list-style-type: none;
- color: #534a41;
- margin: 0;
- padding: 10px 0;
- line-height: 17px;
- }
-
- .footer_banner ul.features li {
- margin-left: 70px;
- padding: 5px 0;
- position: relative;
- }
-
- .footer_banner ul.features li:before {
- content: "";
- width: 17px;
- height: 17px;
- background-position: center center;
- background-repeat: no-repeat;
- position: absolute;
- top: 5px;
- left: -25px;
- }
-
- .footer_banner ul.features li.search-history:before {
- background-image: url(https://weblio.hs.llnwd.net/e7/img/banner/history.png);
- }
-
- .footer_banner ul.features li.vocab-test:before {
- background-image: url(https://weblio.hs.llnwd.net/e7/img/banner/vocab.png);
- }
-
- .footer_banner ul.features li.folders:before {
- background-image: url(https://weblio.hs.llnwd.net/e7/img/banner/folders.png);
- }
-
- .footer_banner ul.features li.ads:before {
- background-image: url(https://weblio.hs.llnwd.net/e7/img/banner/ad.png);
- }
-
- #free-house-ad-on-load-modal-container .header-wrap .modal-close i.fa-times,#premium-house-ad-on-load-modal-container .header-wrap .modal-close i.fa-times {
- color: #595858;
- font-size: 1.71em;
- height: 35px;
- line-height: 35px;
- }
-
- #free-house-ad-on-load-modal-container .features-wrapper {
- display: flex;
- flex-wrap: wrap;
- margin: 25px 5px 10px 5px;
- }
-
- #free-house-ad-on-load-modal-container .features-wrapper .feature {
- width: calc(33.3333% - 12px);
- padding: 20px 0 5px;
- font-size: 1em;
- text-align: center;
- vertical-align: top;
- border: 1px solid #d1d1d1;
- position: relative;
- margin: 10px 5px;
- }
-
- #free-house-ad-on-load-modal-container .features-wrapper .feature.other-features {
- border: none;
- }
-
- #free-house-ad-on-load-modal-container .features-wrapper .feature.other-features img {
- width: 75%;
- }
-
- #free-house-ad-on-load-modal-container .features-wrapper .feature.other-features:before {
- display: none;
- }
-
- #free-house-ad-on-load-modal-container .features-wrapper .feature:before {
- background-color: #e99034;
- border-radius: 50%;
- content: "0" counter(feature-number);
- counter-increment: feature-number;
- color: #fff;
- display: inline-block;
- font-size: 1em;
- height: 30px;
- left: 60px;
- line-height: 30px;
- position: absolute;
- top: -15px;
- width: 30px;
- }
-
- #free-house-ad-on-load-modal-container .features-wrapper .feature span {
- font-size: 1.28em;
- font-weight: bold;
- color: #554c45;
- }
-
- #free-house-ad-on-load-modal-container .features-wrapper .feature div.img-wrap {
- display: table-cell;
- height: 65px;
- text-align: center;
- vertical-align: middle;
-
- }
-
- #free-house-ad-on-load-modal-container .features-wrapper .feature div.img-wrap img {
- width: 40px;
- }
-
- #free-house-ad-on-load-modal-container .features-wrapper .feature div.description {
- line-height: 18px;
- }
-
- #free-house-ad-on-load-modal-container td div.description,#premium-house-ad-on-load-modal-container td div.description {
- line-height: 18px;
- }
-
- #free-house-ad-on-load-modal-container .features-wrapper .feature .img-wrap img.large {
- width: 50px;
- }
-
- .clr {
- clear: both;
- font-size: 0;
- line-height: 0;
- overflow: hidden;
- }
-
- .clrBc {
- clear: both;
- display: block;
- font-size: 0.71em;
- line-height: 0;
- overflow: hidden;
- }
-
- #main {
- float: left;
- text-align: left;
- padding: 0 0 0 8px;
-
- }
-
- .topic {
- font-size: 75%;
- height: 44px;
- line-height: 1.3em;
- margin: 0 0 2px 0;
- overflow: hidden;
- padding-top: 5px;
- width: 100%;
- word-break: break-all;
- }
-
- .topic table {
- height: 30px;
- width: 100%;
- }
-
- .topicL {
- font-size: 0.78em;
- float: left;
- vertical-align: middle;
-
- }
-
- .topicLB {
- font-size: 0.71em;
- }
-
- .topicR {
- float: right;
- text-align: right;
-
- }
-
- .topicR table {
- border-collapse: collapse;
- font-size: 1.1em;
- }
-
- .wrp {
- width: 100%;
- border-collapse: collapse;
- }
-
- .wrp img.lgDictLg {
- max-height: 16px!important;
- width: auto!important;
- }
-
- .wrp img.lgDictSp {
- height: 18px!important;
- margin-top: -17px!important;
- }
-
- .left {
- vertical-align: bottom;
- }
-
- .right {
- float: right;
- font-size: .9em;
- margin: 0 5px 0 0;
- text-align: right;
- vertical-align: top;
- }
-
- .kijiWrp {
- padding-left: 1px;
- }
-
- .kijiWrp .lgDict {
- float: right;
- margin: 1px 1px 0 0;
- }
-
- .kiji {
- color: #333;
- font-size: 1.0em;
- line-height: 1.8em;
- }
-
- .kiji * {
- font-size: 100%;
- line-height: 1.8em;
- }
-
- .midashigo:before {
- content: "\25b6";
- }
-
- .midashigo {
- font-size: 115%;
- letter-spacing: .02em;
- }
-
- crosslink:hover,.crosslink:link,.crosslink:visited,.crosslink:active {
- color: #534a42;
- text-decoration: underline;
- }
-
- .kijiFoot {
- margin-top: 10px;
- text-align: right;
- }
-
- .linkTagML {
- width: 60%;
- }
-
- .linkTagML input {
- border: #ccc solid 1px;
- height: 20px;
-
- }
-
- .linkTagMR {
- text-align: right;
- vertical-align: bottom;
- width: 38%;
- }
-
- .linkTagMR table {
- border-collapse: collapse;
- float: right;
- font-size: 80%;
- }
-
- .linkTagMR table td {
- vertical-align: bottom;
- }
-
- .linkOut {
- height: 12px;
- margin-left: 2px;
- width: 13px;
- }
-
- .intrstR>table {
- border-spacing: 0 2px;
- }
-
- span.pofsp,.KnenjSub {
- background-color: #564c46;
- border: none!important;
- border-radius: 3px;
- color: #fff;
- display: inline;
- font-size: 1.07em!important;
- font-weight: normal!important;
- line-height: 30px!important;
- padding: 3px 5px!important;
- }
-
- .clrPhrBc {
- clear: both;
- display: block;
- font-size: 0.71em;
- line-height: 0;
- margin-top: 1em;
- overflow: hidden;
- }
-
- .wrpExE {
- height: 25px;
- margin-top: 18px;
- }
-
- .wrpExE p {
- color: #525152;
- font-size: 1.0em;
- height: 20px;
- margin: 0;
- padding-left: 2px;
- }
-
- .wrpExE p a:link,.wrpExE p a:visited,.wrpExE p a:active {
- color: #525152;
- font-size: 1.0em;
- text-decoration: none;
- }
-
- .intrst {
- width: 100%;
- border-top: 1px solid #ccc;
- border-collapse: collapse;
- }
-
- #summary table:last-of-type.intrst {
- border-bottom: 1px solid #ccc;
- margin-bottom: 1em;
- }
-
- .intrst .intrstL {
- background-color: #f5efe6;
- padding-left: 5px;
- vertical-align: middle;
- width: 80px;
- }
-
- .intrst .intrstL h2 {
- font-size: 0.92em;
- font-weight: normal;
- }
-
- .intrst .intrstR {
- padding-left: 4px;
- vertical-align: middle;
- }
-
- .linkTagRR span {
- font-size: 0;
- display: block;
- height: 23px;
- line-height: 0;
- width: 61px;
- }
-
- img.weblioMascot {
- margin: 15px 0 15px;
-
- }
-
- #main {
- float: left;
- margin: 0 15px 0 auto;
-
- }
-
- #main a:link,#main a:visited,#main a:active {
- color: #534a42;
- }
-
- #main a:hover {
- color: #4f7bb9;
- }
-
- .clrBc {
- clear: both;
- content: "";
- display: block;
- font-size: 0;
- line-height: 0;
- overflow: hidden;
- }
-
- .treeBoxC a:link,.treeBoxC a:visited,.treeBoxC a:active {
- font-family: "ＭＳ ゴシック","平成角ゴシック",monospace;
- line-height: 1.5em;
- padding: 8px;
- }
-
- .treeBoxC h3 {
- text-align: left;
- }
-
- .treeBoxC h3 a:link,.treeBoxC h3 a:visited,.treeBoxC h3 a:active {
- font-size: 0.85em;
- font-weight: normal;
- left: -1px;
- line-height: 1.6em;
- padding: 0;
- position: relative;
- }
-
- .treeBoxC h3 span {
- color: #1c9000;
- display: list-item;
- margin: 0 0 0 14px;
- padding: 0;
- position: relative;
- }
-
- .treeBoxC hr {
- border: #c0c0c0 solid;
- border-width: 1px 0 0 0;
- height: 1px;
- margin: 5px 5px 5px 5px;
- }
-
- .treeBoxC p {
- font-size: 1.42em;
- margin: 0;
- padding: 0;
- text-align: left;
-
- }
-
- .treeBoxCFoldLi .pl {
- border: #000 solid 1px;
- }
-
- #summary {
- padding: 2px 2px 10px 2px;
- }
-
- .summaryR>.error,#sideBHPAEjje>.error {
- font-size: 0.71em;
- background-color: #f8ddde;
- text-align: center;
- margin-bottom: 5px;
- display: none;
- }
-
- #sideBHPAEjje>.error {
- letter-spacing: 1.4;
- padding: 0 5px;
- }
-
- #sideBHPAEjje>.error a {
- font-weight: bold;
- color: #000;
- }
-
- .summaryR.show>.error,#sideBHPAEjje.show>.error {
- display: block;
- }
-
- #summaryMargin {
- margin-top: 150px;
- }
-
- .summaryM .description {
- background-color: #564c46;
- color: #fff;
- font-size: 1.07em;
- font-weight: normal;
- margin: 0 5px 0 3px;
- padding: 3px 5px!important;
- }
-
- .linkTagRClrAd a:active,.linkTagRClrAd a:hover,.linkTagRClrAd a:link,.linkTagRClrAd a:visited {
- text-decoration: none;
- }
-
- b.highlight {
- font-weight: normal;
- }
-
- .agglutination {
-
- vertical-align: top;
- }
-
- .agglutination agglutinationT {
- font-size: 1.42em;
- }
-
- .agglutination li {
- font-size: 1em;
- }
-
- .agglutination ul {
- margin: 10px 0 0 0;
- padding: 0 0 0 10px;
- }
-
- .relatedwords relatedwordsT {
- font-size: 1.42em;
- }
-
- .EGateCoreDataWrp b,.descriptionWrp b {
- display: block;
- text-align: center;
- }
-
- .EGateCoreDataWrp table td:first-child,.descriptionWrp table td:first-child {
- width: 80px;
- }
-
- .descriptionWrp table td:first-child {
- vertical-align: top;
- padding: 16px 0 10px 0;
- }
-
- .EGateCoreDataWrp table td,.descriptionWrp table td {
- font-size: 90%;
- font-weight: bold;
- }
-
- #searchSettingsWrp .reibun-sample .fa {
- font-size: 1.28em;
- }
-
- .pin-icon-cell {
- text-align: center;
- width: 45px;
- }
-
- .pin-icon-cell td {
- text-align: center;
- white-space: nowrap;
- }
-
- .pin-icon-cell span {
- color: #564c46;
- font-size: 0.71em;
- }
-
- .pin-icon-cell .fa {
- cursor: pointer;
- font-size: 2.42em;
- }
-
- .pin-icon-cell .fa:hover {
- filter: alpha(opacity=70);
- opacity: .7;
- }
-
- #learning-level-table-wrap {
- display: table;
- width: 100%;
- }
-
- #learning-level-table {
- display: table-cell;
- }
-
- #learning-level-table div {
- display: table;
- }
-
- .learning-level-row {
- display: table-row;
- }
-
- .learning-level-row span {
- display: table-cell;
- padding: 2px 0;
- }
-
- .learning-level-label {
- text-align: right;
- }
-
- .learning-level-content {
- padding-right: 15px!important;
- }
-
- #side .addLmFd .premium,#main .addLmFd .premium {
- background-color: #ff8022;
- color: #fff;
- display: block;
- font-size: 70%;
- position: relative;
- width: 100%;
- height: 35px;
-
- }
-
- #side .addLmFd .premium:hover,#main .addLmFd .premium:hover {
- opacity: .7;
- }
-
- #summary.non-member .intrstR #leadBtnWrp,#summary.non-member .intrstR #learning-level-table {
- display: block;
- width: 100%;
- }
-
- #summary.non-member .intrstR #learning-level-table div,#summary.non-member .intrstR #learning-level-table div * {
- display: inline;
- }
-
- #summary.non-member .intrstR #leadToVocabIndexBtn,#summary.non-member .intrstR #leadToSpeakingTestIndexBtn {
- display: table-cell;
-
- vertical-align: middle;
- position: relative;
- box-sizing: border-box;
- }
-
- #summary.non-member .intrstR #leadBtnWrp .insideLlTable {
- display: inline-block;
- margin: 10px 5px;
- box-sizing: border-box;
-
- }
-
- .free-member-features {
- padding: 0 0 10px 0;
-
- }
-
- .free-member-features .features-title {
- background-color: #554c45;
- color: white;
- font-size: 1.28em;
- font-weight: bold;
- text-align: center;
- padding: 10px 0;
- }
-
- .free-member-features .features-subtitle {
- font-size: 1em;
- font-weight: bold;
- text-align: center;
- padding: 8px 0 12px 0;
- }
-
- .free-member-features .features-subtitle .red {
- background-color: transparent;
- color: #e04a12;
- font-size: 1.28em;
- padding: 0 5px;
- }
-
- .free-member-features ul.features {
- margin: 0;
- padding: 0;
- text-align: center;
- }
-
- .free-member-features ul.features li {
- width: 96px;
- height: 121px;
- display: inline-block;
- border: 1px solid #cdcdcd;
- text-align: center;
- margin-right: 15px;
- vertical-align: top;
- }
-
- .free-member-features ul.features li:first-child {
- margin-left: 38px;
- }
-
- .free-member-features ul.features li .feature-name {
- font-size: 0.85em;
- font-weight: bold;
- margin: 11px 0 10px 0;
- }
-
- .free-member-features ul.features li img {
- height: 36px;
- width: auto;
- }
-
- .free-member-features ul.features li .feature-desc {
- font-size: 0.85em;
- margin-top: 5px;
- }
-
- .free-member-features ul.features li.more-features {
- margin-right: 0;
- position: relative;
- border: none;
- }
-
- .free-member-features ul.features li.more-features img {
- width: 86px;
- height: auto;
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%,-50%);
- }
-
- .free-member-features a.free-register-button {
- display: block;
- background-color: #48a267;
- color: white;
- text-decoration: none;
- text-align: center;
- border-radius: 15px;
-
- margin: 10px auto 0 auto;
- font-size: 1.14em;
- font-weight: bold;
- padding: 15px 0;
- color: white;
- position: relative;
- line-height: 21px;
- }
-
- .free-member-features a.free-register-button:after {
- content: "\f0da";
- font-family: FontAwesome;
- position: absolute;
- height: 21px;
- width: 30px;
- font-size: 1.14em;
- line-height: 21px;
- top: 50%;
- right: 30px;
- transform: translateY(-50%);
- }
-
- #main .free-member-features a.free-register-button:link,#main .free-member-features a.free-register-button:visited,#main .free-member-features a.free-register-button:active {
- color: white;
- }
-
- .free-member-features a.free-register-button .small {
- font-size: 1em;
- }
-
- .descriptionWrp table td.content-explanation {
- font-size: 1.12em;
- line-height: 2;
- padding: 10px 0 5px 0;
- }
-
- .descriptionWrp table td.content-explanation.ej {
- letter-spacing: 1.5;
- }
-
- #main .KnenjSub a:link,#main .KnenjSub a:visited,#main .KnenjSub a:active {
- color: #fff;
- }
-
- h2.midashigo rt {
- font-size: .5em;
- }
-
- h2.midashigo rp {
- font-size: .5em;
- }
-
- .infobox caption {
- font-size: larger;
- margin-left: inherit;
- }
-
- .infobox.bordered {
- border-collapse: collapse;
- }
-
- .infobox.bordered td,.infobox.bordered th {
- border: #aaa solid 1px;
- }
-
- .infobox.bordered .borderless td,.infobox.bordered .borderless th {
- border: 0;
- }
-
- .infobox.standard-talk.bordered td,.infobox.standard-talk.bordered th {
- border: #c0c090 solid 1px;
- }
-
- .infobox.bordered .mergedtoprow td,.infobox.bordered .mergedtoprow th {
- border: 0;
- border-right: #aaa solid 1px;
- border-top: #aaa solid 1px;
- }
-
- .infobox.bordered .mergedrow td,.infobox.bordered .mergedrow th {
- border: 0;
- border-right: #aaa solid 1px;
- }
-
- .wikitable caption,.prettytable caption {
- font-weight: bold;
- margin-left: inherit;
- margin-right: inherit;
- }
-
- dl#infoboxCountry dt.infoboxCountryNameJa {
- font-size: 1.36em;
- margin: 0 0 .13em;
- text-align: center;
- }
-
- .dablink {
- border-bottom: #aaa solid 1px;
- font-size: 90%;
- margin: .5em 0 .5em 0;
- padding: 3px 2em 3px 2em;
- }
-
- .midashigo sub {
- font-size: .6em;
- }
-
- .midashigo sup {
- font-size: .6em;
- }
-
- td.movie_staff_left {
-
- text-align: right;
- }
-
- .ad02_left_box {
- width: 7px;
- height: 30px;
- margin: 0 2px 2px 0;
- padding: 0;
- background-color: #d0d0d0;
- vertical-align: middle;
- font-size: 10pt;
- }
-
- .ad02_center-left_box {
-
- height: 30px;
- margin: 0 2px 2px 0;
- padding: 4px;
- background-color: #f0f0f0;
- vertical-align: middle;
- font-size: 10pt;
- }
-
- .ad02_center-right_box {
-
- height: 30px;
- margin: 0 2px 2px 0;
- padding: 4px;
- background-color: #e0e0e0;
- vertical-align: middle;
- font-size: 10pt;
- }
-
- .ad02_right_box {
-
- height: 30px;
- margin: 0 2px 2px 0;
- padding: 4px;
- background-color: #e0e0e0;
- vertical-align: middle;
- font-size: 10pt;
- }
-
- .main3noh {
- font-size: 1em;
- color: #fff;
- }
-
- .mainb {
- font-size: 1em;
- color: #000;
- font-weight: bold;
- line-height: 18px;
- }
-
- h2.midashigo sub {
- font-size: smaller;
- }
-
- ul.linkListStrong li {
- list-style-type: none;
- }
-
- .Ktdcm .KtdcmImgLeft {
- float: left;
- width: 48%;
- }
-
- .Ktdcm .KtdcmImgRight {
- float: right;
- width: 48%;
- }
-
- .Ktdcm .maincol {
- margin-left: 15px;
- text-align: left;
- }
-
- .Ktdcm ul.fright li.full {
- text-align: right;
- }
-
- .Ktdcm .maincol .boxArea {
- margin-bottom: 16px;
- padding-top: 7px;
- }
-
- .Ktdcm .maincol .boxArea .wrap {
- padding-bottom: 8px;
- }
-
- .Ktdcm .maincol .boxArea .section {
- padding: 0 7px;
- }
-
- .Ktdcm table.cell2 .right {
- padding-left: 16px;
- }
-
- .Sngsj .gaiji {
- height: 1.0em;
- vertical-align: text-bottom;
- width: 1.0em;
- }
-
- .Otnet .OtnetRed {
- border-bottom: #ccc solid 1px;
- border-left: #f00 solid 10px;
- border-right: #ccc solid 0;
- margin: 12px;
- padding: 1px 5px;
- }
-
- .Fkkyr .left_column {
- padding: 15px 0 0 0;
- }
-
- td.midashigo {
- color: #4f519b;
- font-weight: bold;
- padding: 10px 5px 30px 2px;
- }
-
- .Mtsbs .notes_mainArea {
- margin-top: 10px;
- }
-
- .Mtsbs table.spec tr.mainheader th {
- background-color: #d2d2d2;
- font-weight: bold;
- }
-
- .Mtsbs table.spec tr.mainheader th.basic {
- background-color: #E8F6D9;
- }
-
- .Mtsbs table.spec .tdleft {
- text-align: left;
- }
-
- .Mtsbs table.spec .tdright {
- text-align: right;
- }
-
- .Mtsbs table.spec td.tdleft_nb {
- text-align: left;
- border-right-style: none;
- }
-
- .Mtsbs table.spec td.tdright_nb {
- text-align: right;
- border-left-style: none;
- }
-
- .Mtsbs .carmain_font80 {
- font-size: .8em;
- }
-
- .Mtsbs .carmain_font70 {
- font-size: .7em;
- }
-
- .Mtsbs td.tdleft {
- text-align: left;
- }
-
- .Mtsbs th.tdleft {
- text-align: left;
- }
-
- .Kkjsh table tr td.right {
- text-align: right;
- }
-
- .Mzdmt .cell_center_left {
- border-right: #a1a1a1 solid 1px;
- text-align: center;
- }
-
- .Mzdmt .cell_left_no {
- border-bottom: #a1a1a1 solid 1px;
- height: 22px;
- text-align: left;
- }
-
- .Mzdmt .cell_left {
- border: #a1a1a1 solid;
- border-width: 0 1px 1px 0;
- height: 22px;
- text-align: left;
- }
-
- .Triph .data caption {
- background: #94b7df;
- border-right: #fff solid 1px;
- border-top: #fff solid 1px;
- color: #fff;
- font-weight: bold;
- padding: 2px 17px;
- }
-
- .Cntkj .description {
- float: right;
- width: 43%;
- }
-
- .Hyndi .spec-table td.left {
- text-align: left;
- }
-
- .Hndmr table#webcatalogue-table td {
- color: #666;
- }
-
- .Hndmr table#webcatalogue-table img {
- border: none;
- }
-
- .Hndmr table#webcatalogue-table p {
- margin: 0;
- padding: 0;
- }
-
- .Hndmr table#webcatalogue-table p.leadcopy {
- color: #333;
- font-size: .9em;
- font-weight: bold;
- line-height: 18px;
- }
-
- .Hndmr table#webcatalogue-table p.leadcopy2 {
- font-size: .9em;
- font-weight: bold;
- line-height: 21px;
- }
-
- .Hndmr table#webcatalogue-table p.text {
- font-size: .9em;
- line-height: 16px;
- }
-
- .Hndmr table#webcatalogue-table p.caution {
- color: #888;
- font-size: .9em;
- line-height: 12px;
- margin-top: 3px;
- }
-
- .Hndmr table#webcatalogue-table span.typebetsu {
- font-size: .9em;
- font-weight: normal;
- }
-
- .Hndmr table#webcatalogue-table p.concepttext {
- color: #fff;
- line-height: 18px;
- margin: 0 15px 10px 15px;
- }
-
- .Hndmr table#webcatalogue-table strong.v6 {
- color: #003f98;
- }
-
- .Hndmr table#webcatalogue-table p.safe-midashi {
- background-color: #333;
- color: #fff;
- font-size: .9em;
- font-weight: bold;
- line-height: 18px;
- padding: 3px 5px 3px 5px;
- }
-
- .Hndmr table#webcatalogue-table p.realworldtext {
- color: #51318f;
- }
-
- .Hndmr table#webcatalogue-table span.co2 {
- font-size: .9em;
- }
-
- .Hndmr table#webcatalogue-table p.texthyoujimark {
- font-size: .9em;
- line-height: 16px;
- }
-
- .Hndmr table#webcatalogue-table #env-data {
- font-size: .9em;
- }
-
- .Hndmr table#webcatalogue-table #env-data td.tabletext {
- padding: 2px;
- }
-
- .Hndmr table#webcatalogue-table strong.price {
- font-size: .9em;
- }
-
- .Hndmr table#webcatalogue-table p.caution_vg {
- margin-top: 7px;
- }
-
- .Hndmr table#webcatalogue-table p.navi-midashi {
- background-color: #1c1f7a;
- color: #fff;
- font-size: .9em;
- font-weight: bold;
- line-height: 18px;
- padding: 3px 5px 3px 5px;
- }
-
- .Hndmr table#webcatalogue-table .note {
- color: #1c1f7a;
- }
-
- .Hndmr table#webcatalogue-table span.komidashi {
- color: #006965;
- }
-
- .Hndmr table.spec-table td.bd-left {
- border-left: 1px solid #2c2c2c;
- }
-
- .Hndmr .block_line_right {
- border-right: solid 1px #000;
- }
-
- .Hndmr #webcata_footer {
- clear: both;
- padding: 30px 128px 15px 20px;
- text-align: right;
- }
-
- .Hndmr #specifications th.car .small {
- font-size: x-small;
- line-height: 120%;
- }
-
- .Hndmr div#web-catalog-contents {
- margin: 24px;
-
- }
-
- .Hndmr div#web-catalog-contents h4 {
- background: #325958;
- color: #fff;
- font-size: .9em;
- margin-bottom: 14px;
- padding: 4px 0 4px 10px;
-
- }
-
- .Hndmr div#web-catalog-contents table.model-navi {
- margin: 0 0 5px 0;
- }
-
- .Hndmr div#web-catalog-contents table.model-navi td {
- padding: 0 25px 0 10px;
- }
-
- .Hndmr div#web-catalog-contents * {
- margin: 0;
- padding: 0;
- }
-
- .Hndmr div#web-catalog-contents h4 span {
- font-size: .9em;
- font-weight: normal;
- }
-
- .Hndmr div#web-catalog-contents p.caution,p.caution {
- font-size: .9em;
- line-height: 120%;
- }
-
- .Hndmr #eq_spec_list td.right_non_border {
- border-right: none;
- }
-
- .Kejje dd {
- margin-left: 20px;
- }
-
- .Kejje .gaiji {
- border: 0;
- margin-bottom: -3px;
- }
-
- .Kejje .level1 {
- margin-left: 1em;
- }
-
- .Kejje .level2 {
- margin-left: 1.5em;
- }
-
- .Kejje .backlink {
- margin-top: 10px;
- }
-
- .Kejje .backlink img {
- margin-bottom: -3px;
- margin-right: 5px;
- }
-
- .Kejje .onsei {
- margin-bottom: -8px;
- }
-
- .Kejje .playSd {
- cursor: pointer;
- }
-
- .youreilink {
- border-bottom: #080 solid 1px;
- color: #080;
- font-weight: bold;
- text-decoration: none;
- }
-
- .KejjeYrL,.KejjeYrLS,.KejjeYrM,.KejjeYrMS,.KejjeYrR {
- background-color: #f7f7f7;
- font-size: .9em;
- vertical-align: top;
- }
-
- .KejjeYrL,.KejjeYrLS {
- color: #363636;
- font-size: .9em;
- padding: 0 4px 0 4px;
- width: 40px;
- }
-
- .KejjeYrM,.KejjeYrMS {
- width: 13px;
- }
-
- .KejjeYrR {
- padding: 0 4px 0 4px;
- }
-
- .KejjeYr {
- border: 0;
- border-collapse: collapse;
- margin: 0 0 3px 25px;
- padding: 0;
- }
-
- .KejjeYrMS i {
- margin: 2px 0 0 2px;
- }
-
- .KejjeYrLS {
- cursor: pointer;
- }
-
- .KejjeYrC {
- border: #666 solid 1px;
- font-size: .9em;
- padding: 1px;
- }
-
- .KejjeYrHd {
- padding: 0 .5em 0 0;
- }
-
- .KejjeYrTxt {
- display: none;
- margin: 0;
- padding: 0 .5em 0 0;
- }
-
- .KejjeYrHd a,.KejjeYrTxt a {
- color: black;
- }
-
- .KejjeYrHd a:active,.KejjeYrTxt a:active {
- color: black;
- }
-
- .KejjeYrHd a:hover,.KejjeYrTxt a:hover {
- color: black;
- }
-
- .KejjeYrHd a:visited,.KejjeYrTxt a:visited {
- color: black;
- }
-
- .KejjeYrLn {
- background-image: url(https://weblio.hs.llnwd.net/e7/img/iconCclBlS.png);
- background-position: left 5px;
- background-repeat: no-repeat;
- line-height: 1.2em;
- margin: 0;
- padding: 0 0 0 16px;
- }
-
- .KejjeYrLn SUP {
- line-height: 1.0em;
- margin: 0;
- padding: 0;
- }
-
- .KejjeYrLn span {
- line-height: 1.6em;
- margin: 0;
- padding: 0;
- }
-
- .KejjeYrLn .KejjeYrEn {
- font-family: Arial;
- font-weight: bold;
- }
-
- .KejjeYrKwrd {
- line-height: 1.0em;
- }
-
- .KejjeSm {
- font-size: .8em;
- font-weight: normal;
- line-height: 1.0em;
- }
-
- .KejjeSm a {
- line-height: 1.0em;
- }
-
- .Kejje .kenjeEnE {
- border: 0;
- display: list-item;
- list-style-position: inside;
- margin: 0;
- padding: 0 0 0 10px;
- }
-
- .Kejje .onseiSwf {
- display: inline-block;
- position: relative;
- top: 8px;
- margin-left: 5px;
- }
-
- .KejjeYrMS img {
- cursor: pointer;
- margin-top: 3px;
- }
-
- .KejjeSm {
- font-size: .8em;
- font-weight: normal;
- line-height: 1.0em;
- padding-left: 4px;
- }
-
- .Kejje .lvlNH,.Kejje .lvlAH,.Kejje .lvlB {
- float: left;
- margin: 0;
- padding: 0;
- vertical-align: bottom;
- }
-
- .Kejje .lvlNH {
- font-size: 1.3em;
- font-weight: bold;
- height: 1.1em;
- width: 28px;
- }
-
- .Kejje .lvlAH {
- font-size: 1.4em;
- font-weight: bold;
- line-height: 1.6em;
- width: 16px;
- }
-
- .Kejje .lvlUAH {
- font-size: 1.3em;
- font-weight: bold;
- height: 1.1em;
- }
-
- .Kejje .lvlUAB {
- font-weight: bold;
- }
-
- .Kejje .lvlB {
- padding: .1em 0 0 0;
- max-width: 85%;
- }
-
- .Kejje .lvlNHje {
- float: left;
- font-weight: bold;
- margin: 0;
- padding: 0;
- vertical-align: bottom;
- width: 16px;
- }
-
- .Kejje .lvlNBje {
- float: left;
- font-weight: bold;
- margin: 0 0 12px 0;
- padding: 0;
- }
-
- .Kejje .lvlNBje td {
- line-height: 1.6em;
- margin: 0;
- padding: 0 20px 0 0;
- vertical-align: top;
- }
-
- .Kejje .lvlNBjeT {
- float: left;
- margin: 0;
- padding: 0;
- }
-
- .Kejje .lvlNBjeT sup {
- line-height: 1.0em;
- margin: 0;
- padding: 0;
- }
-
- .Kejje .lvlNBjeL {
- white-space: nowrap;
- }
-
- .Kejje .lvlBje {
- font-weight: bold;
- margin: 0;
- padding: 0;
- }
-
- .Kejje .lvlB {
- margin: .3em 0 0 0;
- }
-
- .Kejcy .gaiji {
- border: 0;
- margin-bottom: -3px;
- }
-
- .Kejcy .level0 {
- margin: 1.0em 0 0 0;
- }
-
- .Kejcy .level1 {
- margin: 0 1.5em 0 1.5em;
- }
-
- .Kejcy .level2 {
- background-color: #f7f7f7;
- font-size: .9em;
- margin: 0 3.0em .5em 3.0em;
- padding: .2em .5em 0 .5em;
- }
-
- .Gicns .ga_small {
- font-size: .9em;
- }
-
- .Nsrsk .NsrskMaintxt {
- float: left;
- text-align: left;
- }
-
- .Nsrsk .NsrskRightph {
- border: #ccc solid 1px;
- float: right;
- text-align: center;
- }
-
- .Tltdb div.TltdbLeft {
- float: left;
- text-align: center;
- }
-
- .Tytmt .smallMText {
- font-size: .7em;
- }
-
- .Tpkys div.stroke div.imgArea p.rightImg {
- margin-right: 0;
- }
-
- .Tpkys .closeBoxIn div.makeRight {
- border: #ccc dotted 1px;
- float: left;
- height: 350px;
- padding: 10px;
-
- }
-
- .Srsbz .SrsbzLeft {
- float: left;
-
- }
-
- .Srsbz .SrsbzRight {
- float: right;
-
- }
-
- .Nrksm .NrksmT2 caption {
- font-weight: bold;
- text-align: left;
- }
-
- .Trhnt .TrhntLeft {
- float: left;
-
- }
-
- .Trhnt .TrhntRight {
- float: right;
-
- }
-
- .rmvDots {
- background: none!important;
- padding: 0!important;
- }
-
- .syosaiLeft {
-
- float: left;
- margin: 0 0 20px 25px;
- }
-
- .Hgnsh .syosaiLeft {
- float: left;
- margin: 0 0 0 5px;
-
- }
-
- .Hgnsh .syosaiLeftBox {
- line-height: 1.4em;
- margin-top: 15px;
- text-align: justify;
- text-justify: inter-ideograph;
-
- }
-
- .Hgnsh .syosaiRight {
- float: right;
- margin-top: 5px;
-
- }
-
- .Hgnsh .syosaiRightBox {
- text-align: center;
-
- }
-
- .Hgnsh .syosaiRightBox img {
- margin-bottom: 0;
- padding: 15px 0 15px;
- }
-
- .Hskks .syosaiLeft {
- float: left;
- margin: 0 0 0 5px;
-
- }
-
- .Hskks .syosaiLeftBox {
- line-height: 1.4em;
- margin-top: 15px;
- text-align: justify;
- text-justify: inter-ideograph;
-
- }
-
- .Hskks .syosaiRight {
- float: right;
- margin-top: 5px;
-
- }
-
- .Hskks .syosaiRightBox {
- text-align: center;
-
- }
-
- .Hskks .syosaiRightBox img {
- margin-bottom: 0;
- padding: 15px 0 15px;
- }
-
- .LiscjYr .synonym1 {
- float: left;
- margin: 0;
- width: 45%;
- }
-
- .LiscjYr .synonym2 {
- float: right;
- margin: 0;
- width: 45%;
- }
-
- .LiscjYr .clear_column {
- clear: both;
- }
-
- .Liscj .caption p,.Liscj .meaning p {
- margin: 0;
- }
-
- .Wejty .wejtyT span,.Wejty .wejtyE span,.Wejty .wejtyR span {
- background-color: #f0f0f0;
- border: #666 solid 1px;
- color: #363636;
- font-size: .9em;
- line-height: 1.0em;
- padding: 1px;
- }
-
- .Wejty .wejtyT {
- padding: 0;
- }
-
- .Wejty .wejtyE,.Wejty .wejtyR {
- padding: 0 0 0 16px;
- }
-
- .Wejty .wejtyL {
- background-color: #f0f0f0;
- border: #666 solid 1px;
- color: #363636;
- font-size: .9em;
- font-weight: normal;
- line-height: 1.0em;
- margin-right: 8px;
- padding: 1px;
- }
-
- .Wejty .wejtyInfo {
- border: #b5b6b5 solid 1px;
- font-size: .8em;
- line-height: 1.32em;
- margin: 1em 0 0 0;
- padding: 10px;
-
- }
-
- .Wwsej .wwsejInfo {
- border: #b5b6b5 solid 1px;
- font-size: .8em;
- line-height: 1.32em;
- margin: 20px 0 0 0;
- padding: 10px;
-
- }
-
- .Nwnej .nwnejP {
- border-left: #815733 solid 6px;
- font-size: 1em;
- font-weight: bold;
- line-height: 1.0em;
- margin: 12px 0 2px 0;
- padding-left: 3px;
- }
-
- .Nwnej .nwnejP a {
- line-height: 1.0em;
- }
-
- .Nwnej .nwnejSEnL,.Nwnej .nwnejSEnR {
- max-width: 90%;
- float: left;
- margin: 12px 0 0 0;
- }
-
- .Nwnej .nwnejSEnL {
- line-height: 1.4em;
- width: 16px;
- }
-
- .Nwnej .nwnejSJp {
- margin: 0 0 0 1.5em;
- padding: 0 0 12px 0;
- }
-
- .Nwnej .nwnejS p {
- line-height: 1.4em;
- margin: 0;
- padding: 0;
- }
-
- .Nwnej .nwnejS a {
- line-height: 1.0em;
- }
-
- .Nwnej .nwnejYr {
- background-color: #f7f7f7;
- margin: 0 0 0 1.5em;
- padding: 0;
-
- }
-
- .Nwnej .nwnejYrL,.Nwnej .nwnejYrLS,.Nwnej .nwnejYrR {
- background-color: #f7f7f7;
- font-size: .9em;
- vertical-align: top;
- }
-
- .Nwnej .nwnejYrL,.Nwnej .nwnejYrLS {
- margin: 0;
- padding: 0;
- width: 13px;
- }
-
- .Nwnej .nwnejYrR {
- padding: 0 4px 0 4px;
- }
-
- .Nwnej .nwnejYrLS i {
- margin: 4px 0 0 3px;
- }
-
- .Nwnej .nwnejYrHd {
- padding: 0 .5em 0 0;
- }
-
- .Nwnej .nwnejYrTxt {
- display: none;
- margin: 0;
- padding: 0 .5em 0 0;
- }
-
- .Nwnej .nwnejYrLn {
- background-image: url(https://weblio.hs.llnwd.net/e7/img/iconCclBlS.png);
- background-position: left 5px;
- background-repeat: no-repeat;
- line-height: 1.2em;
- padding: 0 0 0 12px;
- }
-
- .Nwnej .nwnejYrE,.Nwnej .nwnejYrJ {
- font-size: .9em;
- margin: 0;
- }
-
- .Nwnej .nwnejYrE {
- font-family: Arial;
- font-weight: bold;
- padding-right: 8px;
- }
-
- .Nwnej .nwnejThL a:active,.Nwnej .nwnejThL a:hover,.Nwnej .nwnejThL a:link,.Nwnej .nwnejThL a:visited {
- border-bottom: #534a42 dotted 1px;
- display: inline-block;
- font-size: 1em;
- line-height: 10px;
- text-decoration: none;
- }
-
- .Wejhs .wejhsSub {
- border-left: #815733 solid 6px;
- font-size: 1.3em;
- font-weight: bold;
- line-height: 1.0em;
- margin: 10px 0 5px 0;
- padding-left: 3px;
- }
-
- .Wejhs .wejhsSub a {
- line-height: 1.0em;
- }
-
- .Wejhs .wejhsD {
- background-color: #f7f7f7;
- margin-left: 20px;
- margin-top: 10px;
- padding: 5px;
- }
-
- .Wejhs .wejhsL {
- float: left;
- padding: 2px 0 2px 0;
- }
-
- .Wejhs .wejhsL span {
- border: #666 solid 1px;
- color: #363636;
- font-size: .9em;
- margin: 0 16px 0 12px;
- padding: 1px;
- }
-
- .Wejhs .wejhsR {
- float: left;
-
- }
-
- .Wejhs .wejhsInfo {
- border: #b5b6b5 solid 1px;
- font-size: .8em;
- line-height: 1.32em;
- margin: 50px 0 0 0;
- padding: 10px;
-
- }
-
- .Wkpen .wkpenWrp {
- background-color: #f7f7f7;
- line-height: 1.3em;
- margin-top: 5px;
- padding: 9px 5px 9px 15px;
- width: 95%;
- }
-
- .Jawik .level0,.Jawik .level0Head {
- font-size: 1.4em;
- font-weight: bold;
- margin: 10px 0 2px 0;
- padding-left: 5px;
- }
-
- .Jawik .level0Head {
- margin-top: 0;
- }
-
- .Jawik .level0 span,.Jawik .level0Head span {
- border: #b81e07 solid;
- border-width: 0 0 0 8px;
- padding: 3px 2px 2px 0;
- }
-
- .Hypej .level0 {
- margin: 1.0em 0 0 0;
- padding: 0;
- }
-
- .Hypej .HypejSub {
- border-left: #815733 solid 6px;
- font-size: 1.3em;
- font-weight: bold;
- line-height: 1.0em;
- margin: 10px 0 5px 0;
- padding-left: 3px;
- }
-
- .Hypej .HypejSm {
- font-size: .8em;
- font-weight: normal;
- line-height: 1.0em;
- padding-left: 3px;
- }
-
- .Hypej .lvlNH {
- float: left;
- font-size: 1.3em;
- font-weight: bold;
- height: 1.1em;
- margin: 0;
- padding: 0;
- vertical-align: bottom;
- width: 28px;
- }
-
- .Hypej .lvlB {
- float: left;
- margin: 0;
- padding: .3em 0;
-
- }
-
- .HypejYrL,.HypejYrR {
- background-color: #f7f7f7;
- font-size: .9em;
- vertical-align: top;
- }
-
- .Hypej .HypejYr {
- border: 0;
- border-collapse: collapse;
- margin: 5px 0 1em 1em;
- padding: 0;
-
- }
-
- .Hypej .HypejYrL {
- padding: 0 4px 0 4px;
- width: 40px;
- }
-
- .Hypej .HypejYrC {
- border: #666 solid 1px;
- font-size: .9em;
- padding: 1px;
- }
-
- .Hypej .HypejYrLn {
- background-image: url(https://weblio.hs.llnwd.net/e7/img/iconCclBlS.png);
- background-position: left 5px;
- background-repeat: no-repeat;
- line-height: 1.2em;
- margin: 0;
- padding: 0 0 0 16px;
- }
-
- .Hypej .HypejYrEn {
- font-family: Arial;
- font-weight: bold;
- }
-
- .Hypej .HypejLb {
- background-color: #eee;
- border: #999 solid 1px;
- color: #333;
- font-size: 1em;
- font-weight: normal;
- margin: 0 2px 0 3px;
- padding: 1px;
- }
-
- .Hypej .HypejB {
- background-color: #fffcf8;
- border-collapse: collapse;
- width: 80%;
- }
-
- .Hypej .HypejB tr th {
- border: #808080 solid 1px;
- padding: 3px;
- }
-
- .Hypej .HypejB tr td {
- border: #808080 solid 1px;
- padding: 3px;
- }
-
- .Hypej .onseiSwf {
- padding: 10px 0 0 2px;
- vertical-align: middle;
- }
-
- .Gkzkj .level0 {
- margin: 0;
- padding: 0;
- }
-
- .Efref .efrefA {
- color: #999;
- font-size: 1em;
- margin: 0 0 12px;
- }
-
- .Nkjtn .nkjtnI caption {
- font-weight: bold;
- }
-
- h2.midashigo .cgkgjSm,.Cgkgj .cgkgjSm {
- font-size: .6em;
- margin-left: .4em;
- }
-
- .Cgkgj .level0 {
- margin: 0;
- padding: 0;
- }
-
- .EgtejLb {
- background-color: #f5efe9;
- border: #534a42 solid 1px;
- border-radius: 2px;
- font-size: 1em;
- font-weight: bold;
- margin: 2px 0;
- margin-right: 8px;
- padding: 0 3px!important;
- white-space: nowrap;
- }
-
- .EgtejRSpc {
- margin-right: 10px;
- }
-
- .EgtejSub,.EgtejSubS {
- background-color: #564c46;
- border: none!important;
- border-radius: 3px;
- color: #fff;
- display: inline;
- font-size: 1em;
- font-weight: normal!important;
- line-height: 30px!important;
- margin-right: 5px;
- padding: 0 5px 3px 5px !important;
- }
-
- .EgtejSubS {
- font-size: 1em;
- }
-
- .EgtejSub a,.EgtejSubS a,.EgtejCcl a {
- color: #fff!important;
- text-decoration: none!important;
- }
-
- .EgtejCcl a {
- line-height: 18px;
- }
-
- .EgtejBld {
- font-weight: bold;
- }
-
- .EgtejYrAr,.EgtejIdxAr {
- margin-top: 3px;
- background-color: #f7f7f7;
- padding: 5px;
- }
-
- .EgtejYrTb {
- border-collapse: collapse;
- width: 100%;
- }
-
- .EgtejYrTb td {
- vertical-align: top;
- }
-
- .EgtejYrImg img {
- width: 100%;
- }
-
- .EgtejYrTb th {
- vertical-align: top;
- width: 40px;
- }
-
- .EgtejWrp {
- margin-left: 2px;
- }
-
- .EgtejCrTb {
- margin-bottom: 10px;
- }
-
- .EgtejCrTb td {
- padding-left: 30px;
- vertical-align: top;
- }
-
- .EgtejCrTb td:first-child {
- padding: 0;
- width: 40%;
- }
-
- .EgtejCrTb td img {
- border: #ccc solid 1px;
- padding: 10px;
- width: 100%;
- }
-
- .EgtejSpc {
- display: inline-block;
- width: 1em;
- }
-
- .EgtejClmTb {
- width: 100%;
- }
-
- .EgtejClmTb td {
- line-height: 1.2em;
- vertical-align: top;
- }
-
- .EgtejClmImg img {
- width: 100%;
- }
-
- .EgtejIdxCld {
- margin-left: 40px;
- margin-right: 10px;
- }
-
- .EgtejSign {
- display: inline-block;
- font-size: 1em;
- line-height: 1.2em;
- margin-top: 10px;
- }
-
- .EgtejCcl {
- background-color: #564c46;
- border-radius: 50%;
- color: #fff;
- display: inline-block;
- font-size: 1em;
- font-weight: bold;
- height: 18px;
- line-height: 18px;
- text-align: center;
- width: 18px;
- }
-
- .EgtejRmIdx {
- font-size: 1em;
- }
-
- .EgtejAncTgt {
- display: none;
- }
-
- .EgtejAncTgt+.br {
- margin-bottom: 1em;
- }
-
- .EgtejAncLnk {
- text-decoration: none;
- }
-
- .CtbdsWrp {
- margin: 0 15px 25px 4px;
- }
-
- .CtbdsWrpNt {
- margin-top: 36px;
- margin-bottom: 36px;
- }
-
- .Jfwik .level0,.Jfwik .level0Head {
- font-size: 1.4em;
- font-weight: bold;
- margin: 10px 0 2px 0;
- padding-left: 5px;
- }
-
- .Jfwik .level0Head {
- margin-top: 0;
- }
-
- .Jfwik .level0 span,.Jfwik .level0Head span {
- border: #95adce solid;
- border-width: 0 0 0 8px;
- padding: 3px 2px 2px 0;
- }
-
- .flex-rectangle-ads-frame {
- display: flex;
- justify-content: space-around;
- align-items: center;
- }
-
- .intrstR .conjugateRowL {
- width: 14%;
- vertical-align: top;
- }
-
- .summaryM {
- margin-bottom: 5px;
- }
-
- .summaryHead {
- display: flex;
- align-items: center;
- }
-
- img {
- display: inline;
- }
-
- .qotC {
- margin: 0.5em 0;
- }
-
- .qotC p {
- margin: 0;
- }
-
- .qotCJE .squareCircle,
- .qotCE .squareCircle {
- display: none;
- }
-
- .CtbdsLb {
- background-color: #564c46;
- color: #fff;
- font-size: 15px;
- font-weight: normal;
- margin: 0 6px 0 4px;
- padding: 3px 5px!important;
- white-space: nowrap;
- }
-
- .CtbdsLbNt {
- font-size: 20px;
- }
-
- .CtbdsTdCore,.CtbdsTdPoint {
- width: auto;
- }
-
- .CtbdsWrp {
- margin: 0 15px 25px 4px;
- }
-
- .CtbdsWrpNt {
- margin-top: 36px;
- margin-bottom: 36px;
- }
-
- .CtbdsCat,.CtbdsPv {
- margin: 10px 0;
- }
-
- .CtbdsPv {
- font-weight: bold;
- }
-
- .CtbdsSemSpaced {
- margin-bottom: 10px;
- }
-
- .CtbdsExAr {
- background-color: #e8e8e8;
- height: auto;
- margin: 0 5px 5px 5px;
- padding: 5px;
- }
-
- .CtbdsEx {
- padding-left: 20px;
- margin: 0;
- }
-
- .CtbdsEx li {
- list-style-type: disc;
- }
-
- .CtbdsMetaTb {
- border-spacing: 0;
- margin: 0 0 15px 0;
- }
-
- .CtbdsMetaTb td {
- vertical-align: top;
- }
-
- .jmnedGls {
- margin: 0;
- }
-
- .br {
- margin-bottom: 5px;
- }
-
- .level0 .br {
- margin: 0;
- }
-
- .Nekym table {
- width: 100%;
- table-layout: fixed;
- border-collapse: collapse;
- border: 1px #696969 solid;
- }
-
- .Nekym table th {
- background-color: #f5f5f5;
- border: 1px #696969 solid;
- font-weight: bold;
- padding: 3px;
- white-space: nowrap;
- }
-
- .Nekym table td {
- border: 1px #696969 solid;
- padding: 5px;
- line-height: 1.3em;
- }
-
- .Nekym .nekymS {
- border-left: #815733 solid 6px;
- font-size: 1.3em;
- font-weight: bold;
- line-height: 1.0em;
- margin: 10px 0 5px 0;
- padding-left: 3px;
- }
-
- .KejjeIdH {
- border-left: #564c46 solid 6px;
- font-size: 1.2em;
- line-height: 1.0em;
- margin: 10px 0 5px 0;
- padding-left: 3px;
- }
-
- .phraseEjjeT td {
- vertical-align: top;
- }
-
- .nwnejThL {
- margin-top: 1em;
- }
-
- .qotHS {
- background-color: #f5efe9;
- border: #534a42 solid 1px;
- padding: 0 2px;
- }
-
- .qotCE {
- color: #564c46;
- font-weight: bold;
- line-height: 1.2;
- margin: 2px 0 2px 0;
- padding: 0;
- }
-
- .qotCJ {
- color: #564c46;
- line-height: 1.2em;
- margin: -1px 0 13px 0;
- padding: 0;
- }
-
- .phraseEjjeT {
- width: 100%;
- }
-}
diff --git a/src/components/dictionaries/weblioejje/_style.shadow.scss b/src/components/dictionaries/weblioejje/_style.shadow.scss
new file mode 100644
index 000000000..4966b2852
--- /dev/null
+++ b/src/components/dictionaries/weblioejje/_style.shadow.scss
@@ -0,0 +1,3724 @@
+@import '@/_sass_global/_reset.scss';
+@import '@/components/Speaker/Speaker.scss';
+@import '@/components/EntryBox/EntryBox.scss';
+
+.Liscj .liscjWC {
+ font-style: italic;
+}
+
+.Jmdct .jmdctYm,
+.Jmdct .jmdctDm {
+ margin: 4px 0 4px 0;
+}
+
+.Jmdct .jmdctGlsL {
+ float: left;
+ margin: 0;
+ vertical-align: top;
+ width: 20px;
+}
+
+.Jmdct .jmdctGlsR {
+ float: left;
+ margin: 0;
+ vertical-align: top;
+}
+
+.Jmdct .jmdctL {
+ background-color: #f0f0f0;
+ border: #666 solid 1px;
+ color: #363636;
+ font-size: 0.9em;
+ font-weight: normal;
+ line-height: 1em;
+ margin-right: 8px;
+ padding: 1px;
+}
+
+.Jmdct table td.jmdctT {
+ text-align: right;
+ vertical-align: top;
+ width: 70px;
+}
+
+.Jmned .jmnedYm,
+.Jmned .jmnedDm,
+.Jmned .jmnedGls {
+ margin: 0;
+ padding: 0;
+}
+
+.Jmned {
+ border-collapse: collapse;
+}
+
+.Jmned table {
+ border-collapse: collapse;
+ border: 1px #696969 solid;
+ width: 100%;
+}
+
+.Jmned table th {
+ background-color: #f5f5f5;
+ border: 1px #696969 solid;
+ font-weight: bold;
+ padding: 3px;
+ white-space: nowrap;
+}
+
+.Jmned table td {
+ border: 1px #696969 solid;
+ padding: 5px;
+ line-height: 1.3em;
+}
+
+.Jmned .jmnedL {
+ font-weight: bold;
+}
+
+.Jmned .jmnedC {
+ width: 20%;
+}
+
+.Jmned .jmnedR {
+ width: 60%;
+}
+
+.Jmned .jmnedInfo {
+ background-color: #f5f5f5;
+ border: #b5b6b5 solid 1px;
+ font-size: 0.9em;
+ line-height: 1.62em;
+ margin: 1em 0 0 0;
+ padding: 10px;
+}
+
+.Stwdj .stwdjS {
+ border-left: #815733 solid 6px;
+ font-size: 1.3em;
+ font-weight: bold;
+ line-height: 1em;
+ margin: 10px 0 5px 0;
+ padding-left: 3px;
+}
+
+.Stwdj .stwdjC,
+.Stwdj .stwdjC a {
+ line-height: 1em;
+}
+
+.Stwdj .stwdjHdC {
+ background-color: #f0f0f0;
+ border: #666 solid 1px;
+ color: #363636;
+ font-size: 0.9em;
+ padding: 1px;
+}
+
+.Stwdj .stwdjYr {
+ margin-top: 10px;
+ padding: 5px;
+}
+
+.Stwdj .stwdjYr a {
+ color: #000;
+}
+
+.Stwdj .stwdjYr a:hover {
+ color: #000;
+}
+
+.Stwdj .stwdjYr a:active {
+ color: #000;
+}
+
+.Stwdj .stwdjYr a:visited {
+ color: #000;
+}
+
+.Stwdj .stwdjYr div {
+ line-height: 1em;
+ margin-left: 10px;
+}
+
+.Stwdj .stwdjYr sup {
+ line-height: 1em;
+ margin: 0;
+ padding: 0;
+}
+
+.Stwdj .stwdjYrHd i,
+.Stwdj .stwdjYrHdFld i {
+ margin-bottom: -2px;
+ margin-right: 3px;
+}
+
+.Stwdj .stwdjYrHd:before,
+.Stwdj .stwdjYrHdFld:before {
+ margin-right: 3px;
+}
+
+.Stwdj .stwdjYrHdFld img,
+.Stwdj .stwdjYrHdFld span {
+ cursor: pointer;
+}
+
+.Stwdj .stwdjYrHd .stwdjHdC {
+ border: #666 solid 1px;
+ color: #363636;
+ font-size: 0.9em;
+ margin-left: 16px;
+ padding: 1px;
+}
+
+.Stwdj .stwdjYrHdFld .stwdjHdC {
+ border: #666 solid 1px;
+ color: #363636;
+ font-size: 0.9em;
+ padding: 1px;
+}
+
+.Stwdj .stwdjR,
+.Stwdj .stwdjRF {
+ background-image: url(https://weblio.hs.llnwd.net/e7/img/iconCclBlS.png);
+ background-position: 2px 8px;
+ background-repeat: no-repeat;
+ font-family: Arial;
+ font-weight: normal;
+ margin: 2px 0 0 24px;
+ padding: 0 0 0 14px;
+}
+
+.Stwdj .stwdjRF {
+ display: none;
+}
+
+.Stwdj .stwdjBld {
+ font-weight: bold;
+ font-weight: bold;
+}
+
+.Stwdj .stwdjNH,
+.Stwdj .stwdjAH,
+.Stwdj .stwdjNB {
+ float: left;
+ margin: 0;
+ padding: 0;
+ vertical-align: bottom;
+}
+
+.Stwdj .stwdjNB {
+ margin: 0.3em 0 0 0;
+ padding: 0.1em 0 0 0;
+}
+
+.Edrnt .edrntC {
+ background-color: #f0f0f0;
+ border: #666 solid 1px;
+ color: #363636;
+ font-size: 0.9em;
+ padding: 1px;
+}
+
+.Jjabc ruby {
+ font-size: 120%;
+}
+
+.infobox.sisterproject {
+ font-size: 90%;
+ width: 20em;
+}
+
+td.sub_yomi {
+ background-image: url(https://weblio.hs.llnwd.net/e7/img/jinmei_haikei1.png);
+ background-repeat: repeat-y;
+ border-color: #b5d2e2;
+ border-width: 1px 1px 0 0;
+ border-style: solid;
+ color: #4f519b;
+ font-weight: bold;
+ padding: 5px 5px 5px 15px;
+ width: 80px;
+}
+
+td.item_yomi {
+ border-top: 1px dashed #c0c0c0;
+ padding: 5px 5px 5px 10px;
+}
+
+.Dkijt .kanren {
+ text-indent: 0.75em;
+}
+
+.Jeepm table {
+ border: #000 solid 1px;
+ border-collapse: collapse;
+ text-align: center;
+}
+
+.Jeepm td {
+ border: #000 solid 1px;
+ text-align: center;
+}
+
+.Jeepm .header {
+ border-left: #fff solid 1px;
+ border-right: #fff solid 1px;
+ border-top: #fff solid 1px;
+ font-weight: bold;
+ text-align: left;
+}
+
+.LiscjYr .kanren {
+ font-family: Arial;
+ margin: 5px 0 0 24px;
+}
+
+.Wkgje .wkgjeL {
+ float: left;
+ margin: 0 0 0 4px;
+ padding: 0;
+ width: 80px;
+}
+
+.Wkgje .wkgjeR {
+ float: left;
+ margin: 0 0 0 4px;
+ padding: 0;
+ width: 500px;
+}
+
+.Jawik .level1Block {
+ display: block;
+ font-size: 1.2em;
+ font-weight: normal;
+ margin: 2px 0 2px 10px;
+}
+
+.Jawik .level1Block b {
+ font-weight: bold;
+}
+
+.Jawik .level1,
+.Jawik .level2,
+.Jawik .level1Ex {
+ display: inline;
+}
+
+.Jawik .level1 b,
+.Jawik .level2 b,
+.Jawik .level2Block b {
+ background-color: #eee;
+ border: #999 solid 1px;
+ color: #333;
+ font-weight: normal;
+ padding: 0 2px;
+ margin: 0 5px 0 2px;
+}
+
+.Wehgj .wehgjT span,
+.Wehgj .wehgjE span,
+.Wehgj .wehgjR span {
+ background-color: #f0f0f0;
+ border: #666 solid 1px;
+ color: #363636;
+ font-size: 0.9em;
+ line-height: 1em;
+ padding: 1px;
+}
+
+.Wehgj .wehgjE,
+.Wehgj .wehgjR {
+ padding: 0 0 0 16px;
+}
+
+.Jfwik .level1Block {
+ display: block;
+ font-size: 1.2em;
+ font-weight: normal;
+ margin: 2px 0 2px 10px;
+}
+
+.Jfwik .level1Block b {
+ font-weight: bold;
+}
+
+.Jfwik .level1,
+.Jfwik .level2,
+.Jfwik .level1Ex {
+ display: inline;
+}
+
+.Jfwik .level1 b,
+.Jfwik .level2 b,
+.Jfwik .level2Block b {
+ background-color: #eee;
+ border: #999 solid 1px;
+ color: #333;
+ font-weight: normal;
+ padding: 0 2px;
+ margin: 0 5px 0 2px;
+}
+
+.wrpCmp {
+ border: #06c solid;
+ border-width: 0 0 1px 0;
+ height: 25px;
+ margin: 15px 0 5px 0;
+}
+
+.wrpCmp p {
+ border: #06c solid;
+ border-width: 0 0 0 5px;
+ font-size: 1.3em;
+ height: 20px;
+ margin: 0;
+ padding: 0 0 3px 5px;
+}
+
+.wrpCmp p a {
+ color: #000;
+ font-weight: bolder;
+}
+
+.wrpCmpCom {
+ border: #de7d29 solid;
+ border-width: 0 0 1px 0;
+ height: 25px;
+ margin: 15px 0 5px 0;
+}
+
+.wrpCmpCom p {
+ border: #de7d29 solid;
+ border-width: 0 0 0 5px;
+ font-size: 1.3em;
+ height: 20px;
+ margin: 0;
+ padding: 0 0 3px 5px;
+}
+
+.wrpCmpCom p a {
+ color: #000;
+ font-weight: bolder;
+}
+
+.wrpEx {
+ height: 25px;
+ margin: 0;
+}
+
+.wrpEx p {
+ color: #525152;
+ font-size: 1em;
+ height: 20px;
+ margin: 0 0.5em 0 0;
+ padding: 3px 0 0 5px;
+}
+
+.wrpEx p a:link,
+.wrpEx p a:visited,
+.wrpEx p a:active {
+ color: #525152;
+ font-size: 1em;
+ text-decoration: none;
+}
+
+.wrpEx p span {
+ color: #9c9a9c;
+ font-size: 0.7em;
+}
+
+.wrpEx p.wrpExFL {
+ color: #525152;
+ font-size: 0.8em;
+ height: 20px;
+ margin: 0 0.5em 0 0;
+ padding: 3px 0 0 5px;
+}
+
+.kijiEx {
+ color: #000;
+ font-size: 1em;
+ line-height: 1.8em;
+ margin-bottom: 15px;
+}
+
+.kijiEx * {
+ font-size: 100%;
+ line-height: 1.8em;
+}
+
+.wrpExTxt {
+ margin: 0 0 -8px 0;
+}
+
+.wrpExTxt p {
+ font-size: 1em;
+ margin-right: 0.5em;
+ padding: 0 0 0 5px;
+}
+
+.kijiWrpTxt p.adDes {
+ font-size: 95%;
+}
+
+.wrpExTxt p > a {
+ text-decoration: none;
+}
+
+.wrpExTxt p a:hover {
+ color: #f00;
+}
+
+.wrpExTxt p a:link,
+.wrpExTxt p a:visited {
+ color: #525152;
+}
+
+.kijiWrpTxt {
+ font-size: 90%;
+ margin: 0 0 15px 0;
+ padding: 0;
+}
+
+.wrpAdFTxt p {
+ color: #525152;
+ font-size: 0.9em;
+ line-height: 1.8em;
+ margin: 14px 0 14px 6px;
+}
+
+.wrpIMCmp {
+ border: #06c solid;
+ border-width: 0 0 1px 0;
+ height: 25px;
+ margin: 5px 0 5px 0;
+}
+
+.wrpIMCmp p {
+ border: #06c solid;
+ border-width: 0 0 0 5px;
+ font-size: 1.1em;
+ font-weight: bolder;
+ height: 18px;
+ margin: 0;
+ padding: 2px 0 5px 5px;
+}
+
+.wrpIMCmp p a {
+ color: #000;
+ font-size: 0.8em;
+ font-weight: normal;
+}
+
+.wrpIMCmpCom {
+ border: #de7d29 solid;
+ border-width: 0 0 1px 0;
+ height: 25px;
+ margin: 5px 0 5px 0;
+}
+
+.wrpIMCmpCom p {
+ border: #de7d29 solid;
+ border-width: 0 0 0 5px;
+ font-size: 1.1em;
+ font-weight: bolder;
+ height: 18px;
+ margin: 0;
+ padding: 2px 0 5px 5px;
+}
+
+.wrpIMCmpCom p a {
+ color: #000;
+ font-size: 0.8em;
+ font-weight: normal;
+}
+
+#main .spoBoxHEYO {
+ background-color: #feaa15;
+ border: #e38e00 solid;
+ border-width: 0 0 1px 0;
+ color: #fff;
+ font-weight: bold;
+ margin: 0 4px 0 20px;
+ padding: 5px 3px 5px 7px;
+ text-align: left;
+}
+
+#main .spoBoxBEYO {
+ border: #ccc solid;
+ border-width: 0 1px 1px 1px;
+ margin: 0 4px 10px 20px;
+}
+
+#main .spoBoxHEYOT {
+ background-color: #9097a2;
+ border: #868d99 solid;
+ border-width: 0 0 1px 0;
+ color: #fff;
+ font-weight: bold;
+ margin: 0 4px 0 0;
+ padding: 5px 3px 5px 7px;
+ text-align: left;
+}
+
+#main .spoBoxBEYOT {
+ border: #ccc solid;
+ border-width: 0 1px 1px 1px;
+ margin: 0 4px 10px 0;
+}
+
+.ejjeScCnt {
+ margin: 0 0 10px 0;
+ width: 99%;
+ _width: 100%;
+}
+
+.ejjeScCnt .chsShwcsH {
+ background-color: #feaa15;
+ border: #feaa15 solid 1px;
+ border-bottom: #e38e00 solid 1px;
+ color: #fff;
+ font-size: 1em;
+ font-weight: bold;
+ margin: 0;
+ padding: 4px 0;
+ width: 100%;
+}
+
+.ejjeScCnt .chsShwcsHT {
+ padding: 0 5px;
+}
+
+.ejjeScCnt .chsShwcsC {
+ border: #ccc solid;
+ border-width: 0 1px 1px 1px;
+ margin: 0;
+ padding: 2px 0 3px 0;
+ width: 100%;
+}
+
+.ejjeScCnt .chsShwcsT {
+ border-collapse: collapse;
+ margin: 2px 0 2px 0;
+ padding: 0;
+ width: 100%;
+}
+
+.ejjeScCnt .chsShwcsTD {
+ border-collapse: collapse;
+ margin: 0;
+ padding: 2px 0 2px 6px;
+ _padding: 2px 0 2px 2px;
+ vertical-align: top;
+ width: 33%;
+}
+
+.ejjeScCnt .chsShwcsTD a {
+ font-size: 1em;
+}
+
+.ejjeScCnt .chsShwcsTD a:active,
+.ejjeScCnt .chsShwcsTD a:link,
+.ejjeScCnt .chsShwcsTD a:visited {
+ color: #06c;
+}
+
+.ejjeScCnt .chsShwcsTD a:hover {
+ color: #d50000;
+}
+
+.ejjeScCnt .chsShwcsTD span {
+ font-size: 0.85em;
+ font-weight: normal;
+}
+
+.treeBoxC .adIFLeftE {
+ color: #06c;
+ font-size: 0.7em;
+ text-align: right;
+}
+
+.JWAdsR .highlight {
+ background-color: transparent;
+}
+
+.AdR .highlight {
+ background-color: transparent;
+}
+
+.clrBc {
+ clear: both;
+ display: block;
+ font-size: 0;
+ line-height: 0;
+ overflow: hidden;
+}
+
+.highlight-menu {
+ background-color: #f8f9ff;
+ display: none;
+ top: 0;
+ height: auto;
+ position: absolute;
+ left: 0;
+ z-index: 10;
+}
+
+.highlight-menu table {
+ background-color: #f6f6f6;
+ border: #b5b5b5 solid 1px;
+ border-collapse: separate;
+ border-spacing: 4px;
+}
+
+.highlight-menu table td {
+ cursor: pointer;
+ height: 24px;
+ margin: 0;
+ text-align: center;
+ padding: 0;
+ width: 24px;
+}
+
+.highlight-menu img {
+ width: 24px;
+}
+
+.highlight-menu #pick-del img {
+ width: 22px;
+}
+
+.red {
+ background-color: #fcc;
+}
+
+.highlight-menu-sub {
+ position: relative;
+}
+
+.highlight-menu table.hl-tbl-hz td {
+ padding-right: 5px;
+}
+
+.highlight-menu table.hl-tbl-hz td:last-child {
+ padding-right: 0;
+}
+
+.highlight-dfcl .hl-pick-dfcolor-table {
+ margin: 37px 0 15px;
+ table-layout: fixed;
+ width: 100%;
+}
+
+.highlight-dfcl .hl-pick-dfcolor-table td {
+ padding: 0;
+ text-align: left;
+}
+
+.highlight-dfcl .dfclsq {
+ box-sizing: border-box;
+ cursor: pointer;
+ display: inline-block;
+ height: 40px;
+ line-height: 40px;
+ text-align: center;
+ vertical-align: middle;
+ width: 40px;
+}
+
+.highlight-dfcl .dfclsq > span {
+ background-color: #585858;
+ display: none;
+ height: 8px;
+ margin-top: 16px;
+ width: 8px;
+}
+
+.highlight-dfcl #dfslsq-yellow {
+ background-color: #ffe467;
+}
+
+.highlight-dfcl #dfslsq-blue {
+ background-color: #75baff;
+}
+
+.highlight-dfcl #dfslsq-green {
+ background-color: #82d131;
+}
+
+.highlight-dfcl #dfslsq-red {
+ background-color: #ffa4a4;
+}
+
+.highlight-dfcl .dfclmsg-yellow,
+.highlight-dfcl .dfclmsg-blue,
+.highlight-dfcl .dfclmsg-green,
+.highlight-dfcl .dfclmsg-red {
+ font-size: 0.78em;
+}
+
+.highlight-dfcl .hl-pick-dfcolor-table td.dfclmsg-td {
+ padding-left: 11px;
+}
+
+.highlight-htu .sect {
+ line-height: 1.7em;
+ margin-bottom: 23px;
+}
+
+.highlight-htu .sect ol {
+ margin: 0;
+ padding-left: 16px;
+}
+
+.highlight-htu .semi-heading {
+ font-size: 1.07em;
+ font-weight: bold;
+ margin-bottom: 3px;
+}
+
+.highlight-htu .hl-page-heading {
+ margin-bottom: 23px;
+}
+
+.highlight-lib .formBlk {
+ overflow: hidden;
+}
+
+.highlight-lib .hl-sortWrp {
+ float: left;
+}
+
+.highlight-lib .hl-searchWrp {
+ float: right;
+}
+
+.highlight-lib .searchHlBtn {
+ background-color: #564c46;
+ box-shadow: 0 2px 0 0 #000;
+ font-size: 0.92em;
+ height: 25px;
+ line-height: 25px;
+ margin: 0;
+ padding: 0 10px;
+}
+
+.highlight-lib input[name='q'] {
+ border: 0;
+ border: solid 1px #ccc;
+ border-radius: 2px;
+ font-family: Arial, sans-serif;
+ height: 27px;
+ margin: 0 3px 0 0;
+ padding-left: 3px;
+}
+
+.highlight-lib .hl-content-wrap {
+ margin-top: 18px;
+}
+
+.highlight-lib .hl-content {
+ margin-bottom: 39px;
+}
+
+.highlight-lib .hl-title {
+ margin-bottom: 12px;
+ font-weight: bold;
+}
+
+.highlight-lib .hl-item {
+ background-color: #f9f9f9;
+ margin-bottom: 5px;
+ padding: 7px 10px;
+ position: relative;
+}
+
+.highlight-lib .hl-item p {
+ border-style: solid;
+ border-width: 0 0 0 4px;
+ float: left;
+ padding-left: 11px;
+ width: 93%;
+}
+
+.red-left-border {
+ border-color: #ffa4a4;
+}
+
+.highlight-lib .hl-item-edit {
+ cursor: pointer;
+ display: none;
+ float: right;
+}
+
+.highlight-lib .hl-more-less,
+.highlight-lib .hl-title a {
+ border-bottom: #000 dotted 1px;
+ font-size: 0.85em;
+ padding-bottom: 1px;
+ text-decoration: none;
+}
+
+.highlight-lib .highlight-edit {
+ display: none;
+ right: -38px;
+ top: 0;
+ position: absolute;
+ z-index: 1;
+}
+
+.highlight-lib .highlight-edit table {
+ background-color: #f6f6f6;
+ border: #b5b5b5 solid 1px;
+ border-collapse: separate;
+ border-spacing: 4px;
+}
+
+.highlight-lib .highlight-edit table td {
+ cursor: pointer;
+ height: 24px;
+ margin: 0;
+ text-align: center;
+ padding: 0;
+ width: 24px;
+}
+
+.highlight-lib .highlight-edit table div {
+ height: 100%;
+ line-height: 24px;
+}
+
+.highlight-lib .highlight-edit .edit-del img {
+ width: 24px;
+}
+
+.highlight-lib .hlpaginationWrp {
+ text-align: center;
+}
+
+.highlight-lib .hl-pagination {
+ border-radius: 4px;
+ display: inline-block;
+ margin: 20px 0;
+ padding-left: 0;
+}
+
+.highlight-lib .hl-pagination > li {
+ display: inline;
+}
+
+.highlight-lib .hl-pagination > li:first-child > a {
+ border-top-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ margin-left: 0;
+}
+
+.highlight-lib .hl-pagination > li:last-child > a {
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+}
+
+.highlight-lib .hl-pagination > li > a {
+ background-color: #fff;
+ border: 1px solid #ddd;
+ color: #337ab7;
+ float: left;
+ line-height: 1.42857143;
+ margin-left: -1px;
+ position: relative;
+ padding: 2px 10px;
+ text-decoration: none;
+}
+
+.highlight-lib .hl-pagination > li i {
+ line-height: 1.42857143;
+}
+
+.highlight-lib .hl-pagination a:link,
+.highlight-lib .hl-pagination a:visited,
+.highlight-lib .hl-pagination a:hover,
+.highlight-lib .hl-pagination a:active {
+ color: #534a42 !important;
+ display: inline-block;
+ text-decoration: none;
+}
+
+.highlight-lib .hl-pagination a:hover {
+ background-color: #aac9e9;
+}
+
+.highlight-lib .hl-pagination .active a {
+ background-color: #e4e4e4;
+ cursor: default;
+}
+
+#hl-sticky-menu-library .fa {
+ color: #534a42;
+ font-size: 1.64em;
+}
+
+.stickyMenuSampleWrp .smClPk .fa {
+ display: inline-block;
+ font-size: 1.92em;
+ text-align: center;
+ width: 24px;
+}
+
+.introjs-arrow.right {
+ right: -10px;
+ top: 10px;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-bottom-color: transparent;
+ border-left-color: white;
+}
+
+.introjs-arrow.right-bottom {
+ bottom: 10px;
+ right: -10px;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-bottom-color: transparent;
+ border-left-color: white;
+}
+
+.introjs-arrow.left {
+ left: -10px;
+ top: 10px;
+ border-top-color: transparent;
+ border-right-color: white;
+ border-bottom-color: transparent;
+ border-left-color: transparent;
+}
+
+.introjs-arrow.left-bottom {
+ left: -10px;
+ bottom: 10px;
+ border-top-color: transparent;
+ border-right-color: white;
+ border-bottom-color: transparent;
+ border-left-color: transparent;
+}
+
+.pinned-content-header .fa-thumb-tack,
+.pinned-content-header span .fa-square {
+ color: #534a42;
+}
+
+.fa-rotate-315 {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3.5);
+ -webkit-transform: rotate(315deg);
+ -ms-transform: rotate(315deg);
+ -moz-transform: rotate(315deg);
+ -o-transform: rotate(315deg);
+ transform: rotate(315deg);
+}
+
+.pinned-content-button-wrapper > .error {
+ font-size: 0.71em;
+ background-color: #f8ddde;
+ text-align: center;
+ margin-bottom: 5px;
+ display: none;
+}
+
+.pinned-content-button-wrapper > .error {
+ letter-spacing: 1.4;
+ padding: 2px 0;
+ width: 80%;
+ margin: 0 auto 10px;
+}
+
+.pinned-content-button-wrapper > .error a {
+ font-weight: bold;
+ color: #000;
+}
+
+.pinned-content-button-wrapper.show > .error {
+ display: block;
+}
+
+.pinned-content-button-wrapper .add-word-list-button .fa {
+ margin-right: 5px;
+}
+
+.modal-wrapper .loading .fa {
+ color: #fff;
+ font-size: 6.42em;
+ left: 38%;
+ position: absolute;
+ top: 40%;
+}
+
+.modal-wrapper.for-already-exists .modal-close-wrapper .fa-stack {
+ position: absolute;
+ right: 0;
+ top: 0;
+ transform: scale(0.5);
+ cursor: pointer;
+}
+
+.modal-wrapper.for-already-exists .modal-close-wrapper .fa-stack:hover {
+ opacity: 0.7;
+}
+
+.free-member-features-modal .modal-message:not(.registered):not(.login) {
+ float: left;
+ margin: 10px 0 20px 30px;
+}
+
+.free-member-features-modal .modal-message div {
+ font-weight: normal;
+ margin: 0 !important;
+}
+
+.free-member-features-modal .modal-message div:first-child {
+ margin: 0 0 15px 0 !important;
+}
+
+.free-member-features-modal .modal-message div:first-child span {
+ font-size: 2em;
+}
+
+.free-member-features-modal .modal-message div:first-child span:first-child {
+ font-weight: bold;
+}
+
+.free-member-features-modal .modal-message div:not(:first-child) {
+ font-size: 1.28em;
+}
+
+.free-member-features-modal .modal-message div.sentence-list-features {
+ line-height: 2em;
+}
+
+.free-member-features-modal .modal-message:not(.registered) .modal-login-link {
+ margin: 0;
+}
+
+.free-member-features-modal
+ .modal-message:not(.registered)
+ .modal-login-link:hover {
+ color: #534a42;
+ filter: alpha(opacity=70);
+ opacity: 0.7;
+}
+
+.free-member-features-modal .modal-example {
+ float: none;
+ margin: 5px 0 0;
+}
+
+.free-member-features-modal .modal-example img {
+ box-shadow: none;
+
+ -webkit-box-shadow: none;
+}
+
+.free-member-features-modal .free-register-wrap:not(.login):not(.registered) {
+ border-collapse: separate;
+ border-spacing: 15px 0;
+ display: table;
+ margin-left: 15px;
+}
+
+.free-member-features-modal .free-member-features {
+ border: #aaa solid 1px;
+ display: table-cell;
+ vertical-align: top;
+}
+
+.free-member-features-modal .free-member-features > div:first-child {
+ background-color: #ea9035;
+ color: #fff;
+ font-size: 1.42em;
+ padding: 7px 0;
+}
+
+.free-member-features-modal .free-member-features .free-member-feature-content {
+ display: inline-block;
+ margin: 20px 10px;
+}
+
+.free-member-features-modal
+ .free-member-features
+ .free-member-feature-content
+ img {
+ margin: 10px 0;
+}
+
+.free-member-features-modal
+ .free-member-features
+ .free-member-feature-content
+ div {
+ text-align: left;
+}
+
+.free-member-features-modal .free-member-features > div:last-child {
+ margin-bottom: 10px;
+}
+
+.free-member-features-modal .free-member-features > div:last-child span {
+ font-weight: bold;
+}
+
+.free-member-features-modal
+ .free-register-wrap:not(.login):not(.registered)
+ .free-register {
+ border: #48a267 solid 1px;
+ display: table-cell;
+ position: relative;
+}
+
+.free-member-features-modal .free-register > div:first-child {
+ left: 3px;
+ position: absolute;
+ top: -30px;
+}
+
+.free-member-features-modal
+ .free-register-wrap.login
+ .free-register
+ > div:first-child,
+.free-member-features-modal
+ .free-register-wrap.registered
+ .free-register
+ > div:first-child {
+ display: none;
+}
+
+.free-member-features-modal
+ .free-register-wrap:not(.login)
+ .free-register
+ .modal-error-message {
+ margin-top: 15px;
+}
+
+.free-member-features-modal .free-register .footer span {
+ line-height: 14px;
+}
+
+.free-member-features-modal .free-register .modal-register-button {
+ font-weight: normal;
+ margin: 10px auto;
+}
+
+.free-member-features-modal .free-register .free-register-link {
+ display: inline-block;
+ margin-bottom: 10px;
+}
+
+.free-member-features-modal .free-register .free-register-link:hover {
+ color: #534a42;
+ filter: alpha(opacity=70);
+ opacity: 0.7;
+}
+
+.free-member-features-modal.hidden .free-member-features {
+ display: none;
+}
+
+.userInfo .right-cell {
+ padding-left: 5px;
+}
+
+.userInfo .right-cell .free-description {
+ font-size: 1em;
+ margin-left: 6px;
+ margin-bottom: 8px;
+ letter-spacing: 3px;
+}
+
+.userInfo .right-cell .free-description span {
+ letter-spacing: 0;
+ padding-right: 3px;
+}
+
+.userInfo .right-cell .free-description span span {
+ font-size: 0.85em;
+}
+
+.userInfo .right-cell .free-button {
+ display: block;
+ height: 35px;
+
+ margin: 6px 0 0;
+}
+
+.userInfo .right-cell .free-button:hover {
+ opacity: 0.7;
+}
+
+.userInfo .right-cell .free-button:active {
+ box-shadow: none !important;
+ position: relative;
+ top: 2px;
+}
+
+.userInfo .right-cell .merits {
+ margin: 4px 0;
+}
+
+.userInfo .right-cell .merits p {
+ font-size: 0.78em;
+ font-weight: bold;
+ margin-bottom: 4px;
+}
+
+.userInfo .right-cell .merits p img {
+ width: 12px;
+ padding: 0 8px;
+}
+
+.userInfo .left-cell {
+ text-align: center;
+}
+
+.userInfo .left-cell .member-state-label {
+ color: #fff;
+ display: block;
+ width: 80px;
+ text-align: center;
+ height: 30px;
+ box-sizing: border-box;
+ padding: 5px 0;
+ font-size: 90%;
+}
+
+.userInfo .left-cell .member-state-label.free {
+ background-color: #48a267;
+}
+
+.userInfo .left-cell .member-state-label.premium {
+ background-color: #ea9034;
+ font-size: 70%;
+ padding: 6.3px 0;
+}
+
+#sideBHPAEjje > .error {
+ background-color: #f8ddde;
+ display: none;
+ font-size: 0.71em;
+ letter-spacing: 1.4;
+ margin-bottom: 5px;
+ padding: 0 5px;
+ text-align: center;
+}
+
+#sideBHPAEjje > .error a {
+ color: #000;
+ font-weight: bold;
+}
+
+#sideBHPAEjje.show > .error {
+ display: block;
+}
+
+.footer_banner .title .small {
+ font-size: 0.92em;
+}
+
+.footer_banner ul.features {
+ font-size: 0.85em;
+ list-style-type: none;
+ color: #534a41;
+ margin: 0;
+ padding: 10px 0;
+ line-height: 17px;
+}
+
+.footer_banner ul.features li {
+ margin-left: 70px;
+ padding: 5px 0;
+ position: relative;
+}
+
+.footer_banner ul.features li:before {
+ content: '';
+ width: 17px;
+ height: 17px;
+ background-position: center center;
+ background-repeat: no-repeat;
+ position: absolute;
+ top: 5px;
+ left: -25px;
+}
+
+.footer_banner ul.features li.search-history:before {
+ background-image: url(https://weblio.hs.llnwd.net/e7/img/banner/history.png);
+}
+
+.footer_banner ul.features li.vocab-test:before {
+ background-image: url(https://weblio.hs.llnwd.net/e7/img/banner/vocab.png);
+}
+
+.footer_banner ul.features li.folders:before {
+ background-image: url(https://weblio.hs.llnwd.net/e7/img/banner/folders.png);
+}
+
+.footer_banner ul.features li.ads:before {
+ background-image: url(https://weblio.hs.llnwd.net/e7/img/banner/ad.png);
+}
+
+#free-house-ad-on-load-modal-container .header-wrap .modal-close i.fa-times,
+#premium-house-ad-on-load-modal-container .header-wrap .modal-close i.fa-times {
+ color: #595858;
+ font-size: 1.71em;
+ height: 35px;
+ line-height: 35px;
+}
+
+#free-house-ad-on-load-modal-container .features-wrapper {
+ display: flex;
+ flex-wrap: wrap;
+ margin: 25px 5px 10px 5px;
+}
+
+#free-house-ad-on-load-modal-container .features-wrapper .feature {
+ width: calc(33.3333% - 12px);
+ padding: 20px 0 5px;
+ font-size: 1em;
+ text-align: center;
+ vertical-align: top;
+ border: 1px solid #d1d1d1;
+ position: relative;
+ margin: 10px 5px;
+}
+
+#free-house-ad-on-load-modal-container
+ .features-wrapper
+ .feature.other-features {
+ border: none;
+}
+
+#free-house-ad-on-load-modal-container
+ .features-wrapper
+ .feature.other-features
+ img {
+ width: 75%;
+}
+
+#free-house-ad-on-load-modal-container
+ .features-wrapper
+ .feature.other-features:before {
+ display: none;
+}
+
+#free-house-ad-on-load-modal-container .features-wrapper .feature:before {
+ background-color: #e99034;
+ border-radius: 50%;
+ content: '0' counter(feature-number);
+ counter-increment: feature-number;
+ color: #fff;
+ display: inline-block;
+ font-size: 1em;
+ height: 30px;
+ left: 60px;
+ line-height: 30px;
+ position: absolute;
+ top: -15px;
+ width: 30px;
+}
+
+#free-house-ad-on-load-modal-container .features-wrapper .feature span {
+ font-size: 1.28em;
+ font-weight: bold;
+ color: #554c45;
+}
+
+#free-house-ad-on-load-modal-container .features-wrapper .feature div.img-wrap {
+ display: table-cell;
+ height: 65px;
+ text-align: center;
+ vertical-align: middle;
+}
+
+#free-house-ad-on-load-modal-container
+ .features-wrapper
+ .feature
+ div.img-wrap
+ img {
+ width: 40px;
+}
+
+#free-house-ad-on-load-modal-container
+ .features-wrapper
+ .feature
+ div.description {
+ line-height: 18px;
+}
+
+#free-house-ad-on-load-modal-container td div.description,
+#premium-house-ad-on-load-modal-container td div.description {
+ line-height: 18px;
+}
+
+#free-house-ad-on-load-modal-container
+ .features-wrapper
+ .feature
+ .img-wrap
+ img.large {
+ width: 50px;
+}
+
+.clr {
+ clear: both;
+ font-size: 0;
+ line-height: 0;
+ overflow: hidden;
+}
+
+.clrBc {
+ clear: both;
+ display: block;
+ font-size: 0.71em;
+ line-height: 0;
+ overflow: hidden;
+}
+
+#main {
+ float: left;
+ text-align: left;
+ padding: 0 0 0 8px;
+}
+
+.topic {
+ font-size: 75%;
+ height: 44px;
+ line-height: 1.3em;
+ margin: 0 0 2px 0;
+ overflow: hidden;
+ padding-top: 5px;
+ width: 100%;
+ word-break: break-all;
+}
+
+.topic table {
+ height: 30px;
+ width: 100%;
+}
+
+.topicL {
+ font-size: 0.78em;
+ float: left;
+ vertical-align: middle;
+}
+
+.topicLB {
+ font-size: 0.71em;
+}
+
+.topicR {
+ float: right;
+ text-align: right;
+}
+
+.topicR table {
+ border-collapse: collapse;
+ font-size: 1.1em;
+}
+
+.wrp {
+ width: 100%;
+ border-collapse: collapse;
+}
+
+.wrp img.lgDictLg {
+ max-height: 16px !important;
+ width: auto !important;
+}
+
+.wrp img.lgDictSp {
+ height: 18px !important;
+ margin-top: -17px !important;
+}
+
+.left {
+ vertical-align: bottom;
+}
+
+.right {
+ float: right;
+ font-size: 0.9em;
+ margin: 0 5px 0 0;
+ text-align: right;
+ vertical-align: top;
+}
+
+.kijiWrp {
+ padding-left: 1px;
+}
+
+.kijiWrp .lgDict {
+ float: right;
+ margin: 1px 1px 0 0;
+}
+
+.kiji {
+ color: #333;
+ font-size: 1em;
+ line-height: 1.8em;
+}
+
+.kiji * {
+ font-size: 100%;
+ line-height: 1.8em;
+}
+
+.midashigo:before {
+ content: '\25b6';
+}
+
+.midashigo {
+ font-size: 115%;
+ letter-spacing: 0.02em;
+}
+
+crosslink:hover,
+.crosslink:link,
+.crosslink:visited,
+.crosslink:active {
+ color: #534a42;
+ text-decoration: underline;
+}
+
+.kijiFoot {
+ margin-top: 10px;
+ text-align: right;
+}
+
+.linkTagML {
+ width: 60%;
+}
+
+.linkTagML input {
+ border: #ccc solid 1px;
+ height: 20px;
+}
+
+.linkTagMR {
+ text-align: right;
+ vertical-align: bottom;
+ width: 38%;
+}
+
+.linkTagMR table {
+ border-collapse: collapse;
+ float: right;
+ font-size: 80%;
+}
+
+.linkTagMR table td {
+ vertical-align: bottom;
+}
+
+.linkOut {
+ height: 12px;
+ margin-left: 2px;
+ width: 13px;
+}
+
+.intrstR > table {
+ border-spacing: 0 2px;
+}
+
+span.pofsp,
+.KnenjSub {
+ background-color: #564c46;
+ border: none !important;
+ border-radius: 3px;
+ color: #fff;
+ display: inline;
+ font-size: 1.07em !important;
+ font-weight: normal !important;
+ line-height: 30px !important;
+ padding: 3px 5px !important;
+}
+
+.clrPhrBc {
+ clear: both;
+ display: block;
+ font-size: 0.71em;
+ line-height: 0;
+ margin-top: 1em;
+ overflow: hidden;
+}
+
+.wrpExE {
+ height: 25px;
+ margin-top: 18px;
+}
+
+.wrpExE p {
+ color: #525152;
+ font-size: 1em;
+ height: 20px;
+ margin: 0;
+ padding-left: 2px;
+}
+
+.wrpExE p a:link,
+.wrpExE p a:visited,
+.wrpExE p a:active {
+ color: #525152;
+ font-size: 1em;
+ text-decoration: none;
+}
+
+.intrst {
+ width: 100%;
+ border-top: 1px solid #ccc;
+ border-collapse: collapse;
+}
+
+#summary table:last-of-type.intrst {
+ border-bottom: 1px solid #ccc;
+ margin-bottom: 1em;
+}
+
+.intrst .intrstL {
+ background-color: #f5efe6;
+ padding-left: 5px;
+ vertical-align: middle;
+ width: 80px;
+}
+
+.intrst .intrstL h2 {
+ font-size: 0.92em;
+ font-weight: normal;
+}
+
+.intrst .intrstR {
+ padding-left: 4px;
+ vertical-align: middle;
+}
+
+.linkTagRR span {
+ font-size: 0;
+ display: block;
+ height: 23px;
+ line-height: 0;
+ width: 61px;
+}
+
+img.weblioMascot {
+ margin: 15px 0 15px;
+}
+
+#main {
+ float: left;
+ margin: 0 15px 0 auto;
+}
+
+#main a:link,
+#main a:visited,
+#main a:active {
+ color: #534a42;
+}
+
+#main a:hover {
+ color: #4f7bb9;
+}
+
+.clrBc {
+ clear: both;
+ content: '';
+ display: block;
+ font-size: 0;
+ line-height: 0;
+ overflow: hidden;
+}
+
+.treeBoxC a:link,
+.treeBoxC a:visited,
+.treeBoxC a:active {
+ font-family: 'ＭＳ ゴシック', '平成角ゴシック', monospace;
+ line-height: 1.5em;
+ padding: 8px;
+}
+
+.treeBoxC h3 {
+ text-align: left;
+}
+
+.treeBoxC h3 a:link,
+.treeBoxC h3 a:visited,
+.treeBoxC h3 a:active {
+ font-size: 0.85em;
+ font-weight: normal;
+ left: -1px;
+ line-height: 1.6em;
+ padding: 0;
+ position: relative;
+}
+
+.treeBoxC h3 span {
+ color: #1c9000;
+ display: list-item;
+ margin: 0 0 0 14px;
+ padding: 0;
+ position: relative;
+}
+
+.treeBoxC hr {
+ border: #c0c0c0 solid;
+ border-width: 1px 0 0 0;
+ height: 1px;
+ margin: 5px 5px 5px 5px;
+}
+
+.treeBoxC p {
+ font-size: 1.42em;
+ margin: 0;
+ padding: 0;
+ text-align: left;
+}
+
+.treeBoxCFoldLi .pl {
+ border: #000 solid 1px;
+}
+
+#summary {
+ padding: 2px 2px 10px 2px;
+}
+
+.summaryR > .error,
+#sideBHPAEjje > .error {
+ font-size: 0.71em;
+ background-color: #f8ddde;
+ text-align: center;
+ margin-bottom: 5px;
+ display: none;
+}
+
+#sideBHPAEjje > .error {
+ letter-spacing: 1.4;
+ padding: 0 5px;
+}
+
+#sideBHPAEjje > .error a {
+ font-weight: bold;
+ color: #000;
+}
+
+.summaryR.show > .error,
+#sideBHPAEjje.show > .error {
+ display: block;
+}
+
+#summaryMargin {
+ margin-top: 150px;
+}
+
+.summaryM .description {
+ background-color: #564c46;
+ color: #fff;
+ font-size: 1.07em;
+ font-weight: normal;
+ margin: 0 5px 0 3px;
+ padding: 3px 5px !important;
+}
+
+.linkTagRClrAd a:active,
+.linkTagRClrAd a:hover,
+.linkTagRClrAd a:link,
+.linkTagRClrAd a:visited {
+ text-decoration: none;
+}
+
+b.highlight {
+ font-weight: normal;
+}
+
+.agglutination {
+ vertical-align: top;
+}
+
+.agglutination agglutinationT {
+ font-size: 1.42em;
+}
+
+.agglutination li {
+ font-size: 1em;
+}
+
+.agglutination ul {
+ margin: 10px 0 0 0;
+ padding: 0 0 0 10px;
+}
+
+.relatedwords relatedwordsT {
+ font-size: 1.42em;
+}
+
+.EGateCoreDataWrp b,
+.descriptionWrp b {
+ display: block;
+ text-align: center;
+}
+
+.EGateCoreDataWrp table td:first-child,
+.descriptionWrp table td:first-child {
+ width: 80px;
+}
+
+.descriptionWrp table td:first-child {
+ vertical-align: top;
+ padding: 16px 0 10px 0;
+}
+
+.EGateCoreDataWrp table td,
+.descriptionWrp table td {
+ font-size: 90%;
+ font-weight: bold;
+}
+
+#searchSettingsWrp .reibun-sample .fa {
+ font-size: 1.28em;
+}
+
+.pin-icon-cell {
+ text-align: center;
+ width: 45px;
+}
+
+.pin-icon-cell td {
+ text-align: center;
+ white-space: nowrap;
+}
+
+.pin-icon-cell span {
+ color: #564c46;
+ font-size: 0.71em;
+}
+
+.pin-icon-cell .fa {
+ cursor: pointer;
+ font-size: 2.42em;
+}
+
+.pin-icon-cell .fa:hover {
+ filter: alpha(opacity=70);
+ opacity: 0.7;
+}
+
+#learning-level-table-wrap {
+ display: table;
+ width: 100%;
+}
+
+#learning-level-table {
+ display: table-cell;
+}
+
+#learning-level-table div {
+ display: table;
+}
+
+.learning-level-row {
+ display: table-row;
+}
+
+.learning-level-row span {
+ display: table-cell;
+ padding: 2px 0;
+}
+
+.learning-level-label {
+ text-align: right;
+}
+
+.learning-level-content {
+ padding-right: 15px !important;
+}
+
+#side .addLmFd .premium,
+#main .addLmFd .premium {
+ background-color: #ff8022;
+ color: #fff;
+ display: block;
+ font-size: 70%;
+ position: relative;
+ width: 100%;
+ height: 35px;
+}
+
+#side .addLmFd .premium:hover,
+#main .addLmFd .premium:hover {
+ opacity: 0.7;
+}
+
+#summary.non-member .intrstR #leadBtnWrp,
+#summary.non-member .intrstR #learning-level-table {
+ display: block;
+ width: 100%;
+}
+
+#summary.non-member .intrstR #learning-level-table div,
+#summary.non-member .intrstR #learning-level-table div * {
+ display: inline;
+}
+
+#summary.non-member .intrstR #leadToVocabIndexBtn,
+#summary.non-member .intrstR #leadToSpeakingTestIndexBtn {
+ display: table-cell;
+
+ vertical-align: middle;
+ position: relative;
+ box-sizing: border-box;
+}
+
+#summary.non-member .intrstR #leadBtnWrp .insideLlTable {
+ display: inline-block;
+ margin: 10px 5px;
+ box-sizing: border-box;
+}
+
+.free-member-features {
+ padding: 0 0 10px 0;
+}
+
+.free-member-features .features-title {
+ background-color: #554c45;
+ color: white;
+ font-size: 1.28em;
+ font-weight: bold;
+ text-align: center;
+ padding: 10px 0;
+}
+
+.free-member-features .features-subtitle {
+ font-size: 1em;
+ font-weight: bold;
+ text-align: center;
+ padding: 8px 0 12px 0;
+}
+
+.free-member-features .features-subtitle .red {
+ background-color: transparent;
+ color: #e04a12;
+ font-size: 1.28em;
+ padding: 0 5px;
+}
+
+.free-member-features ul.features {
+ margin: 0;
+ padding: 0;
+ text-align: center;
+}
+
+.free-member-features ul.features li {
+ width: 96px;
+ height: 121px;
+ display: inline-block;
+ border: 1px solid #cdcdcd;
+ text-align: center;
+ margin-right: 15px;
+ vertical-align: top;
+}
+
+.free-member-features ul.features li:first-child {
+ margin-left: 38px;
+}
+
+.free-member-features ul.features li .feature-name {
+ font-size: 0.85em;
+ font-weight: bold;
+ margin: 11px 0 10px 0;
+}
+
+.free-member-features ul.features li img {
+ height: 36px;
+ width: auto;
+}
+
+.free-member-features ul.features li .feature-desc {
+ font-size: 0.85em;
+ margin-top: 5px;
+}
+
+.free-member-features ul.features li.more-features {
+ margin-right: 0;
+ position: relative;
+ border: none;
+}
+
+.free-member-features ul.features li.more-features img {
+ width: 86px;
+ height: auto;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+}
+
+.free-member-features a.free-register-button {
+ display: block;
+ background-color: #48a267;
+ color: white;
+ text-decoration: none;
+ text-align: center;
+ border-radius: 15px;
+
+ margin: 10px auto 0 auto;
+ font-size: 1.14em;
+ font-weight: bold;
+ padding: 15px 0;
+ color: white;
+ position: relative;
+ line-height: 21px;
+}
+
+.free-member-features a.free-register-button:after {
+ content: '\f0da';
+ font-family: FontAwesome;
+ position: absolute;
+ height: 21px;
+ width: 30px;
+ font-size: 1.14em;
+ line-height: 21px;
+ top: 50%;
+ right: 30px;
+ transform: translateY(-50%);
+}
+
+#main .free-member-features a.free-register-button:link,
+#main .free-member-features a.free-register-button:visited,
+#main .free-member-features a.free-register-button:active {
+ color: white;
+}
+
+.free-member-features a.free-register-button .small {
+ font-size: 1em;
+}
+
+.descriptionWrp table td.content-explanation {
+ font-size: 1.12em;
+ line-height: 2;
+ padding: 10px 0 5px 0;
+}
+
+.descriptionWrp table td.content-explanation.ej {
+ letter-spacing: 1.5;
+}
+
+#main .KnenjSub a:link,
+#main .KnenjSub a:visited,
+#main .KnenjSub a:active {
+ color: #fff;
+}
+
+h2.midashigo rt {
+ font-size: 0.5em;
+}
+
+h2.midashigo rp {
+ font-size: 0.5em;
+}
+
+.infobox caption {
+ font-size: larger;
+ margin-left: inherit;
+}
+
+.infobox.bordered {
+ border-collapse: collapse;
+}
+
+.infobox.bordered td,
+.infobox.bordered th {
+ border: #aaa solid 1px;
+}
+
+.infobox.bordered .borderless td,
+.infobox.bordered .borderless th {
+ border: 0;
+}
+
+.infobox.standard-talk.bordered td,
+.infobox.standard-talk.bordered th {
+ border: #c0c090 solid 1px;
+}
+
+.infobox.bordered .mergedtoprow td,
+.infobox.bordered .mergedtoprow th {
+ border: 0;
+ border-right: #aaa solid 1px;
+ border-top: #aaa solid 1px;
+}
+
+.infobox.bordered .mergedrow td,
+.infobox.bordered .mergedrow th {
+ border: 0;
+ border-right: #aaa solid 1px;
+}
+
+.wikitable caption,
+.prettytable caption {
+ font-weight: bold;
+ margin-left: inherit;
+ margin-right: inherit;
+}
+
+dl#infoboxCountry dt.infoboxCountryNameJa {
+ font-size: 1.36em;
+ margin: 0 0 0.13em;
+ text-align: center;
+}
+
+.dablink {
+ border-bottom: #aaa solid 1px;
+ font-size: 90%;
+ margin: 0.5em 0 0.5em 0;
+ padding: 3px 2em 3px 2em;
+}
+
+.midashigo sub {
+ font-size: 0.6em;
+}
+
+.midashigo sup {
+ font-size: 0.6em;
+}
+
+td.movie_staff_left {
+ text-align: right;
+}
+
+.ad02_left_box {
+ width: 7px;
+ height: 30px;
+ margin: 0 2px 2px 0;
+ padding: 0;
+ background-color: #d0d0d0;
+ vertical-align: middle;
+ font-size: 10pt;
+}
+
+.ad02_center-left_box {
+ height: 30px;
+ margin: 0 2px 2px 0;
+ padding: 4px;
+ background-color: #f0f0f0;
+ vertical-align: middle;
+ font-size: 10pt;
+}
+
+.ad02_center-right_box {
+ height: 30px;
+ margin: 0 2px 2px 0;
+ padding: 4px;
+ background-color: #e0e0e0;
+ vertical-align: middle;
+ font-size: 10pt;
+}
+
+.ad02_right_box {
+ height: 30px;
+ margin: 0 2px 2px 0;
+ padding: 4px;
+ background-color: #e0e0e0;
+ vertical-align: middle;
+ font-size: 10pt;
+}
+
+.main3noh {
+ font-size: 1em;
+ color: #fff;
+}
+
+.mainb {
+ font-size: 1em;
+ color: #000;
+ font-weight: bold;
+ line-height: 18px;
+}
+
+h2.midashigo sub {
+ font-size: smaller;
+}
+
+ul.linkListStrong li {
+ list-style-type: none;
+}
+
+.Ktdcm .KtdcmImgLeft {
+ float: left;
+ width: 48%;
+}
+
+.Ktdcm .KtdcmImgRight {
+ float: right;
+ width: 48%;
+}
+
+.Ktdcm .maincol {
+ margin-left: 15px;
+ text-align: left;
+}
+
+.Ktdcm ul.fright li.full {
+ text-align: right;
+}
+
+.Ktdcm .maincol .boxArea {
+ margin-bottom: 16px;
+ padding-top: 7px;
+}
+
+.Ktdcm .maincol .boxArea .wrap {
+ padding-bottom: 8px;
+}
+
+.Ktdcm .maincol .boxArea .section {
+ padding: 0 7px;
+}
+
+.Ktdcm table.cell2 .right {
+ padding-left: 16px;
+}
+
+.Sngsj .gaiji {
+ height: 1em;
+ vertical-align: text-bottom;
+ width: 1em;
+}
+
+.Otnet .OtnetRed {
+ border-bottom: #ccc solid 1px;
+ border-left: #f00 solid 10px;
+ border-right: #ccc solid 0;
+ margin: 12px;
+ padding: 1px 5px;
+}
+
+.Fkkyr .left_column {
+ padding: 15px 0 0 0;
+}
+
+td.midashigo {
+ color: #4f519b;
+ font-weight: bold;
+ padding: 10px 5px 30px 2px;
+}
+
+.Mtsbs .notes_mainArea {
+ margin-top: 10px;
+}
+
+.Mtsbs table.spec tr.mainheader th {
+ background-color: #d2d2d2;
+ font-weight: bold;
+}
+
+.Mtsbs table.spec tr.mainheader th.basic {
+ background-color: #e8f6d9;
+}
+
+.Mtsbs table.spec .tdleft {
+ text-align: left;
+}
+
+.Mtsbs table.spec .tdright {
+ text-align: right;
+}
+
+.Mtsbs table.spec td.tdleft_nb {
+ text-align: left;
+ border-right-style: none;
+}
+
+.Mtsbs table.spec td.tdright_nb {
+ text-align: right;
+ border-left-style: none;
+}
+
+.Mtsbs .carmain_font80 {
+ font-size: 0.8em;
+}
+
+.Mtsbs .carmain_font70 {
+ font-size: 0.7em;
+}
+
+.Mtsbs td.tdleft {
+ text-align: left;
+}
+
+.Mtsbs th.tdleft {
+ text-align: left;
+}
+
+.Kkjsh table tr td.right {
+ text-align: right;
+}
+
+.Mzdmt .cell_center_left {
+ border-right: #a1a1a1 solid 1px;
+ text-align: center;
+}
+
+.Mzdmt .cell_left_no {
+ border-bottom: #a1a1a1 solid 1px;
+ height: 22px;
+ text-align: left;
+}
+
+.Mzdmt .cell_left {
+ border: #a1a1a1 solid;
+ border-width: 0 1px 1px 0;
+ height: 22px;
+ text-align: left;
+}
+
+.Triph .data caption {
+ background: #94b7df;
+ border-right: #fff solid 1px;
+ border-top: #fff solid 1px;
+ color: #fff;
+ font-weight: bold;
+ padding: 2px 17px;
+}
+
+.Cntkj .description {
+ float: right;
+ width: 43%;
+}
+
+.Hyndi .spec-table td.left {
+ text-align: left;
+}
+
+.Hndmr table#webcatalogue-table td {
+ color: #666;
+}
+
+.Hndmr table#webcatalogue-table img {
+ border: none;
+}
+
+.Hndmr table#webcatalogue-table p {
+ margin: 0;
+ padding: 0;
+}
+
+.Hndmr table#webcatalogue-table p.leadcopy {
+ color: #333;
+ font-size: 0.9em;
+ font-weight: bold;
+ line-height: 18px;
+}
+
+.Hndmr table#webcatalogue-table p.leadcopy2 {
+ font-size: 0.9em;
+ font-weight: bold;
+ line-height: 21px;
+}
+
+.Hndmr table#webcatalogue-table p.text {
+ font-size: 0.9em;
+ line-height: 16px;
+}
+
+.Hndmr table#webcatalogue-table p.caution {
+ color: #888;
+ font-size: 0.9em;
+ line-height: 12px;
+ margin-top: 3px;
+}
+
+.Hndmr table#webcatalogue-table span.typebetsu {
+ font-size: 0.9em;
+ font-weight: normal;
+}
+
+.Hndmr table#webcatalogue-table p.concepttext {
+ color: #fff;
+ line-height: 18px;
+ margin: 0 15px 10px 15px;
+}
+
+.Hndmr table#webcatalogue-table strong.v6 {
+ color: #003f98;
+}
+
+.Hndmr table#webcatalogue-table p.safe-midashi {
+ background-color: #333;
+ color: #fff;
+ font-size: 0.9em;
+ font-weight: bold;
+ line-height: 18px;
+ padding: 3px 5px 3px 5px;
+}
+
+.Hndmr table#webcatalogue-table p.realworldtext {
+ color: #51318f;
+}
+
+.Hndmr table#webcatalogue-table span.co2 {
+ font-size: 0.9em;
+}
+
+.Hndmr table#webcatalogue-table p.texthyoujimark {
+ font-size: 0.9em;
+ line-height: 16px;
+}
+
+.Hndmr table#webcatalogue-table #env-data {
+ font-size: 0.9em;
+}
+
+.Hndmr table#webcatalogue-table #env-data td.tabletext {
+ padding: 2px;
+}
+
+.Hndmr table#webcatalogue-table strong.price {
+ font-size: 0.9em;
+}
+
+.Hndmr table#webcatalogue-table p.caution_vg {
+ margin-top: 7px;
+}
+
+.Hndmr table#webcatalogue-table p.navi-midashi {
+ background-color: #1c1f7a;
+ color: #fff;
+ font-size: 0.9em;
+ font-weight: bold;
+ line-height: 18px;
+ padding: 3px 5px 3px 5px;
+}
+
+.Hndmr table#webcatalogue-table .note {
+ color: #1c1f7a;
+}
+
+.Hndmr table#webcatalogue-table span.komidashi {
+ color: #006965;
+}
+
+.Hndmr table.spec-table td.bd-left {
+ border-left: 1px solid #2c2c2c;
+}
+
+.Hndmr .block_line_right {
+ border-right: solid 1px #000;
+}
+
+.Hndmr #webcata_footer {
+ clear: both;
+ padding: 30px 128px 15px 20px;
+ text-align: right;
+}
+
+.Hndmr #specifications th.car .small {
+ font-size: x-small;
+ line-height: 120%;
+}
+
+.Hndmr div#web-catalog-contents {
+ margin: 24px;
+}
+
+.Hndmr div#web-catalog-contents h4 {
+ background: #325958;
+ color: #fff;
+ font-size: 0.9em;
+ margin-bottom: 14px;
+ padding: 4px 0 4px 10px;
+}
+
+.Hndmr div#web-catalog-contents table.model-navi {
+ margin: 0 0 5px 0;
+}
+
+.Hndmr div#web-catalog-contents table.model-navi td {
+ padding: 0 25px 0 10px;
+}
+
+.Hndmr div#web-catalog-contents * {
+ margin: 0;
+ padding: 0;
+}
+
+.Hndmr div#web-catalog-contents h4 span {
+ font-size: 0.9em;
+ font-weight: normal;
+}
+
+.Hndmr div#web-catalog-contents p.caution,
+p.caution {
+ font-size: 0.9em;
+ line-height: 120%;
+}
+
+.Hndmr #eq_spec_list td.right_non_border {
+ border-right: none;
+}
+
+.Kejje dd {
+ margin-left: 20px;
+}
+
+.Kejje .gaiji {
+ border: 0;
+ margin-bottom: -3px;
+}
+
+.Kejje .level1 {
+ margin-left: 1em;
+}
+
+.Kejje .level2 {
+ margin-left: 1.5em;
+}
+
+.Kejje .backlink {
+ margin-top: 10px;
+}
+
+.Kejje .backlink img {
+ margin-bottom: -3px;
+ margin-right: 5px;
+}
+
+.Kejje .onsei {
+ margin-bottom: -8px;
+}
+
+.Kejje .playSd {
+ cursor: pointer;
+}
+
+.youreilink {
+ border-bottom: #080 solid 1px;
+ color: #080;
+ font-weight: bold;
+ text-decoration: none;
+}
+
+.KejjeYrL,
+.KejjeYrLS,
+.KejjeYrM,
+.KejjeYrMS,
+.KejjeYrR {
+ background-color: #f7f7f7;
+ font-size: 0.9em;
+ vertical-align: top;
+}
+
+.KejjeYrL,
+.KejjeYrLS {
+ color: #363636;
+ font-size: 0.9em;
+ padding: 0 4px 0 4px;
+ width: 40px;
+}
+
+.KejjeYrM,
+.KejjeYrMS {
+ width: 13px;
+}
+
+.KejjeYrR {
+ padding: 0 4px 0 4px;
+}
+
+.KejjeYr {
+ border: 0;
+ border-collapse: collapse;
+ margin: 0 0 3px 25px;
+ padding: 0;
+}
+
+.KejjeYrMS i {
+ margin: 2px 0 0 2px;
+}
+
+.KejjeYrLS {
+ cursor: pointer;
+}
+
+.KejjeYrC {
+ border: #666 solid 1px;
+ font-size: 0.9em;
+ padding: 1px;
+}
+
+.KejjeYrHd {
+ padding: 0 0.5em 0 0;
+}
+
+.KejjeYrTxt {
+ display: none;
+ margin: 0;
+ padding: 0 0.5em 0 0;
+}
+
+.KejjeYrHd a,
+.KejjeYrTxt a {
+ color: black;
+}
+
+.KejjeYrHd a:active,
+.KejjeYrTxt a:active {
+ color: black;
+}
+
+.KejjeYrHd a:hover,
+.KejjeYrTxt a:hover {
+ color: black;
+}
+
+.KejjeYrHd a:visited,
+.KejjeYrTxt a:visited {
+ color: black;
+}
+
+.KejjeYrLn {
+ background-image: url(https://weblio.hs.llnwd.net/e7/img/iconCclBlS.png);
+ background-position: left 5px;
+ background-repeat: no-repeat;
+ line-height: 1.2em;
+ margin: 0;
+ padding: 0 0 0 16px;
+}
+
+.KejjeYrLn sup {
+ line-height: 1em;
+ margin: 0;
+ padding: 0;
+}
+
+.KejjeYrLn span {
+ line-height: 1.6em;
+ margin: 0;
+ padding: 0;
+}
+
+.KejjeYrLn .KejjeYrEn {
+ font-family: Arial;
+ font-weight: bold;
+}
+
+.KejjeYrKwrd {
+ line-height: 1em;
+}
+
+.KejjeSm {
+ font-size: 0.8em;
+ font-weight: normal;
+ line-height: 1em;
+}
+
+.KejjeSm a {
+ line-height: 1em;
+}
+
+.Kejje .kenjeEnE {
+ border: 0;
+ display: list-item;
+ list-style-position: inside;
+ margin: 0;
+ padding: 0 0 0 10px;
+}
+
+.Kejje .onseiSwf {
+ display: inline-block;
+ position: relative;
+ top: 8px;
+ margin-left: 5px;
+}
+
+.KejjeYrMS img {
+ cursor: pointer;
+ margin-top: 3px;
+}
+
+.KejjeSm {
+ font-size: 0.8em;
+ font-weight: normal;
+ line-height: 1em;
+ padding-left: 4px;
+}
+
+.Kejje .lvlNH,
+.Kejje .lvlAH,
+.Kejje .lvlB {
+ float: left;
+ margin: 0;
+ padding: 0;
+ vertical-align: bottom;
+}
+
+.Kejje .lvlNH {
+ font-size: 1.3em;
+ font-weight: bold;
+ height: 1.1em;
+ width: 28px;
+}
+
+.Kejje .lvlAH {
+ font-size: 1.4em;
+ font-weight: bold;
+ line-height: 1.6em;
+ width: 16px;
+}
+
+.Kejje .lvlUAH {
+ font-size: 1.3em;
+ font-weight: bold;
+ height: 1.1em;
+}
+
+.Kejje .lvlUAB {
+ font-weight: bold;
+}
+
+.Kejje .lvlB {
+ padding: 0.1em 0 0 0;
+ max-width: 85%;
+}
+
+.Kejje .lvlNHje {
+ float: left;
+ font-weight: bold;
+ margin: 0;
+ padding: 0;
+ vertical-align: bottom;
+ width: 16px;
+}
+
+.Kejje .lvlNBje {
+ float: left;
+ font-weight: bold;
+ margin: 0 0 12px 0;
+ padding: 0;
+}
+
+.Kejje .lvlNBje td {
+ line-height: 1.6em;
+ margin: 0;
+ padding: 0 20px 0 0;
+ vertical-align: top;
+}
+
+.Kejje .lvlNBjeT {
+ float: left;
+ margin: 0;
+ padding: 0;
+}
+
+.Kejje .lvlNBjeT sup {
+ line-height: 1em;
+ margin: 0;
+ padding: 0;
+}
+
+.Kejje .lvlNBjeL {
+ white-space: nowrap;
+}
+
+.Kejje .lvlBje {
+ font-weight: bold;
+ margin: 0;
+ padding: 0;
+}
+
+.Kejje .lvlB {
+ margin: 0.3em 0 0 0;
+}
+
+.Kejcy .gaiji {
+ border: 0;
+ margin-bottom: -3px;
+}
+
+.Kejcy .level0 {
+ margin: 1em 0 0 0;
+}
+
+.Kejcy .level1 {
+ margin: 0 1.5em 0 1.5em;
+}
+
+.Kejcy .level2 {
+ background-color: #f7f7f7;
+ font-size: 0.9em;
+ margin: 0 3em 0.5em 3em;
+ padding: 0.2em 0.5em 0 0.5em;
+}
+
+.Gicns .ga_small {
+ font-size: 0.9em;
+}
+
+.Nsrsk .NsrskMaintxt {
+ float: left;
+ text-align: left;
+}
+
+.Nsrsk .NsrskRightph {
+ border: #ccc solid 1px;
+ float: right;
+ text-align: center;
+}
+
+.Tltdb div.TltdbLeft {
+ float: left;
+ text-align: center;
+}
+
+.Tytmt .smallMText {
+ font-size: 0.7em;
+}
+
+.Tpkys div.stroke div.imgArea p.rightImg {
+ margin-right: 0;
+}
+
+.Tpkys .closeBoxIn div.makeRight {
+ border: #ccc dotted 1px;
+ float: left;
+ height: 350px;
+ padding: 10px;
+}
+
+.Srsbz .SrsbzLeft {
+ float: left;
+}
+
+.Srsbz .SrsbzRight {
+ float: right;
+}
+
+.Nrksm .NrksmT2 caption {
+ font-weight: bold;
+ text-align: left;
+}
+
+.Trhnt .TrhntLeft {
+ float: left;
+}
+
+.Trhnt .TrhntRight {
+ float: right;
+}
+
+.rmvDots {
+ background: none !important;
+ padding: 0 !important;
+}
+
+.syosaiLeft {
+ float: left;
+ margin: 0 0 20px 25px;
+}
+
+.Hgnsh .syosaiLeft {
+ float: left;
+ margin: 0 0 0 5px;
+}
+
+.Hgnsh .syosaiLeftBox {
+ line-height: 1.4em;
+ margin-top: 15px;
+ text-align: justify;
+ text-justify: inter-ideograph;
+}
+
+.Hgnsh .syosaiRight {
+ float: right;
+ margin-top: 5px;
+}
+
+.Hgnsh .syosaiRightBox {
+ text-align: center;
+}
+
+.Hgnsh .syosaiRightBox img {
+ margin-bottom: 0;
+ padding: 15px 0 15px;
+}
+
+.Hskks .syosaiLeft {
+ float: left;
+ margin: 0 0 0 5px;
+}
+
+.Hskks .syosaiLeftBox {
+ line-height: 1.4em;
+ margin-top: 15px;
+ text-align: justify;
+ text-justify: inter-ideograph;
+}
+
+.Hskks .syosaiRight {
+ float: right;
+ margin-top: 5px;
+}
+
+.Hskks .syosaiRightBox {
+ text-align: center;
+}
+
+.Hskks .syosaiRightBox img {
+ margin-bottom: 0;
+ padding: 15px 0 15px;
+}
+
+.LiscjYr .synonym1 {
+ float: left;
+ margin: 0;
+ width: 45%;
+}
+
+.LiscjYr .synonym2 {
+ float: right;
+ margin: 0;
+ width: 45%;
+}
+
+.LiscjYr .clear_column {
+ clear: both;
+}
+
+.Liscj .caption p,
+.Liscj .meaning p {
+ margin: 0;
+}
+
+.Wejty .wejtyT span,
+.Wejty .wejtyE span,
+.Wejty .wejtyR span {
+ background-color: #f0f0f0;
+ border: #666 solid 1px;
+ color: #363636;
+ font-size: 0.9em;
+ line-height: 1em;
+ padding: 1px;
+}
+
+.Wejty .wejtyT {
+ padding: 0;
+}
+
+.Wejty .wejtyE,
+.Wejty .wejtyR {
+ padding: 0 0 0 16px;
+}
+
+.Wejty .wejtyL {
+ background-color: #f0f0f0;
+ border: #666 solid 1px;
+ color: #363636;
+ font-size: 0.9em;
+ font-weight: normal;
+ line-height: 1em;
+ margin-right: 8px;
+ padding: 1px;
+}
+
+.Wejty .wejtyInfo {
+ border: #b5b6b5 solid 1px;
+ font-size: 0.8em;
+ line-height: 1.32em;
+ margin: 1em 0 0 0;
+ padding: 10px;
+}
+
+.Wwsej .wwsejInfo {
+ border: #b5b6b5 solid 1px;
+ font-size: 0.8em;
+ line-height: 1.32em;
+ margin: 20px 0 0 0;
+ padding: 10px;
+}
+
+.Nwnej .nwnejP {
+ border-left: #815733 solid 6px;
+ font-size: 1em;
+ font-weight: bold;
+ line-height: 1em;
+ margin: 12px 0 2px 0;
+ padding-left: 3px;
+}
+
+.Nwnej .nwnejP a {
+ line-height: 1em;
+}
+
+.Nwnej .nwnejSEnL,
+.Nwnej .nwnejSEnR {
+ max-width: 90%;
+ float: left;
+ margin: 12px 0 0 0;
+}
+
+.Nwnej .nwnejSEnL {
+ line-height: 1.4em;
+ width: 16px;
+}
+
+.Nwnej .nwnejSJp {
+ margin: 0 0 0 1.5em;
+ padding: 0 0 12px 0;
+}
+
+.Nwnej .nwnejS p {
+ line-height: 1.4em;
+ margin: 0;
+ padding: 0;
+}
+
+.Nwnej .nwnejS a {
+ line-height: 1em;
+}
+
+.Nwnej .nwnejYr {
+ background-color: #f7f7f7;
+ margin: 0 0 0 1.5em;
+ padding: 0;
+}
+
+.Nwnej .nwnejYrL,
+.Nwnej .nwnejYrLS,
+.Nwnej .nwnejYrR {
+ background-color: #f7f7f7;
+ font-size: 0.9em;
+ vertical-align: top;
+}
+
+.Nwnej .nwnejYrL,
+.Nwnej .nwnejYrLS {
+ margin: 0;
+ padding: 0;
+ width: 13px;
+}
+
+.Nwnej .nwnejYrR {
+ padding: 0 4px 0 4px;
+}
+
+.Nwnej .nwnejYrLS i {
+ margin: 4px 0 0 3px;
+}
+
+.Nwnej .nwnejYrHd {
+ padding: 0 0.5em 0 0;
+}
+
+.Nwnej .nwnejYrTxt {
+ display: none;
+ margin: 0;
+ padding: 0 0.5em 0 0;
+}
+
+.Nwnej .nwnejYrLn {
+ background-image: url(https://weblio.hs.llnwd.net/e7/img/iconCclBlS.png);
+ background-position: left 5px;
+ background-repeat: no-repeat;
+ line-height: 1.2em;
+ padding: 0 0 0 12px;
+}
+
+.Nwnej .nwnejYrE,
+.Nwnej .nwnejYrJ {
+ font-size: 0.9em;
+ margin: 0;
+}
+
+.Nwnej .nwnejYrE {
+ font-family: Arial;
+ font-weight: bold;
+ padding-right: 8px;
+}
+
+.Nwnej .nwnejThL a:active,
+.Nwnej .nwnejThL a:hover,
+.Nwnej .nwnejThL a:link,
+.Nwnej .nwnejThL a:visited {
+ border-bottom: #534a42 dotted 1px;
+ display: inline-block;
+ font-size: 1em;
+ line-height: 10px;
+ text-decoration: none;
+}
+
+.Wejhs .wejhsSub {
+ border-left: #815733 solid 6px;
+ font-size: 1.3em;
+ font-weight: bold;
+ line-height: 1em;
+ margin: 10px 0 5px 0;
+ padding-left: 3px;
+}
+
+.Wejhs .wejhsSub a {
+ line-height: 1em;
+}
+
+.Wejhs .wejhsD {
+ background-color: #f7f7f7;
+ margin-left: 20px;
+ margin-top: 10px;
+ padding: 5px;
+}
+
+.Wejhs .wejhsL {
+ float: left;
+ padding: 2px 0 2px 0;
+}
+
+.Wejhs .wejhsL span {
+ border: #666 solid 1px;
+ color: #363636;
+ font-size: 0.9em;
+ margin: 0 16px 0 12px;
+ padding: 1px;
+}
+
+.Wejhs .wejhsR {
+ float: left;
+}
+
+.Wejhs .wejhsInfo {
+ border: #b5b6b5 solid 1px;
+ font-size: 0.8em;
+ line-height: 1.32em;
+ margin: 50px 0 0 0;
+ padding: 10px;
+}
+
+.Wkpen .wkpenWrp {
+ background-color: #f7f7f7;
+ line-height: 1.3em;
+ margin-top: 5px;
+ padding: 9px 5px 9px 15px;
+ width: 95%;
+}
+
+.Jawik .level0,
+.Jawik .level0Head {
+ font-size: 1.4em;
+ font-weight: bold;
+ margin: 10px 0 2px 0;
+ padding-left: 5px;
+}
+
+.Jawik .level0Head {
+ margin-top: 0;
+}
+
+.Jawik .level0 span,
+.Jawik .level0Head span {
+ border: #b81e07 solid;
+ border-width: 0 0 0 8px;
+ padding: 3px 2px 2px 0;
+}
+
+.Hypej .level0 {
+ margin: 1em 0 0 0;
+ padding: 0;
+}
+
+.Hypej .HypejSub {
+ border-left: #815733 solid 6px;
+ font-size: 1.3em;
+ font-weight: bold;
+ line-height: 1em;
+ margin: 10px 0 5px 0;
+ padding-left: 3px;
+}
+
+.Hypej .HypejSm {
+ font-size: 0.8em;
+ font-weight: normal;
+ line-height: 1em;
+ padding-left: 3px;
+}
+
+.Hypej .lvlNH {
+ float: left;
+ font-size: 1.3em;
+ font-weight: bold;
+ height: 1.1em;
+ margin: 0;
+ padding: 0;
+ vertical-align: bottom;
+ width: 28px;
+}
+
+.Hypej .lvlB {
+ float: left;
+ margin: 0;
+ padding: 0.3em 0;
+}
+
+.HypejYrL,
+.HypejYrR {
+ background-color: #f7f7f7;
+ font-size: 0.9em;
+ vertical-align: top;
+}
+
+.Hypej .HypejYr {
+ border: 0;
+ border-collapse: collapse;
+ margin: 5px 0 1em 1em;
+ padding: 0;
+}
+
+.Hypej .HypejYrL {
+ padding: 0 4px 0 4px;
+ width: 40px;
+}
+
+.Hypej .HypejYrC {
+ border: #666 solid 1px;
+ font-size: 0.9em;
+ padding: 1px;
+}
+
+.Hypej .HypejYrLn {
+ background-image: url(https://weblio.hs.llnwd.net/e7/img/iconCclBlS.png);
+ background-position: left 5px;
+ background-repeat: no-repeat;
+ line-height: 1.2em;
+ margin: 0;
+ padding: 0 0 0 16px;
+}
+
+.Hypej .HypejYrEn {
+ font-family: Arial;
+ font-weight: bold;
+}
+
+.Hypej .HypejLb {
+ background-color: #eee;
+ border: #999 solid 1px;
+ color: #333;
+ font-size: 1em;
+ font-weight: normal;
+ margin: 0 2px 0 3px;
+ padding: 1px;
+}
+
+.Hypej .HypejB {
+ background-color: #fffcf8;
+ border-collapse: collapse;
+ width: 80%;
+}
+
+.Hypej .HypejB tr th {
+ border: #808080 solid 1px;
+ padding: 3px;
+}
+
+.Hypej .HypejB tr td {
+ border: #808080 solid 1px;
+ padding: 3px;
+}
+
+.Hypej .onseiSwf {
+ padding: 10px 0 0 2px;
+ vertical-align: middle;
+}
+
+.Gkzkj .level0 {
+ margin: 0;
+ padding: 0;
+}
+
+.Efref .efrefA {
+ color: #999;
+ font-size: 1em;
+ margin: 0 0 12px;
+}
+
+.Nkjtn .nkjtnI caption {
+ font-weight: bold;
+}
+
+h2.midashigo .cgkgjSm,
+.Cgkgj .cgkgjSm {
+ font-size: 0.6em;
+ margin-left: 0.4em;
+}
+
+.Cgkgj .level0 {
+ margin: 0;
+ padding: 0;
+}
+
+.EgtejLb {
+ background-color: #f5efe9;
+ border: #534a42 solid 1px;
+ border-radius: 2px;
+ font-size: 1em;
+ font-weight: bold;
+ margin: 2px 0;
+ margin-right: 8px;
+ padding: 0 3px !important;
+ white-space: nowrap;
+}
+
+.EgtejRSpc {
+ margin-right: 10px;
+}
+
+.EgtejSub,
+.EgtejSubS {
+ background-color: #564c46;
+ border: none !important;
+ border-radius: 3px;
+ color: #fff;
+ display: inline;
+ font-size: 1em;
+ font-weight: normal !important;
+ line-height: 30px !important;
+ margin-right: 5px;
+ padding: 0 5px 3px 5px !important;
+}
+
+.EgtejSubS {
+ font-size: 1em;
+}
+
+.EgtejSub a,
+.EgtejSubS a,
+.EgtejCcl a {
+ color: #fff !important;
+ text-decoration: none !important;
+}
+
+.EgtejCcl a {
+ line-height: 18px;
+}
+
+.EgtejBld {
+ font-weight: bold;
+}
+
+.EgtejYrAr,
+.EgtejIdxAr {
+ margin-top: 3px;
+ background-color: #f7f7f7;
+ padding: 5px;
+}
+
+.EgtejYrTb {
+ border-collapse: collapse;
+ width: 100%;
+}
+
+.EgtejYrTb td {
+ vertical-align: top;
+}
+
+.EgtejYrImg img {
+ width: 100%;
+}
+
+.EgtejYrTb th {
+ vertical-align: top;
+ width: 40px;
+}
+
+.EgtejWrp {
+ margin-left: 2px;
+}
+
+.EgtejCrTb {
+ margin-bottom: 10px;
+}
+
+.EgtejCrTb td {
+ padding-left: 30px;
+ vertical-align: top;
+}
+
+.EgtejCrTb td:first-child {
+ padding: 0;
+ width: 40%;
+}
+
+.EgtejCrTb td img {
+ border: #ccc solid 1px;
+ padding: 10px;
+ width: 100%;
+}
+
+.EgtejSpc {
+ display: inline-block;
+ width: 1em;
+}
+
+.EgtejClmTb {
+ width: 100%;
+}
+
+.EgtejClmTb td {
+ line-height: 1.2em;
+ vertical-align: top;
+}
+
+.EgtejClmImg img {
+ width: 100%;
+}
+
+.EgtejIdxCld {
+ margin-left: 40px;
+ margin-right: 10px;
+}
+
+.EgtejSign {
+ display: inline-block;
+ font-size: 1em;
+ line-height: 1.2em;
+ margin-top: 10px;
+}
+
+.EgtejCcl {
+ background-color: #564c46;
+ border-radius: 50%;
+ color: #fff;
+ display: inline-block;
+ font-size: 1em;
+ font-weight: bold;
+ height: 18px;
+ line-height: 18px;
+ text-align: center;
+ width: 18px;
+}
+
+.EgtejRmIdx {
+ font-size: 1em;
+}
+
+.EgtejAncTgt {
+ display: none;
+}
+
+.EgtejAncTgt + .br {
+ margin-bottom: 1em;
+}
+
+.EgtejAncLnk {
+ text-decoration: none;
+}
+
+.CtbdsWrp {
+ margin: 0 15px 25px 4px;
+}
+
+.CtbdsWrpNt {
+ margin-top: 36px;
+ margin-bottom: 36px;
+}
+
+.Jfwik .level0,
+.Jfwik .level0Head {
+ font-size: 1.4em;
+ font-weight: bold;
+ margin: 10px 0 2px 0;
+ padding-left: 5px;
+}
+
+.Jfwik .level0Head {
+ margin-top: 0;
+}
+
+.Jfwik .level0 span,
+.Jfwik .level0Head span {
+ border: #95adce solid;
+ border-width: 0 0 0 8px;
+ padding: 3px 2px 2px 0;
+}
+
+.flex-rectangle-ads-frame {
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+}
+
+.intrstR .conjugateRowL {
+ width: 14%;
+ vertical-align: top;
+}
+
+.summaryM {
+ margin-bottom: 5px;
+}
+
+.summaryHead {
+ display: flex;
+ align-items: center;
+}
+
+img {
+ display: inline;
+}
+
+.qotC {
+ margin: 0.5em 0;
+}
+
+.qotC p {
+ margin: 0;
+}
+
+.qotCJE .squareCircle,
+.qotCE .squareCircle {
+ display: none;
+}
+
+.CtbdsLb {
+ background-color: #564c46;
+ color: #fff;
+ font-size: 15px;
+ font-weight: normal;
+ margin: 0 6px 0 4px;
+ padding: 3px 5px !important;
+ white-space: nowrap;
+}
+
+.CtbdsLbNt {
+ font-size: 20px;
+}
+
+.CtbdsTdCore,
+.CtbdsTdPoint {
+ width: auto;
+}
+
+.CtbdsWrp {
+ margin: 0 15px 25px 4px;
+}
+
+.CtbdsWrpNt {
+ margin-top: 36px;
+ margin-bottom: 36px;
+}
+
+.CtbdsCat,
+.CtbdsPv {
+ margin: 10px 0;
+}
+
+.CtbdsPv {
+ font-weight: bold;
+}
+
+.CtbdsSemSpaced {
+ margin-bottom: 10px;
+}
+
+.CtbdsExAr {
+ background-color: #e8e8e8;
+ height: auto;
+ margin: 0 5px 5px 5px;
+ padding: 5px;
+}
+
+.CtbdsEx {
+ padding-left: 20px;
+ margin: 0;
+}
+
+.CtbdsEx li {
+ list-style-type: disc;
+}
+
+.CtbdsMetaTb {
+ border-spacing: 0;
+ margin: 0 0 15px 0;
+}
+
+.CtbdsMetaTb td {
+ vertical-align: top;
+}
+
+.jmnedGls {
+ margin: 0;
+}
+
+.br {
+ margin-bottom: 5px;
+}
+
+.level0 .br {
+ margin: 0;
+}
+
+.Nekym table {
+ width: 100%;
+ table-layout: fixed;
+ border-collapse: collapse;
+ border: 1px #696969 solid;
+}
+
+.Nekym table th {
+ background-color: #f5f5f5;
+ border: 1px #696969 solid;
+ font-weight: bold;
+ padding: 3px;
+ white-space: nowrap;
+}
+
+.Nekym table td {
+ border: 1px #696969 solid;
+ padding: 5px;
+ line-height: 1.3em;
+}
+
+.Nekym .nekymS {
+ border-left: #815733 solid 6px;
+ font-size: 1.3em;
+ font-weight: bold;
+ line-height: 1em;
+ margin: 10px 0 5px 0;
+ padding-left: 3px;
+}
+
+.KejjeIdH {
+ border-left: #564c46 solid 6px;
+ font-size: 1.2em;
+ line-height: 1em;
+ margin: 10px 0 5px 0;
+ padding-left: 3px;
+}
+
+.phraseEjjeT td {
+ vertical-align: top;
+}
+
+.nwnejThL {
+ margin-top: 1em;
+}
+
+.qotHS {
+ background-color: #f5efe9;
+ border: #534a42 solid 1px;
+ padding: 0 2px;
+}
+
+.qotCE {
+ color: #564c46;
+ font-weight: bold;
+ line-height: 1.2;
+ margin: 2px 0 2px 0;
+ padding: 0;
+}
+
+.qotCJ {
+ color: #564c46;
+ line-height: 1.2em;
+ margin: -1px 0 13px 0;
+ padding: 0;
+}
+
+.phraseEjjeT {
+ width: 100%;
+}
diff --git a/src/components/dictionaries/weblioejje/engine.ts b/src/components/dictionaries/weblioejje/engine.ts
index dafc527b7..d18852fa7 100644
--- a/src/components/dictionaries/weblioejje/engine.ts
+++ b/src/components/dictionaries/weblioejje/engine.ts
@@ -4,19 +4,23 @@ import {
handleNetWorkError,
SearchFunction,
GetSrcPageFunction,
- getOuterHTMLBuilder,
+ getOuterHTML,
HTMLString,
externalLink,
getText,
removeChildren,
+ DictSearchResult
} from '../helpers'
-import { DictSearchResult } from '@/typings/server'
-import { getStaticSpeakerHTML } from '@/components/withStaticSpeaker'
+import { getStaticSpeakerString, getStaticSpeaker } from '@/components/Speaker'
-export const getSrcPage: GetSrcPageFunction = (text) => {
- return `https://ejje.weblio.jp/content/${encodeURIComponent(text.replace(/\s+/g, '+'))}`
+export const getSrcPage: GetSrcPageFunction = text => {
+ return `https://ejje.weblio.jp/content/${encodeURIComponent(
+ text.replace(/\s+/g, '+')
+ )}`
}
+const HOST = 'https://ejje.weblio.jp'
+
export type WeblioejjeResult = Array<{
title?: string
content: HTMLString
@@ -24,16 +28,20 @@ export type WeblioejjeResult = Array<{
type WeblioejjeSearchResult = DictSearchResult<WeblioejjeResult>
-export const search: SearchFunction<WeblioejjeSearchResult> = (
- text, config, profile, payload
+export const search: SearchFunction<WeblioejjeResult> = (
+ text,
+ config,
+ profile,
+ payload
) => {
return fetchDirtyDOM(getSrcPage(text, config, profile))
.catch(handleNetWorkError)
.then(handleDOM)
}
-function handleDOM (doc: Document): WeblioejjeSearchResult | Promise<WeblioejjeSearchResult> {
- const getOuterHTML = getOuterHTMLBuilder('https://ejje.weblio.jp')
+function handleDOM(
+ doc: Document
+): WeblioejjeSearchResult | Promise<WeblioejjeSearchResult> {
const result: WeblioejjeResult = []
doc.querySelectorAll<HTMLDivElement>('.mainBlock').forEach($entry => {
@@ -42,11 +50,11 @@ function handleDOM (doc: Document): WeblioejjeSearchResult | Promise<WeblioejjeS
const $summaryTbl = $entry.querySelector('.summaryTbl')
if ($summaryTbl) {
- head += getOuterHTML($summaryTbl, '.summaryL h1')
+ head += getOuterHTML(HOST, $summaryTbl, '.summaryL h1')
const $audio = $summaryTbl.querySelector('.summaryC audio source')
if ($audio) {
- head += getStaticSpeakerHTML($audio.getAttribute('src'))
+ head += getStaticSpeakerString($audio.getAttribute('src'))
}
$summaryTbl.outerHTML = `<div class="summaryHead">${head}</div>`
@@ -57,13 +65,14 @@ function handleDOM (doc: Document): WeblioejjeSearchResult | Promise<WeblioejjeS
removeChildren($entry, '.flex-rectangle-ads-frame')
removeChildren($entry, '.outsideLlTable')
- result.push({ content: getOuterHTML($entry) })
+ result.push({ content: getOuterHTML(HOST, $entry) })
return
}
- if (!$entry.className.includes('hlt_') ||
- $entry.classList.contains('hlt_CPRHT') ||
- $entry.classList.contains('hlt_RLTED')
+ if (
+ !$entry.className.includes('hlt_') ||
+ $entry.classList.contains('hlt_CPRHT') ||
+ $entry.classList.contains('hlt_RLTED')
) {
return
}
@@ -91,7 +100,7 @@ function handleDOM (doc: Document): WeblioejjeSearchResult | Promise<WeblioejjeS
$entry.querySelectorAll('.fa-volume-up').forEach($audio => {
const $source = $audio.querySelector('source')
if ($source) {
- $audio.outerHTML = getStaticSpeakerHTML($source.getAttribute('src'))
+ $audio.replaceWith(getStaticSpeaker($source.getAttribute('src')))
}
})
@@ -106,7 +115,7 @@ function handleDOM (doc: Document): WeblioejjeSearchResult | Promise<WeblioejjeS
}
})
- result.push({ title, content: getOuterHTML($entry) })
+ result.push({ title, content: getOuterHTML(HOST, $entry) })
})
return result.length > 0 ? { result } : handleNoResult()
diff --git a/test/specs/components/dictionaries/weblioejje/requests.mock.ts b/test/specs/components/dictionaries/weblioejje/requests.mock.ts
new file mode 100644
index 000000000..c72ceb6eb
--- /dev/null
+++ b/test/specs/components/dictionaries/weblioejje/requests.mock.ts
@@ -0,0 +1,25 @@
+import { MockRequest } from '@/components/dictionaries/helpers'
+
+export const mockSearchTexts = ['love', '愛']
+
+export const mockRequest: MockRequest = mock => {
+ mock
+ .onGet(/love/)
+ .reply(
+ 200,
+ new DOMParser().parseFromString(
+ require(`raw-loader!./response/love.html`).default,
+ 'text/html'
+ )
+ )
+
+ mock
+ .onGet(new RegExp(encodeURIComponent('愛')))
+ .reply(
+ 200,
+ new DOMParser().parseFromString(
+ require(`raw-loader!./response/愛.html`).default,
+ 'text/html'
+ )
+ )
+}
|
refactor
|
weblioejje
|
1c6c09afe7e537ff89950690fc79c10a22edf794
|
2020-06-01 10:19:11
|
crimx
|
refactor: replace rxjs empty() with EMPTY
| false
|
diff --git a/src/background/sync-manager/__mocks__/helpers.ts b/src/background/sync-manager/__mocks__/helpers.ts
index ab0d5749f..f050492b4 100644
--- a/src/background/sync-manager/__mocks__/helpers.ts
+++ b/src/background/sync-manager/__mocks__/helpers.ts
@@ -1,4 +1,4 @@
-import { empty, Observable } from 'rxjs'
+import { EMPTY, Observable } from 'rxjs'
const emptyPromise = (): Promise<any> => Promise.resolve()
@@ -6,7 +6,7 @@ export const setSyncConfig = jest.fn(emptyPromise)
export const getSyncConfig = jest.fn(emptyPromise)
-export const createSyncConfigStream = jest.fn((): Observable<any> => empty())
+export const createSyncConfigStream = jest.fn((): Observable<any> => EMPTY)
export const setMeta = jest.fn(emptyPromise)
diff --git a/src/content/redux/epics/index.ts b/src/content/redux/epics/index.ts
index 5766a19dd..b941c0713 100644
--- a/src/content/redux/epics/index.ts
+++ b/src/content/redux/epics/index.ts
@@ -1,5 +1,5 @@
import { combineEpics } from 'redux-observable'
-import { from, of, empty } from 'rxjs'
+import { from, of, EMPTY } from 'rxjs'
import { map, mapTo, mergeMap, filter } from 'rxjs/operators'
import { isPopupPage, isStandalonePage } from '@/_helpers/saladict'
@@ -62,7 +62,7 @@ export const epics = combineEpics<StoreAction, StoreAction, StoreState>(
console.warn(e)
})
- return empty()
+ return EMPTY
}
return of({
diff --git a/src/content/redux/epics/newSelection.epic.ts b/src/content/redux/epics/newSelection.epic.ts
index 8780751d8..be0fb9ba9 100644
--- a/src/content/redux/epics/newSelection.epic.ts
+++ b/src/content/redux/epics/newSelection.epic.ts
@@ -1,5 +1,5 @@
import { switchMap } from 'rxjs/operators'
-import { empty, of } from 'rxjs'
+import { EMPTY, of } from 'rxjs'
import { StoreAction, StoreState } from '../modules'
import { Epic, ofType } from './utils'
import { message } from '@/_helpers/browser-api'
@@ -18,7 +18,7 @@ export const newSelectionEpic: Epic = (action$, state$) =>
}
if (isOptionsPage()) {
- return empty()
+ return EMPTY
}
if (withQssaPanel && config.qssaPageSel) {
@@ -27,7 +27,7 @@ export const newSelectionEpic: Epic = (action$, state$) =>
}
if (isStandalonePage()) {
- return empty()
+ return EMPTY
}
const { pinMode } = config
@@ -51,7 +51,7 @@ export const newSelectionEpic: Epic = (action$, state$) =>
})
}
- return empty()
+ return EMPTY
})
)
@@ -85,7 +85,7 @@ function selectionInsideDictPanel(
}
})
}
- return empty()
+ return EMPTY
}
function selectionToQSPanel(
@@ -110,5 +110,5 @@ function selectionToQSPanel(
payload: selection.word
})
}
- return empty()
+ return EMPTY
}
diff --git a/src/content/redux/epics/searchStart.epic.ts b/src/content/redux/epics/searchStart.epic.ts
index 427701ffb..16a7e9e3d 100644
--- a/src/content/redux/epics/searchStart.epic.ts
+++ b/src/content/redux/epics/searchStart.epic.ts
@@ -7,7 +7,7 @@ import {
tap,
switchMapTo
} from 'rxjs/operators'
-import { merge, from, empty } from 'rxjs'
+import { merge, from, EMPTY } from 'rxjs'
import { StoreAction } from '../modules'
import { Epic, ofType } from './utils'
import { isInNotebook, saveWord } from '@/_helpers/record-manager'
@@ -75,7 +75,7 @@ export const searchStartEpic: Epic = (action$, state$) =>
const playAudio$ =
payload && payload.id
- ? empty()
+ ? EMPTY
: searchResults$$.pipe(
filter(({ id, audio, result }) => {
if (!audio) return false
@@ -111,7 +111,7 @@ export const searchStartEpic: Epic = (action$, state$) =>
})
}),
// never pass to down stream
- switchMapTo(empty())
+ switchMapTo(EMPTY)
)
return merge(
diff --git a/src/selection/instant-capture.ts b/src/selection/instant-capture.ts
index cd7411583..ba66274f5 100644
--- a/src/selection/instant-capture.ts
+++ b/src/selection/instant-capture.ts
@@ -7,7 +7,7 @@ import { isStandalonePage, isInDictPanel } from '@/_helpers/saladict'
import { checkSupportedLangs } from '@/_helpers/lang-check'
import { message } from '@/_helpers/browser-api'
-import { fromEvent, merge, of, timer, combineLatest, empty, from } from 'rxjs'
+import { fromEvent, merge, of, timer, combineLatest, EMPTY, from } from 'rxjs'
import {
map,
mapTo,
@@ -23,7 +23,7 @@ import {
* Create an instant capture Observable
*/
export function createIntantCaptureStream(config: AppConfig | null) {
- if (!config) return empty()
+ if (!config) return EMPTY
const isPinned$ = message.self
.createStream('PIN_STATE')
diff --git a/src/selection/quick-search.ts b/src/selection/quick-search.ts
index fe3a9ba98..452dbbfd3 100644
--- a/src/selection/quick-search.ts
+++ b/src/selection/quick-search.ts
@@ -1,4 +1,4 @@
-import { empty, merge } from 'rxjs'
+import { EMPTY, merge } from 'rxjs'
import { share, buffer, debounceTime, filter } from 'rxjs/operators'
import { AppConfig } from '@/app-config'
import { isStandalonePage, isOptionsPage } from '@/_helpers/saladict'
@@ -11,7 +11,7 @@ import { whenKeyPressed, isQSKey } from './helper'
*/
export function createQuickSearchStream(config: AppConfig | null) {
if (!config || !config.tripleCtrl || isStandalonePage() || isOptionsPage()) {
- return empty()
+ return EMPTY
}
const qsKeyPressed$$ = share<true>()(whenKeyPressed(isQSKey))
diff --git a/src/selection/select-text.ts b/src/selection/select-text.ts
index 33ebc0846..e5d9f5ad2 100644
--- a/src/selection/select-text.ts
+++ b/src/selection/select-text.ts
@@ -1,4 +1,4 @@
-import { empty, fromEvent, merge, timer, Observable } from 'rxjs'
+import { EMPTY, fromEvent, merge, timer, Observable } from 'rxjs'
import {
withLatestFrom,
filter,
@@ -34,7 +34,7 @@ import { isTypeField, newSelectionWord } from './helper'
export function createSelectTextStream(config: AppConfig | null) {
if (!config) {
- return empty()
+ return EMPTY
}
return config.touchMode ? withTouchMode(config) : withoutTouchMode(config)
|
refactor
|
replace rxjs empty() with EMPTY
|
d5010cfd3d8d6883c286a70910191c2ad7357962
|
2019-08-05 19:36:24
|
crimx
|
refactor(dicts): vocabulary
| false
|
diff --git a/src/components/dictionaries/vocabulary/View.tsx b/src/components/dictionaries/vocabulary/View.tsx
index d0ca091ee..0eb563ce1 100644
--- a/src/components/dictionaries/vocabulary/View.tsx
+++ b/src/components/dictionaries/vocabulary/View.tsx
@@ -1,15 +1,12 @@
-import React from 'react'
+import React, { FC } from 'react'
import { VocabularyResult } from './engine'
import { ViewPorps } from '@/components/dictionaries/helpers'
-export default class DictVocabulary extends React.PureComponent<ViewPorps<VocabularyResult>> {
- render () {
- const { long, short } = this.props.result
- return (
- <>
- <p className='dictVocabulary-Short'>{short}</p>
- <p className='dictVocabulary-Long'>{long}</p>
- </>
- )
- }
-}
+export const DictVocabulary: FC<ViewPorps<VocabularyResult>> = ({ result }) => (
+ <>
+ <p className="dictVocabulary-Short">{result.short}</p>
+ <p className="dictVocabulary-Long">{result.long}</p>
+ </>
+)
+
+export default DictVocabulary
diff --git a/src/components/dictionaries/vocabulary/_style.scss b/src/components/dictionaries/vocabulary/_style.shadow.scss
similarity index 100%
rename from src/components/dictionaries/vocabulary/_style.scss
rename to src/components/dictionaries/vocabulary/_style.shadow.scss
diff --git a/src/components/dictionaries/vocabulary/engine.ts b/src/components/dictionaries/vocabulary/engine.ts
index e8ba859d0..78fd2165a 100644
--- a/src/components/dictionaries/vocabulary/engine.ts
+++ b/src/components/dictionaries/vocabulary/engine.ts
@@ -5,10 +5,10 @@ import {
handleNetWorkError,
SearchFunction,
GetSrcPageFunction,
+ DictSearchResult
} from '../helpers'
-import { DictSearchResult } from '@/typings/server'
-export const getSrcPage: GetSrcPageFunction = (text) => {
+export const getSrcPage: GetSrcPageFunction = text => {
return `https://www.vocabulary.com/dictionary/${text}`
}
@@ -19,20 +19,32 @@ export interface VocabularyResult {
type VocabularySearchResult = DictSearchResult<VocabularyResult>
-export const search: SearchFunction<VocabularySearchResult> = (
- text, config, profile, payload
+export const search: SearchFunction<VocabularyResult> = (
+ text,
+ config,
+ profile,
+ payload
) => {
- return fetchDirtyDOM('https://www.vocabulary.com/dictionary/' + encodeURIComponent(text.replace(/\s+/g, ' ')))
+ return fetchDirtyDOM(
+ 'https://www.vocabulary.com/dictionary/' +
+ encodeURIComponent(text.replace(/\s+/g, ' '))
+ )
.catch(handleNetWorkError)
.then(handleDOM)
}
-function handleDOM (doc: Document): VocabularySearchResult | Promise<VocabularySearchResult> {
+function handleDOM(
+ doc: Document
+): VocabularySearchResult | Promise<VocabularySearchResult> {
const short = getText(doc, '.short')
- if (!short) { return handleNoResult() }
+ if (!short) {
+ return handleNoResult()
+ }
const long = getText(doc, '.long')
- if (!long) { return handleNoResult() }
+ if (!long) {
+ return handleNoResult()
+ }
return { result: { long, short } }
}
diff --git a/test/specs/components/dictionaries/vocabulary/requests.mock.ts b/test/specs/components/dictionaries/vocabulary/requests.mock.ts
new file mode 100644
index 000000000..7927eb814
--- /dev/null
+++ b/test/specs/components/dictionaries/vocabulary/requests.mock.ts
@@ -0,0 +1,15 @@
+import { MockRequest } from '@/components/dictionaries/helpers'
+
+export const mockSearchTexts = ['love']
+
+export const mockRequest: MockRequest = mock => {
+ mock
+ .onGet(/vocabulary/)
+ .reply(
+ 200,
+ new DOMParser().parseFromString(
+ require(`raw-loader!./response/love.html`).default,
+ 'text/html'
+ )
+ )
+}
|
refactor
|
vocabulary
|
188d77694ab1c945c6253f4269b54cd2ee58f500
|
2018-12-20 17:23:58
|
CRIMX
|
chore(release): 6.22.3
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7df47edad..b3aa3c096 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
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.22.3"></a>
+## [6.22.3](https://github.com/crimx/ext-saladict/compare/v6.22.2...v6.22.3) (2018-12-20)
+
+
+### Bug Fixes
+
+* **dicts:** extract cambridge plurals ([2124c17](https://github.com/crimx/ext-saladict/commit/2124c17))
+* **dicts:** update cambridge parser Closes [#266](https://github.com/crimx/ext-saladict/issues/266) ([b996c87](https://github.com/crimx/ext-saladict/commit/b996c87))
+
+
+
<a name="6.22.2"></a>
## [6.22.2](https://github.com/crimx/ext-saladict/compare/v6.22.1...v6.22.2) (2018-12-14)
diff --git a/package.json b/package.json
index a4168622a..61dbde1be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.22.2",
+ "version": "6.22.3",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.22.3
|
84ec377ed2fd6b967640b51d3a3e4a3a57a81cee
|
2018-05-10 18:08:26
|
CRIMX
|
refactor(dicts): refactor COBUILD
| false
|
diff --git a/config/fake-env/fake-ajax.js b/config/fake-env/fake-ajax.js
index c0664a4fd..e9801536d 100644
--- a/config/fake-env/fake-ajax.js
+++ b/config/fake-env/fake-ajax.js
@@ -17,6 +17,19 @@ const fakeXHRData = [
)
},
},
+ {
+ test: {
+ method: /.*/,
+ url: /\.iciba\.com/,
+ },
+ response: {
+ status: 200,
+ responseXML: new DOMParser().parseFromString(
+ require('raw-loader!../../test/specs/components/dictionaries/cobuild/response/love.html'),
+ 'text/html'
+ )
+ },
+ },
]
const fakeFetchData = [
diff --git a/src/app-config.ts b/src/app-config.ts
index 6e8dbe048..6c8f4f05a 100644
--- a/src/app-config.ts
+++ b/src/app-config.ts
@@ -42,6 +42,9 @@ const allDicts = {
selectionLang: {
eng: true,
chs: true
+ },
+ options: {
+ sentence: 4
}
},
dictcn: {
diff --git a/src/components/dictionaries/cobuild/View.tsx b/src/components/dictionaries/cobuild/View.tsx
new file mode 100644
index 000000000..76f3048f6
--- /dev/null
+++ b/src/components/dictionaries/cobuild/View.tsx
@@ -0,0 +1,43 @@
+import React from 'react'
+import Speaker from '@/components/Speaker'
+import StarRates from '@/components/StarRates'
+import { COBUILDResult } from './engine'
+
+export default class DictCOBUILD extends React.PureComponent<{ result: COBUILDResult }> {
+ render () {
+ const { result } = this.props
+ return (
+ <>
+ <h1 className='dictCOBUILD-Title'>{result.title}</h1>
+ {result.prons &&
+ <ul className='dictCOBUILD-Pron'>
+ {result.prons.map(p => (
+ <li key={p.phsym} className='dictCOBUILD-PronItem'>
+ {p.phsym}
+ <Speaker src={p.audio} />
+ </li>
+ ))}
+ </ul>
+ }
+ <div className='dictCOBUILD-Rate'>
+ {result.star as number >= 0 &&
+ <StarRates rate={result.star} width={15} gutter={4} />
+ }
+ {result.level &&
+ <span className='dictCOBUILD-Level'>{result.level}</span>
+ }
+ </div>
+ {result.defs &&
+ <ol className='dictCOBUILD-Defs'>
+ {result.defs.map((def, i) => (
+ <li className='dictCOBUILD-Def'
+ key={i}
+ dangerouslySetInnerHTML={{ __html: def }}
+ />
+ ))}
+ </ol>
+ }
+ </>
+ )
+ }
+}
diff --git a/src/components/dictionaries/cobuild/_locales.json b/src/components/dictionaries/cobuild/_locales.json
index f03b1d386..1eea4bc76 100644
--- a/src/components/dictionaries/cobuild/_locales.json
+++ b/src/components/dictionaries/cobuild/_locales.json
@@ -3,5 +3,17 @@
"en": "COBUILD",
"zh_CN": "COBUILD",
"zh_TW": "COBUILD"
+ },
+ "options": {
+ "sentence": {
+ "en": "Show sentences",
+ "zh_CN": "显示例句",
+ "zh_TW": "展示例句"
+ },
+ "sentence_unit": {
+ "en": "results",
+ "zh_CN": "个",
+ "zh_TW": "個"
+ }
}
}
diff --git a/src/components/dictionaries/cobuild/_style.scss b/src/components/dictionaries/cobuild/_style.scss
new file mode 100644
index 000000000..8a32218d0
--- /dev/null
+++ b/src/components/dictionaries/cobuild/_style.scss
@@ -0,0 +1,60 @@
+.dictCOBUILD-Title {
+ font-size: 1.3em;
+ font-weight: bold;
+}
+
+.dictCOBUILD-Pron {
+ display: flex;
+ margin-bottom: 5px;
+}
+
+.dictCOBUILD-PronItem {
+ margin-right: 1em;
+
+ .icon-Speaker {
+ margin-left: 2px;
+ }
+}
+
+.dictCOBUILD-Rate {
+ display: flex;
+ margin-bottom: 5px;
+}
+
+.dictCOBUILD-Level {
+ margin-left: 10px;
+ color: #aaa;
+}
+
+.dictCOBUILD-Defs {
+ margin: 0;
+ padding-left: 15px;
+}
+
+.dictCOBUILD-Def {
+ p {
+ margin: 0;
+ }
+
+ b {
+ color: #f9690e;
+ }
+
+ .prep-en {
+ display: block;
+ color: #777;
+ margin-bottom: 5px;
+ }
+
+ .text-sentence {
+ padding-left: 10px;
+ padding-bottom: 5px;
+ color: #333;
+ border-left: #ddd solid 2px;
+
+ &:last-child {
+ padding-bottom: 0;
+ margin-bottom: 10px;
+ }
+ }
+}
diff --git a/src/components/dictionaries/cobuild/engine.ts b/src/components/dictionaries/cobuild/engine.ts
index 3a59473e9..55c5d616f 100644
--- a/src/components/dictionaries/cobuild/engine.ts
+++ b/src/components/dictionaries/cobuild/engine.ts
@@ -1,40 +1,50 @@
-import fetchDom from 'src/helpers/fetch-dom'
-import stripScript from 'src/helpers/strip-script'
-
-/**
- * Search text and give back result
- * @param {string} text - Search text
- * @param {object} config - app config
- * @param {object} helpers - helper functions
- * @returns {Promise} A promise with the result, which will be passed to view.vue as `result` props
- */
-export default function search (text, config) {
- return fetchDom('http://www.iciba.com/' + text)
- .then(handleDom)
+import DOMPurify from 'dompurify'
+import fetchDOM from '@/_helpers/fetch-dom'
+import { handleNoResult } from '../helpers'
+import { AppConfig, DictConfigs } from '@/app-config'
+import { DictSearchResult } from '@/typings/server'
+
+export interface COBUILDResult {
+ title: string
+ defs: string[]
+ level?: string
+ star?: number
+ prons?: Array<{
+ phsym: string
+ audio: string
+ }>
}
-/**
-* @typedef {Object} CobuildResult
-* @property {string} title
-* @property {string} level
-* @property {number} star
-* @property {Object[]} prons
-* @property {string} prons[].phsym
-* @property {string} prons[].audio
-* @property {string[]} defs
-*/
-
-/**
- * @returns {Promise.<CobuildResult>} A promise with the result to send back
- */
-function handleDom (doc) {
- let result = {}
+type COBUILDSearchResult = DictSearchResult<COBUILDResult>
+
+export default function search (
+ text: string,
+ config: AppConfig
+): Promise<COBUILDSearchResult> {
+ return fetchDOM('https://www.iciba.com/' + text)
+ .then(doc => handleDom(doc, config.dicts.all.cobuild.options))
+ .catch(() => {
+ return fetchDOM('http://www.iciba.com/' + text)
+ .then(doc => handleDom(doc, config.dicts.all.cobuild.options))
+ })
+}
+
+function handleDom (
+ doc: Document,
+ options: DictConfigs['cobuild']['options']
+): COBUILDSearchResult | Promise<COBUILDSearchResult> {
+ const result: Partial<COBUILDResult> = {}
+ const audio: { uk?: string, us?: string } = {}
let $title = doc.querySelector('.keyword')
- if ($title) { result.title = $title.innerText.trim() }
+ if ($title && $title.textContent) {
+ result.title = $title.textContent.trim()
+ }
let $level = doc.querySelector('.base-level')
- if ($level) { result.level = $level.innerText.trim() }
+ if ($level && $level.textContent) {
+ result.level = $level.textContent.trim()
+ }
let $star = doc.querySelector('.word-rate [class^="star"]')
if ($star) {
@@ -44,20 +54,36 @@ function handleDom (doc) {
let $pron = doc.querySelector('.base-speak')
if ($pron) {
- result.prons = Array.from($pron.children).map(el => ({
- phsym: el.innerText.trim(),
- audio: (/http\S+.mp3/.exec(el.innerText) || [''])[0]
- }))
+ result.prons = Array.from($pron.children).map(el => {
+ const phsym = (el.textContent || '').trim()
+ const mp3 = (/http\S+.mp3/.exec(el.innerHTML) || [''])[0]
+
+ if (phsym.indexOf('英') !== -1) {
+ audio.uk = mp3
+ } else if (phsym.indexOf('美') !== -1) {
+ audio.us = mp3
+ }
+
+ return {
+ phsym,
+ audio: mp3,
+ }
+ })
}
- let $article = Array.from(doc.querySelectorAll('.info-article')).find(x => /柯林斯高阶英汉双解学习词典/.test(x.innerText))
+ let $article = Array.from(doc.querySelectorAll('.info-article'))
+ .find(x => /柯林斯高阶英汉双解学习词典/.test(x.textContent || ''))
if ($article) {
result.defs = Array.from($article.querySelectorAll('.prep-order'))
- .map(x => stripScript(x).innerHTML)
+ .slice(0, options.sentence)
+ .map(d => DOMPurify.sanitize(d.outerHTML))
}
- if (Object.keys(result).length > 0) {
- return result
+ console.log(doc)
+
+ if (result.title && result.defs && result.defs.length > 0) {
+ return { result, audio } as COBUILDSearchResult
}
- return Promise.reject('no result')
+
+ return handleNoResult()
}
diff --git a/test/specs/components/dictionaries/cobuild/engine.spec.ts b/test/specs/components/dictionaries/cobuild/engine.spec.ts
new file mode 100644
index 000000000..509753b36
--- /dev/null
+++ b/test/specs/components/dictionaries/cobuild/engine.spec.ts
@@ -0,0 +1,32 @@
+import search from '@/components/dictionaries/cobuild/engine'
+import { appConfigFactory, AppConfigMutable } from '@/app-config'
+
+jest.mock('@/_helpers/fetch-dom', () => {
+ return jest.fn((url: string) => new Promise((resolve, reject) => {
+ const fs = require('fs')
+ const { JSDOM } = require('jsdom')
+ const response = fs.readFileSync('test/specs/components/dictionaries/cobuild/response/love.html', 'utf8')
+ return resolve(new JSDOM(response).window.document)
+ }))
+})
+
+describe('Dict/COBUILD/engine', () => {
+ it('should parse result correctly', () => {
+ const config = appConfigFactory() as AppConfigMutable
+ config.dicts.all.cobuild.options = {
+ sentence: 4
+ }
+ return search('any', config)
+ .then(searchResult => {
+ expect(searchResult.audio).toHaveProperty('us', expect.stringContaining('mp3'))
+ expect(searchResult.audio).toHaveProperty('uk', expect.stringContaining('mp3'))
+
+ const result = searchResult.result
+ expect(typeof result.title).toBe('string')
+ expect(typeof result.level).toBe('string')
+ expect(typeof result.star).toBe('number')
+ expect(result.defs).toHaveLength(4)
+ expect(result.prons).toHaveLength(2)
+ })
+ })
+})
diff --git a/test/specs/components/dictionaries/cobuild/response/love.html b/test/specs/components/dictionaries/cobuild/response/love.html
new file mode 100644
index 000000000..cd83f30c8
--- /dev/null
+++ b/test/specs/components/dictionaries/cobuild/response/love.html
@@ -0,0 +1,1213 @@
+
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset='utf-8'>
+ <meta http-equiv='X-UA-Compatible' content='IE=Edge'>
+ <meta name='baidu-site-verification' content='cU06Y0SNXq'/><title>face是什么意思_face的翻译_音标_读音_用法_例句_爱词霸在线词典</title>
+ <meta name='keywords' content='face,face是什么意思,face的翻译,face怎么读,face的读音,face的用法,face的例句'>
+ <meta name='description'
+ content='爱词霸权威在线词典,为您提供face的中文意思,face的用法讲解,face的读音,face的同义词,face的反义词,face的例句等英语服务。'></head><script src=http://cdn.iciba.com/www/js/jquery/1.9.1.min.js></script> <link rel=stylesheet href="/css/search.css?t=1525852240126"> <script>
+(function() {
+var isPC = (function() {
+var userAgentInfo = navigator.userAgent;
+var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+var flag = true;
+for (var i = 0; i < Agents.length; i++) {
+ if (userAgentInfo.indexOf(Agents[i]) > 0) {
+ flag = false;
+ break;
+ }
+}
+return flag;
+})();
+
+/*!isPC && (window.location.href = 'http://www.iciba.com/index.php?c=search&s=' + window.location.pathname.split('\/').pop());*/
+!isPC && (window.location.href = 'http://www.iciba.com/index.php?c=search&s=' + window.location.pathname.split('\/').pop());
+})();
+</script> <body> <script type=text/javascript src=http://open.iciba.com/huaci_new/huaci.js></script> <script type=text/javascript src=http://cdn.iciba.com/www/js/avalon.1.5.5.min.js></script> <script type=text/javascript src=http://cdn.iciba.com/www/js/require.js></script> <script type=text/javascript src=./js/search.js></script> <script type=text/javascript src=http://cdn.iciba.com/www/img/activity/common/active-11-11.js></script> <div class=screen> <div class="goto-top goto-top-2" title=微信小程序> <span>小程序</span> <img src=http://cdn.iciba.com/www/img/www/wx-small-program.png> </div> <div class=goto-top title=返回顶部 onclick="_czc.push(['_trackEvent','查词结果页','返回顶部','按钮','','']);"> <i class=goto-top-icon></i> </div> <link rel=stylesheet href=http://cdn.iciba.com/www/top/top.css> <script src=http://cdn.iciba.com/www/top/top.js></script> <div style="display: none; position: absolute; top: 128px; right: 40px; width: 194px; height: 85px; z-index: 999;" class=ad-sign> <a href=http://activity.iciba.com/views/pcLottery/index.html onclick="_czc.push(['_trackEvent','查词结果页','签到抽奖','按钮','','']);" target=_blank> <img class=img-f src="./images/pc-pic.png?t=123123123123" alt=""> </a> </div> <script>
+$(function() {
+ var div = $('.ad-sign')
+ $.ajax({
+ url: 'http://activity.iciba.com/index.php?c=pc_prize&m=isActive',
+ dataType: 'jsonp',
+ success: function(data) {
+ if (data.status === 1) {
+ var top = div.css('top')
+ var todo = function() {
+ div[window.innerWidth < 1280 ? 'hide' : 'show']()
+ }
+ var win = $(window).resize(todo).scroll(function() {
+ if (win.scrollTop() > 110) {
+ div.css({
+ position: 'fixed',
+ top: 15
+ })
+ } else {
+ div.css({
+ position: 'absolute',
+ top: top
+ })
+ }
+ })
+ todo()
+ } else {
+ div.remove()
+ div = null
+ }
+ }
+ })
+})
+</script> <div class=search> <iframe class=search-ad ms-src=adUrl frameborder=0 data-refresh=ad-top scrolling=no></iframe> <script src=http://dup.baidustatic.com/js/os.js></script> <div class=search-box> <div class=search-bar> <div class=search-icon ms-on-click=submit onclick="_czc.push(['_trackEvent','查词结果页','搜索icon','搜索框','','']);"></div> <div class=search-input> <input type=text id=search-input class=search-input-main autocomplete=off placeholder=单词和句子都交给小词 ms-duplex=value ms-on-focus=focus ms-on-blur=blur ms-on-input=input ms-on-keydown=keydown($event)> </div> <div class=search-clear ms-on-click=clear onclick="_czc.push(['_trackEvent','查词结果页','清除','搜索框','','']);"> <i class=search-clear-icon></i> <span class=search-clear-word>清除</span> </div> <div class=search-line></div> <div class=search-hot onclick="_czc.push(['_trackEvent','查词结果页','最新热词','搜索框','','']);"> <i class=search-hot-icon></i> <span class=search-hot-word>最新热词</span> </div> <div class=search-word ms-if=hotword.length> <i class=search-word-icon-1></i> <i class=search-word-icon-2></i> <a class=search-word-item ms-repeat-item=hotword ms-attr-href="'/'+item.word" ms-on-click=hideWord ms-data-cnzz="'_trackEvent,查词结果页,热词'+($index+1)+',搜索框,,'" ms-text=item.word></a> </div> <div class=search-suggest ms-visible=focusing&&suggest.length ms-on-mousedown=mousedown($event)> <a class=search-suggest-item ms-repeat-item=suggest ms-attr-href=/{{item.title}} ms-class="search-suggest-item-on:$index===index"> <span class=search-suggest-main ms-text=item.title></span> <span class=search-suggest-desc ms-text=item.content></span> </a> </div> </div> </div> <div class=search-history> <div class=search-history-label ms-visible=history.length>历史记录</div> <div class=search-history-item ms-repeat-item=history> <a ms-attr-href=/{{item}} ms-text=item ms-data-cnzz="'_trackEvent,查词结果页,历史记录'+($index+1)+',搜索框,,'"></a> </div> </div> </div> <div class=container> <div class=menu ms-controller=menu ms-on-click-1=scrollTo($event) ms-on-click-2=toggle($event)> <div class=menu-group ms-repeat-group=map> <div class=menu-title> <i class=menu-title-icon></i> <span class=menu-title-word ms-text=group.name></span> </div> <ul class=menu-content> <li class=menu-item ms-class="menu-item-on:index===item.index" ms-repeat-item=group.list ms-text=item.name ms-data-index=item.index ms-data-cnzz="'_trackEvent,查词结果页,'+(item.name)+',侧边导航,,'"></li> </ul> </div> <div class=menu-button onclick="_czc.push(['_trackEvent','查词结果页','划译开关','侧边导航','','']);"> <div class=menu-button-box> <i class=menu-button-icon></i> <span class=name-button-word>划译</span> </div> <div class=menu-button-cover> <i class=menu-button-disabled></i> <span class=name-button-word>划译</span> </div> </div> <a class="mac-download-btn hide" href=http://download.iciba.com/mac/mac1.0.1/PowerWord.dmg target=_blank> <div class=menu-mac-button> <i class=menu-mac-icon></i> <span class=menu-mac-text>下载词霸Mac版</span> </div> </a> </div> <div class=container-left style=display:none;> <div class=js-base-info ms-controller=baseinfo>
+
+<div class="info-article info-base" style="display: block;">
+<div class="in-base">
+<div class="in-base-top clearfix" class="clearfix">
+
+ <h1 class="keyword">
+ face </h1>
+
+ <div class="base-top-voice">
+
+ <div class="base-speak">
+ <span>
+ <span>英 [feɪs]</span>
+ <i class="new-speak-step" ms-on-mouseover="sound('http://res.iciba.com/resource/amp3/oxford/0/2a/b8/2ab8a23c8c7b8779cd9fecb335b21d49.mp3')"></i>
+ </span>
+ <span>
+ <span>美 [fes]</span>
+ <i class="new-speak-step" ms-on-mouseover="sound('http://res.iciba.com/resource/amp3/1/0/d5/ca/d5ca322453f2986b752e58b11af83d96.mp3')"></i>
+ </span>
+ </div>
+
+ <div class="base-word" >
+ <div class="word-rate">
+ <p class="star5">
+ <i class="light light1"></i>
+ <i class="light light2"></i>
+ <i class="light light3"></i>
+ <i class="light light4"></i>
+ <i class="light light5"></i>
+ </p>
+ </div>
+ <div class="base-level">
+ <p>
+ <span>
+ 考研 / </span>
+ <span>
+ TOEFL / </span>
+ <span>
+ IELTS </span>
+ </p>
+ </div>
+ </div>
+ </div>
+
+</div>
+
+ <ul class="base-list switch_part" class="">
+ <li class="clearfix">
+ <span class="prop">n.</span>
+ <p>
+ <span>面容；</span>
+ <span>表面；</span>
+ <span>脸；</span>
+ <span>方面</span>
+ </p>
+ </li>
+ <li class="clearfix">
+ <span class="prop">vt.& vi.</span>
+ <p>
+ <span>面对；</span>
+ <span>面向…；</span>
+ <span>正视；</span>
+ <span>承认</span>
+ </p>
+ </li>
+ <li class="clearfix">
+ <span class="prop">vt.</span>
+ <p>
+ <span>（感到不能）对付；</span>
+ <span>（明知不好办而）交谈；</span>
+ <span>必须对付（某情况）；</span>
+ <span>面临…</span>
+ </p>
+ </li>
+ </ul>
+
+
+ <li class="change clearfix">
+ <h1 class="base-word abbr chinese change-base">变形</h1>
+ <p>
+ <span>复数：
+ <a class="shape" href="/faces">faces</a> </span>
+ <span>过去式：
+ <a class="shape" href="/faced">faced</a> </span>
+ <span>过去分词：
+ <a class="shape" href="/faced">faced</a> </span>
+ <span>现在分词：
+ <a class="shape" href="/facing">facing</a> </span>
+ <span>第三人称单数：
+ <a class="shape" href="/faces">faces</a> </span>
+ </p>
+ </li>
+
+<!-- 一元好课 广告 临时 end -->
+<hr style="height:1px;border:none;margin:0;margin-top:15px;border-top:1px solid #e4e3c7;">
+<div class="base-bt-bar">
+ <script>
+ (function() {
+ var s = "_" + Math.random().toString(36).slice(2);
+ document.write('<div id="' + s + '"></div>');
+ (window.slotbydup=window.slotbydup || []).push({
+ id: '2613320',
+ container: s,
+ size: '170,20',
+ display: 'inlay-fix'
+ });
+ })();
+ </script>
+ <script src="http://dup.baidustatic.com/js/os.js"></script>
+ <div class="base-bt-sg">
+ <div class="ad_sougo" onclick="_czc.push(['_trackEvent','查词结果','搜狗','基础释义','','']);">
+ <!-- <i></i> -->
+ <span>
+ <script>
+ (function() {
+ var s = "_" + Math.random().toString(36).slice(2);
+ document.write('<div id="' + s + '"></div>');
+ (window.slotbydup=window.slotbydup || []).push({
+ id: '2590892',
+ container: s,
+ size: '170,20',
+ display: 'inlay-fix'
+ });
+ })();
+ </script>
+ <script src="http://dup.baidustatic.com/js/os.js"></script>
+ </span>
+ </div>
+ </div>
+</div>
+
+ <div class="cb-downloadbar">
+ <div>
+ <span></span>
+ 一键安装桌面版，查词翻译快三倍
+ </div>
+ <a href="http://hoplink.ksosoft.com/wnx0" onclick="_czc.push(['_trackEvent','查词结果页','基础释义','点击下载','','']);" target="_blank"></a>
+ </div>
+
+ <div class="scb-btn" onclick="_czc.push(['_trackEvent','查词结果','添加生词本','基本释义右上','','']);">
+ <a class="scb-icon" href="javascript:void(0);"></a>
+ </div>
+
+<div class="scb-con">
+ <i class="triangle-top"></i>
+ <div class="scb-wrap">
+ <p class="scb-choose">选择要添加的生词本</p>
+ <div id="scrollbar1">
+ <div class="scrollbar">
+ <div class="track">
+ <div class="thumb"></div>
+ </div>
+ </div>
+ <div class="viewport">
+ <div class="overview">
+ <div class="scb-action">
+ <ul class="scb-list"></ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ <p class="scb-entry">
+ <a class="scb-create" href="javascript:void(0);" onclick="_czc.push(['_trackEvent','查词结果','创建生词本','基本释义右上','','']);">
+ <i class="plus"></i>
+ 新建生词本
+ </a>
+ <a class="go-scb" href="javascript:void(0);" target="_blank" onclick="_czc.push(['_trackEvent','查词结果','进入生词本','基本释义右上','','']);">
+ 进入生词本
+ <i class="jump"></i>
+ </a>
+ </p>
+ </div>
+</div>
+</div>
+</div>
+
+
+
+</div> <div class=js-main-content ms-controller=mainContent> <div ms-visible=data.sentence||data.auth_sentence||data.jushi class="info-article article-tab"> <ul class="article-list clearfix"> <li ms-if=data.sentence ms-class="current:doublesentenceTag==0" ms-click="set('doublesentenceTag', 0)" onclick="_czc.push(['_trackEvent','查词结果','双语例句','查看更多','','']);">双语例句</li> <li ms-if=data.jushi ms-class="current:doublesentenceTag==1" ms-click="set('doublesentenceTag', 1)" onclick="_czc.push(['_trackEvent','查词结果','句式用法','查看更多','','']);">句式用法</li> <li ms-if=data.auth_sentence ms-class="current:doublesentenceTag==2" ms-click="set('doublesentenceTag', 2)" onclick="_czc.push(['_trackEvent','查词结果','权威例句','查看更多','','']);">权威例句</li> <li class=info-display> <i class=ico-display></i> </li> </ul> <div class=article> <div ms-if=data.sentence class=article-section ms-class="none:doublesentenceTag!=0"> <div ms-if=data.sentence ms-repeat-item=data.sentence class=section-p> <span class=p-order ms-text="$index+1+'.'"></span> <div class=p-container> <p class="p-english family-english size-english"> <span ms-html="item.Network_en | highlight(0)"></span> <i class=icon-sound ms-on-click=sound(item.tts_mp3)></i> </p> <p class="p-chinese family-chinese size-chinese" ms-html="item.Network_cn | highlight(1)"></p> <p class=p-from ms-text="item.Network_from ? '来自'+item.Network_from :''"></p> </div> </div> <div class=section-more> <a ms-attr-href="'http://dj.iciba.com/'+decodeURIComponent(word)+'-1.html'" target=_blank onclick="_czc.push(['_trackEvent','查词结果','双语例句更多','','','']);">查看更多</a> </div> </div> <div ms-if=data.jushi class=article-section ms-class="none:doublesentenceTag!=1"> <div class=section-p> <div ms-if=data.jushi ms-repeat-item=data.jushi class=section-p> <span class=p-order ms-text="$index+1+'.'"></span> <div class=p-container> <p class="p-english family-english size-english"> <span ms-html="item.english | highlight"></span> <i class=icon-sound ms-on-click=sound(item.mp3)></i> </p> <p class="p-chinese family-chinese size-chinese" ms-html="item.chinese | highlight"></p> <p class=p-from>来自《权威词典》</p> </div> </div> </div> <div class=section-more> <a ms-attr-href=http://dj.iciba.com/{{word}}-3.html target=_blank onclick="_czc.push(['_trackEvent','查词结果','句式用法更多','','','']);">查看更多</a> </div> </div> <div ms-if=data.auth_sentence class=article-section ms-class="none:doublesentenceTag!=2"> <div ms-repeat-item=data.auth_sentence class=section-p> <span class=p-order ms-text="$index+1+'.'"></span> <div class=p-container> <p class="p-english family-english size-english"> <span ms-html="item.content | highlight"></span> <i class=icon-sound ms-on-click=sound(item.tts_mp3)></i> </p> <p class="p-chinese family-chinese size-chinese"></p> <p class=p-from ms-text="'来自'+item.source"></p> </div> </div> <div class=section-more> <a ms-attr-href=http://dj.iciba.com/{{word}}-2.html target=_blank onclick="_czc.push(['_trackEvent','查词结果','权威例句更多','','','']);">查看更多</a> </div> </div> </div> </div> <div ms-visible=data.cetFour||data.cetSix class="info-article cet-tab"> <ul class="article-list clearfix"> <li ms-if=data.cetFour ms-class="current:cetTag==0" ms-click="set('cetTag', 0)" onclick="_czc.push(['_trackEvent','查词结果','四级真题','tab切换','','']);">四级真题</li> <li ms-if=data.cetSix ms-class="current:cetTag==1" ms-click="set('cetTag', 1)" onclick="_czc.push(['_trackEvent','查词结果','六级真题','tab切换','','']);">六级真题</li> <li class=info-display> <i class=ico-display></i> </li> </ul> <div class=article> <div ms-if=data.cetFour class=article-section ms-class="none:cetTag!=0"> <p class=cet-tip> <span>自2010年至今的四级考试中，</span> <strong ms-text=data.cetFour.word></strong> <span>共出现过</span> <strong ms-text=data.cetFour.count></strong> <span>次</span> </p> <div ms-if=data.cetFour.Sentence ms-repeat-item=data.cetFour.Sentence class=section-p> <span class=p-order ms-text="$index+1+'.'"></span> <div class=p-container> <p class="p-english family-english size-english" ms-html="item.sentence | highlight"></p> <p class=p-from ms-text=item.come></p> </div> </div> </div> <div ms-if=data.cetSix class=article-section ms-class="none:cetTag!=1"> <p class=cet-tip> <span>自2010年至今的六级考试中，</span> <strong ms-text=data.cetSix.word></strong> <span>共出现过</span> <strong ms-text=data.cetSix.count></strong> <span>次</span> </p> <div ms-if=data.cetSix.Sentence ms-repeat-item=data.cetSix.Sentence class=section-p> <span class=p-order ms-text="$index+1+'.'"></span> <div class=p-container> <p class="p-english family-english size-english" ms-html="item.sentence | highlight"></p> <p class=p-from ms-text=item.come></p> </div> </div> </div> </div> </div>
+<div class="info-article" style="display: block;">
+<ul class="article-list clearfix">
+<li class="current">柯林斯高阶英汉双解学习词典</li>
+<li class="info-display">
+ <i class="ico-display"></i>
+</li>
+</ul>
+<div class="article">
+ <div class="collins-section">
+ <div class='section-h'>
+ <span class='h-order family-english'>A</span>
+ <p class="speech-yellow">
+ <span class='family-english'>NOUN USES</span>
+ <span>名词用法</span>
+ </p>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">1</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">N-COUNT</span>
+ <span class="family-chinese">脸;面孔</span>
+ <span class="family-english size-english prep-en">Your face is the front part of your head from your chin to the top of your forehead, where your mouth, eyes, nose, and other features are.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>He rolled down his window and stuck his <b>face</b> out...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/e/4/4/e4441a05e695ad3279f79fafefc94ac1.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>他摇下车窗，把头探了出去。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>A strong wind was blowing right in my <b>face</b>...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/9/d/3/9d3e560df6ba4cbd14f5e5198f5042e8.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>一阵劲风迎面吹来。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">2</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">N-COUNT</span>
+ <span class="family-chinese">面容;神色;神情</span>
+ <span class="family-english size-english prep-en">If your face is happy, sad, or serious, for example, the expression on your face shows that you are happy, sad, or serious.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>He was walking around with a sad <b>face</b>...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/0/a/3/0a3f14b8bb1defdf5efcf6d680298771.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>他四处走着，神色哀伤。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>The priest frowned into the light, his <b>face</b> puzzled.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/0/f/1/0f198dc130be3d202778172e480746a6.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>神父在亮光下皱起了眉头，一脸疑惑。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">3</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">N-COUNT</span>
+ <span class="family-chinese">崖面;山侧;(建筑物的)墙面</span>
+ <span class="family-english size-english prep-en">The face of a cliff, mountain, or building is a vertical surface or side of it.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>...the north <b>face</b> of the Eiger...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/2/e/a/2ea6ff8b5ee04a8212971e00b6e69044.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>艾格尔山北坡</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>He scrambled 200 feet up the cliff <b>face</b>.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/2/d/b/2db25f5be3983f7cdac233dd8d6c0b7f.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>他沿着崖面向上攀登了200英尺。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">4</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">N-COUNT</span>
+ <span class="family-chinese">钟面;表盘</span>
+ <span class="family-english size-english prep-en">The face of a clock or watch is the surface with the numbers or hands on it, which shows the time.</span>
+ </p>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">5</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">N-SING</span>
+ <span class="family-chinese">(地区、机构或活动领域的)外观，面貌</span>
+ <span class="family-english size-english prep-en">If you say that the face of an area, institution, or field of activity is changing, you mean its appearance or nature is changing.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>...the changing <b>face</b> of the British countryside...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/2/2/1/2213caebe62e7cbb4cdd52b0acab9205.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>英国乡村的日新月异</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>This would change the <b>face</b> of Malaysian politics.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/a/b/5/ab5889ea0b01b2e8165f1fee91c19605.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>这将改变马来西亚的政治面貌。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">6</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">N-SING</span>
+ <span class="family-chinese">(活动，信仰、制度等的)方面</span>
+ <span class="family-english size-english prep-en">If you refer to something as the particular face of an activity, belief, or system, you mean that it is one particular aspect of it, in contrast to other aspects.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Brothels, she insists, are the acceptable <b>face</b> of prostitution...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/e/0/a/e0a6df0ab0e8228eea674bc11e13b243.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>她坚持认为，妓院是卖淫可为人接受的一种形式。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Who ever thought people would see Arsenal as the acceptable <b>face</b> of football?</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/2/6/4/26444c35d877912757b532ab3ddf261e.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>谁会想到人们会认为足球之道可如阿森纳队呢？</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">7</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">N-UNCOUNT</span>
+ <span class="family-chinese">面子;脸面</span>
+ <span class="family-english size-english prep-en">If you lose face, you do something which makes you appear weak and makes people respect or admire you less. If you do something in order to save face, you do it in order to avoid appearing weak and losing people's respect or admiration.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>England doesn't want a war but it doesn't want to lose <b>face</b>...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/4/8/c/48cce0d5d8f682acc369e5258e37957f.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>英格兰不想打仗，但也不想丢面子。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>To cancel the airport would mean a loss of <b>face</b> for the present governor...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/e/4/f/e4f1e17b9a8f84770184afcda29a74e8.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>撤销机场对现任州长来说将是件丢脸的事情。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">8</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">(计划之事出乎意料地)告吹，砸锅，泡汤</span>
+ <span class="family-english size-english prep-en">If something that you have planned blows up in your face, it goes wrong unexpectedly, with the result that you suffer.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Can't you see this could blow up in your <b>face</b>?</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/c/8/6/c868e827f25fb73dc8b702bbfa0cff74.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>你难道看不出这事会砸锅？</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">9</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">徒劳拼命地干;徒劳无功</span>
+ <span class="family-english size-english prep-en">If you say that someone can do something until they are blue in the face, you are emphasizing that however much they do it, it will not make any difference.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>You can criticise him until you're blue in the <b>face</b>, but you'll never change his personality.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/3/1/7/31729223b7273bd34db84e6642881a4d.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>即使你苦口婆心地批评他，也改变不了他的个性。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">10</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">面朝下／仰面</span>
+ <span class="family-english size-english prep-en">If someone or something is face down, their face or front points downwards. If they are face up, their face or front points upwards.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>All the time Stephen was lying <b>face</b> down and unconscious in the bath tub...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/6/0/4/604063685f29ec11c79948cfdf03903d.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>斯蒂芬一直脸朝下趴在浴缸里，不省人事。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Charles laid down his cards <b>face</b> up.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/4/6/c/46c3a0a966a306ea9dc9a3f3cf60d21d.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>查尔斯将手中的牌摊了出来。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">11</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">(表示强调或夸张)全世界</span>
+ <span class="family-english size-english prep-en">You can use the expression 'on the face of the earth' to mean 'in the whole world', when you are emphasizing a statement that you are making or making a very exaggerated statement.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>No human being on the <b>face</b> of the earth could do anything worse than what he did.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/b/c/c/bcc2387f1d4fca8381776ebfd19a80be.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>世界上再没有人能做出比他更坏的事情来。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">12</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">绝迹;灭绝</span>
+ <span class="family-english size-english prep-en">If you say that something will be wiped off the face of the earth or disappear from the face of the earth, you mean that it will stop existing.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>If a nuclear war breaks out, every living thing will be wiped off the <b>face</b> of the Earth.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/9/f/e/9fe4d31476c2de3498fa69c3656b898a.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>如果爆发核战争，地球上的所有生物都将灭绝。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">13</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">面对面;直面</span>
+ <span class="family-english size-english prep-en">If you come face to face with someone, you meet them and can talk to them or look at them directly.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>We were strolling into the town when we came <b>face</b> to <b>face</b> with Jacques DuBois...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/5/5/c/55cbde1755114f2a6eaf76796ae98c1e.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>我们信步向镇子走去，迎面碰上雅克·杜波依斯。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>It was the first face-to-face meeting between the two men.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/a/c/7/ac7d708ae739d41083da894c1491cfcc.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>这是两人首次当面会晤。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">14</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">面对,面临(困难或现实)</span>
+ <span class="family-english size-english prep-en">If you come face to face with a difficulty or reality, you cannot avoid it and have to deal with it.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Eventually, he came <b>face</b> to <b>face</b> with discrimination again...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/3/9/2/392d737a71ea5ee1f6a095ddf4219d49.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>最终，他又一次遭遇歧视。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>I was gradually being brought <b>face</b> to <b>face</b> with the fact that I had very little success.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/f/1/1/f11fdd35c21284bb94ee05fbba22bf21.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>我渐渐开始面对这个事实，那就是我几乎一事无成。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">15</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">完全违背;与(公认的观念或规则)相冲突</span>
+ <span class="family-english size-english prep-en">If an action or belief flies in the face of accepted ideas or rules, it seems to completely oppose or contradict them.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>...scientific principles that seem to fly in the <b>face</b> of common sense...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/1/5/c/15cf665b1c5dd2427a27719a648a0681.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>似乎有悖常识的科学原理</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>He said that the decision flew in the <b>face</b> of natural justice.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/f/3/e/f3e00349551ed51a45018fe75485fb23.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>他说这个决定有悖天理。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">16</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PREP-PHRASE</span>
+ <span class="family-chinese">面对;在…面前</span>
+ <span class="family-english size-english prep-en">If you take a particular action or attitude in the face of a problem or difficulty, you respond to that problem or difficulty in that way.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>The Prime Minister has called for national unity in the <b>face</b> of the violent anti-government protests...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/9/0/f/90f2cd6af4a1199effd63c06b2242ed7.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>面对强烈的反政府抗议，首相呼吁全国团结一致。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Roosevelt was defiant in the <b>face</b> of the bad news.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/d/2/6/d26cc49e81229b53b89a046a0b11ebd1.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>对这个坏消息，罗斯福毫不理会。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">17</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">公然嘲笑;公开蔑视</span>
+ <span class="family-english size-english prep-en">If someone laughs in your face, they are openly disrespectful towards you.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>With juveniles under eighteen, there's little we can do. We can't keep them in custody. They just laugh in your <b>face</b>.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/4/d/e/4de34c3792123b26af555cc959b030ee.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>对18岁以下的青少年，我们几乎无计可施。我们不能拘留他们。他们只会公然嘲笑你。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">18</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">不高兴的神情;严肃的神情;板起的脸</span>
+ <span class="family-english size-english prep-en">If you have a long face, you look very unhappy or serious.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>He came to me with a very long <b>face</b>.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/b/8/c/b8c61f37586bb30e0e4a165fcbf27dd1.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>他拉长了脸来找我。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">19</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">做鬼脸,扮鬼脸（英国英语中亦使用pull a face）</span>
+ <span class="family-english size-english prep-en">If you make a face, you show a feeling such as dislike or disgust by putting an exaggerated expression on your face, for example by sticking out your tongue. In British English, you can also say pull a face .</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Opening the door, she made a <b>face</b> at the musty smell...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/6/4/3/643fd2db6571fab852a9213c300bf7b2.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>她打开门后闻到一股难闻的霉味，不禁做了个鬼脸。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Kathryn pulled a <b>face</b> at Thomas behind his back.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/3/0/a/30ae3f857940a4a22a77acd373efea78.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>凯瑟琳在托马斯身后冲他做了个鬼脸。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">20</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">乍看起来;最初看来</span>
+ <span class="family-english size-english prep-en">You say on the face of it when you are describing how something seems when it is first considered, in order to suggest that people's opinion may change when they know or think more about the subject.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>On the <b>face</b> of it that seems to make sense. But the figures don't add up...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/4/c/6/4c6eddf7bd52daeae698a71b5e05024d.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>乍一看,似乎讲得通，但这些数字对不起来。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>It is, on the <b>face</b> of it, difficult to see how the West could radically change its position.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/5/d/3/5d3a00eaf49f08557c1bcd651dd4f38d.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>初看起来，很难理解西方为何会立场突变。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">21</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">（对坏情况）显得满不在乎，做出无所谓的样子(美国英语中亦作 put on a good face)</span>
+ <span class="family-english size-english prep-en">If you put a brave face on a bad situation or put on a brave face, you try not to show how disappointed or upset you are about the situation. In American English you can also say put on a good face.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Friends will see you are putting on a brave <b>face</b> and might assume you've got over your grief...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/3/3/1/3310b21ed911dc1ff8b0b044e20e0c6c.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>朋友们看到你一脸轻松，也许会以为你已经走出悲伤。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Scientists are putting a good <b>face</b> on the troubles.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/2/1/2/212157f667780403a8b07e6cfa64eb2f.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>科学家们对这些困难似乎不以为意。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">22</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">(尤指错误地)反对</span>
+ <span class="family-english size-english prep-en">You can say that someone has set their face against something to indicate that they are opposed to it, especially when you want to suggest that they are wrong.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>This Government has set its <b>face</b> against putting up income tax.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/4/f/9/4f986d0e49eba97a9aabbf21ccaee351.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>这届政府执意反对提高所得税。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">23</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">(不受欢迎地、不情愿地或再次)露面，到场</span>
+ <span class="family-english size-english prep-en">If you show your face somewhere, you go there and see people, although you are not welcome, are rather unwilling to go, or have not been there for some time.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>If she shows her <b>face</b> again back in Massachusetts she'll find a warrant for her arrest waiting...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/9/8/c/98c2e81b7fcd192a3f5343c442279d07.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>如果她重又在马萨诸塞州露面，等待她的将是一纸拘捕令。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>I felt I ought to show my <b>face</b> at her father's funeral.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/f/f/8/ff8140b5a14a595c822994f2f8465164.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>我觉得我应该去参加她父亲的葬礼。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">24</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">强绷笑脸</span>
+ <span class="family-english size-english prep-en">If you manage to keep a straight face, you manage to look serious, although you want to laugh.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>What went through Tom's mind I can't imagine, but he did manage to keep a straight <b>face</b>...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/8/a/e/8ae8e1ef73c0865e20cc67a9736b4b21.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>不知道汤姆想到了啥，但他确实忍住没笑。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>You have to wonder how anyone could say that seriously and with a straight <b>face</b>.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/7/6/7/767e0e460935268228fcef7192ad2f69.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>你一定会惊奇怎么会有人能绷着脸、一本正经地说出那些话。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">25</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">当着…的面</span>
+ <span class="family-english size-english prep-en">If you say something to someone's face you say it openly in their presence.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Her opponent called her a liar to her <b>face</b>.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/6/0/7/60773068d52a676a80fdddbd95d9ae58.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>她的对手当着她面说她是撒谎精。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">26</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">脸上带着明显的…表情</span>
+ <span class="family-english size-english prep-en">If a feeling is written all over your face or is written across your face, it is very obvious to other people from your expression.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Relief and gratitude were written all over his <b>face</b>...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/9/1/4/91431eebe4e70f2163944c577380b687.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>他一脸释然与感激。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>I could just see the pain written across her <b>face</b>.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/b/7/8/b78ecda5bef1c5552274a551a23006a1.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>我都可以看出他脸上写满了痛苦。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="collins-section">
+ <div class='section-h'>
+ <span class='h-order family-english'>B</span>
+ <p class="speech-yellow">
+ <span class='family-english'>VERB AND PHRASAL VERB USES</span>
+ <span>动词和短语动词用法</span>
+ </p>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">1</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">VERB</span>
+ <span class="family-chinese">面向;面对;朝着</span>
+ <span class="family-english size-english prep-en">If someone or something faces a particular thing, person, or direction, they are positioned opposite them or are looking in that direction.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>They stood facing each other...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/f/8/3/f8364912585bffa0ebd4690b9d3ab238.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>他们面对面站着。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>The garden faces south.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/b/5/4/b5423ef9b0a04f3a09e1b9d3fd6cde69.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>花园朝南。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">2</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">VERB</span>
+ <span class="family-chinese">面对;面向</span>
+ <span class="family-english size-english prep-en">If you face someone or something, you turn so that you are looking at them.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>She stood up from the table and faced him...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/f/8/3/f839abdea5383bd6fe86c556fece1829.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>她从桌前站起来，面对着他。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Stand up. <b>Face</b> the wall.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/8/4/f/84ffbe0efddc4f60b12edd6264d96277.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>起立，面向墙壁。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">3</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">VERB</span>
+ <span class="family-chinese">(不得不)面对，正视</span>
+ <span class="family-english size-english prep-en">If you have to face a person or group, you have to stand or sit in front of them and talk to them, although it may be difficult and unpleasant.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Christie looked relaxed and calm as he faced the press...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/b/2/3/b232cade096fb27471583ab0f07f90d5.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>克里斯蒂面对记者，显得镇定自若。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>He was hauled in to <b>face</b> the judge.</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/a/4/b/a4ba4586256a16629287c8a2b7757682.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>他被带了进来，面对法官。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">4</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">VERB</span>
+ <span class="family-chinese">面临;面对;摆在…面前</span>
+ <span class="family-english size-english prep-en">If you face or are faced with something difficult or unpleasant, or if it faces you, it is going to affect you and you have to deal with it.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Williams faces life in prison if convicted of attempted murder...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/d/f/0/df0b97780d7b80179e2a3180b4060f04.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>如被判谋杀未遂，威廉斯将面临终身监禁。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>The immense difficulties facing European businessmen in Russia were only too evident...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/f/f/f/fff42faa95947fd9d8d21280d049a8e9.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>在俄罗斯的欧洲商人所面临的巨大困难是显而易见的。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">5</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">VERB</span>
+ <span class="family-chinese">(使)直面，接受，正视(真理或事实等)</span>
+ <span class="family-english size-english prep-en">If you face the truth or face the facts, you accept that something is true. If you face someone with the truth or with the facts, you try to make them accept that something is true.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>Although your heart is breaking, you must <b>face</b> the truth that a relationship has ended...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/7/2/d/72d052da2718f9aab17e51355fb9e2e3.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>虽然你伤透了心，但也必须面对现实，一段感情已结束了。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>He accused the Government of refusing to <b>face</b> facts about the economy...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/0/6/3/063e35b112d58688e1cc4c335250c427.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>他指责政府不能在经济问题上面对现实。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">6</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">VERB</span>
+ <span class="family-chinese">接受;容忍</span>
+ <span class="family-english size-english prep-en">If you cannot face something, you do not feel able to do it because it seems so difficult or unpleasant.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>I couldn't <b>face</b> the prospect of spending a Saturday night there, so I decided to press on...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/6/6/d/66dcc6891bf3337f3dafa7f5ce8a7bba.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>想到周六晚上要在那儿度过我就受不了，于是我决定要抓紧。</p>
+ </div>
+ </div>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>My children want me with them for Christmas Day, but I can't <b>face</b> it...</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/0/5/3/0530c2b6851fe03ce2e940ba575599f7.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>我的孩子们想要我跟他们一起过圣诞节，但我办不到。</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="section-prep" class="">
+ <i class="prep-order-icon">7</i>
+ <div class="prep-order">
+ <p class="size-chinese">
+ <span class="family-english">PHRASE</span>
+ <span class="family-chinese">让我们面对现实;承认(事实)吧</span>
+ <span class="family-english size-english prep-en">You use the expression 'let's face it' when you are stating a fact or making a comment about something which you think the person you are talking to may find unpleasant or be unwilling to admit.</span>
+ </p>
+ <div class='text-sentence'>
+ <div class='sentence-item'>
+ <i class='circle-icon'></i>
+ <p class='family-english'>
+ <span>She was always attracted to younger men. But, let's <b>face</b> it, who is not?</span>
+ <i class='icon-sound' ms-on-click="sound('http://res-tts.iciba.com/tts_dj/8/9/d/89d24d1066d7d828dfbaf3576670cc21.mp3')"></i>
+ </p>
+ <p class='family-chinese size-chinese'>她总是会被较年轻的男人吸引。不过，说实话，谁又不是呢？</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="phrase－wrap">
+ <h2 class='family-chinese size-chinese'>相关词组</h2>
+ <a href="/face down">face down </a>
+ <a href="/face up to">face up to </a>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+<div ms-visible=mainShow class="info-article info-product"> <ul class="article-list clearfix"> <li class=current>牛津词典</li> <li class=product-tip>金山词霸客户端产品已经全面收录牛津词典</li> <li class=info-display> <i class=ico-display></i> </li> </ul> <div class="article product clearfix"> <div class="product-section result-oxford"> <p class=product-intro>牛津词典免费送</p> <i class=pc></i> <a href=javascript:void(0) class=product-download-btn onclick="_czc.push(['_trackEvent','查词结果','PC下载','牛津词典','','']);"> <div class=pc-btn>点击下载</div> </a> </div> <div class="product-section result-oxford-a"> <p class=product-intro>词霸Android版</p> <i class=android></i> <p class=holy>牛津词典免费使用!</p> <p class=download>立刻扫码下载</p> </div> <div class="product-section result-oxford-i"> <p class=product-intro>词霸iOS版</p> <i class=ios></i> <p class=holy>牛津词典免费使用!</p> <p class=download>立刻扫码下载</p> </div> </div> </div> <script>
+ $('.product-download-btn').click(function() {
+ navigator.userAgent.indexOf("Mac") > 0 ? window.open('http://download.iciba.com/mac/mac1.0.1/PowerWord.dmg') : window.open('http://download.iciba.com/pc/personal2016/PowerWord.800.12012.exe')
+ });
+ </script> <div ms-visible="data.stems_affixes || data.phrase" class=info-article> <ul class="article-list clearfix"> <li ms-if=data.stems_affixes ms-class="current:phraseTag==0" ms-click="set('phraseTag', 0)" onclick="_czc.push(['_trackEvent','查词结果','词根词缀','tab切换','','']);">词根词缀</li> <li ms-if=data.phrase ms-class="current:phraseTag==1" ms-click="set('phraseTag', 1)" onclick="_czc.push(['_trackEvent','查词结果','词组搭配','tab切换','','']);">词组搭配</li> <li class=info-display> <i class=ico-display></i> </li> </ul> <div class=article> <div ms-if=data.stems_affixes ms-class="none:phraseTag!=0" class=article-section> <div ms-repeat-item=data.stems_affixes> <h1 class="word-root family-chinese size-english">{{item.type}}: {{item.type_value}} {{item.type_exp}}</h1> <div ms-if=item.word_parts ms-repeat-item1=item.word_parts class=collins-section> <div class=section-h> <span class="h-order family-english" ms-text="$index | numToLetter"></span> <p class=speech-yellow> <span class=family-english ms-text=item1.word_part> <span> </span></span></p> </div> <div ms-if=item1.stems_affixes ms-repeat-item2=item1.stems_affixes class=section-prep> <i class=prep-order-icon ms-text=$index+1></i> <div class=prep-order> <p class="family-chinese size-chinese"> <a class="family-english size-english" ms-attr-href=http://www.iciba.com/{{item2.value_en}} ms-text=item2.value_en></a> <span ms-text=item2.value_cn></span> </p> <div class=text-sentence> <div class="sentence-item no-icon"> <p class="family-chinese size-chinese" ms-text=item2.word_buile></p> </div> </div> </div> </div> </div> </div> </div> <div ms-if=data.phrase ms-class="none:phraseTag!=1" class=article-section> <h2 class="family-chinese size-chinese">常用词组</h2> <div ms-repeat-item=data.phrase class=collins-section> <div class=section-h> <span class="h-order family-english" ms-text="$index | numToLetter"></span> <p class=speech-yellow> <span class=family-english ms-text=item.cizu_name></span> </p> </div> <div ms-if=item.jx ms-repeat-item2=item.jx class=section-prep> <i class=prep-order-icon ms-text=$index+1></i> <div class=prep-order> <p> <span class="family-english size-english"> <span ms-text=item2.jx_en_mean></span> <span class="family-chinese size-chinese" ms-text=item2.jx_cn_mean></span> </span> </p> <div class=text-sentence> <div ms-if=item2.lj ms-repeat-item3=item2.lj class=sentence-item> <i class=circle-icon></i> <p class="family-english size-english" ms-text=item3.lj_ly></p> <p class="family-chinese size-chinese" ns-text=item3.lj_ls></p> </div> </div> </div> </div> </div> </div> </div> </div> <div ms-visible=data.antonym||data.sameAnalysis||data.synonym class=info-article> <ul class="article-list clearfix"> <li ms-if=data.synonym ms-class="current:synonymTag==0" ms-click="set('synonymTag', 0)" onclick="_czc.push(['_trackEvent','查词结果','同义词','tab切换','','']);">同义词</li> <li ms-if=data.sameAnalysis ms-class="current:synonymTag==1" ms-click="set('synonymTag', 1)" onclick="_czc.push(['_trackEvent','查词结果','同义词解析','tab切换','','']);">同义词解析</li> <li ms-if=data.antonym ms-class="current:synonymTag==2" ms-click="set('synonymTag', 2)" onclick="_czc.push(['_trackEvent','查词结果','反义词','tab切换','','']);">反义词</li> <li class=info-display> <i class=ico-display></i> </li> </ul> <div class=article> <div class=article-section ms-class="none:synonymTag!=0"> <div ms-if=data.synonym ms-repeat-synonym=data.synonym class=collins-section> <div ms-if=synonym.part_name class=section-h> <span class="h-order family-english" ms-text="$index | numToLetter"></span> <p class=speech-yellow> <span class=family-english ms-if=synonym.part_name ms-text=synonym.part_name></span> </p> </div> <div ms-if=synonym.means ms-repeat-means=synonym.means class=section-prep> <i class=prep-order-icon ms-text=$index+1></i> <div class=prep-order> <p class="family-chinese size-chinese" ms-text=means.word_mean></p> <div class=text-sentence> <div class="sentence-item no-icon"> <p class="family-chinese size-chinese"> <a ms-if=means.cis ms-repeat-cis=means.cis ms-attr-href=/{{cis}} target=_blank ms-text=cis></a> </p> </div> </div> </div> </div> <p ms-if=synonym.ci_name class="family-chinese size-chinese" style=margin-top:10px;> <span ms-text="$index+1+'. '"></span> <a ms-attr-href=/{{synonym.ci_name}} target=_blank ms-text=synonym.ci_name></a> </p> </div> </div> <div class=article-section ms-class="none:synonymTag!=1"> <div class=collins-section> <div ms-if=data.sameAnalysis ms-repeat-same=data.sameAnalysis class="section-prep no-order"> <i class=prep-order-icon ms-text=$index+1></i> <div class=prep-order> <p> <span class="family-english size-english" ms-text=same.word_list></span> <span class="family-chinese size-chinese" ms-text=same.part_name></span> </p> <ul class=text-sentence> <li ms-if=same.means ms-repeat-means=same.means class=item ms-html=means|setKeyVal> </li> </ul> </div> </div> </div> </div> <div class=article-section ms-class="none:synonymTag!=2"> <div ms-if=data.antonym ms-repeat-antonym=data.antonym class=collins-section> <div ms-if=antonym.part_name class=section-h> <span class="h-order family-english" ms-text=$index|numToLetter></span> <p class=speech-yellow> <span class=family-english ms-if=antonym.part_name ms-text=antonym.part_name></span> </p> </div> <div ms-if=antonym.means ms-repeat-means=antonym.means class=section-prep> <i class=prep-order-icon ms-text=$index+1></i> <div class=prep-order> <p class="family-chinese size-chinese" ms-text=means.word_mean></p> <div class=text-sentence> <div class="sentence-item no-icon"> <p class="family-chinese size-chinese"> <a ms-if=means.cis ms-repeat-cis=means.cis ms-attr-href=/{{cis}} target=_blank ms-text=cis></a> </p> </div> </div> </div> </div> <p ms-if=antonym.ci_name class="family-chinese size-chinese" style=margin-top:10px;> <span ms-text="$index+1+'. '"></span> <a ms-attr-href=/{{antonym.ci_name}} target=_blank ms-text=antonym.ci_name></a> </p> </div> </div> </div> </div> <div ms-visible=data.ee_mean||data.bidec||data.bidce class=info-article> <ul class="article-list clearfix"> <li ms-if=data.ee_mean ms-class="current:solutionTag==0" ms-click="set('solutionTag', 0)" onclick="_czc.push(['_trackEvent','查词结果','英英词典','tab切换','','']);">英英词典</li> <li ms-visible="data.bidec || data.bidce" ms-class="current:solutionTag==1" ms-click="set('solutionTag', 1)" onclick="_czc.push(['_trackEvent','查词结果','英汉双向','tab切换','','']);">英汉双向大词典</li> <li class=info-display> <i class=ico-display></i> </li> </ul> <div class=article> <div ms-if=data.ee_mean class=article-section ms-class="none:solutionTag!=0"> <div ms-repeat-item=data.ee_mean class=collins-section> <div class=section-h> <span class="h-order family-english" ms-text="$index | numToLetter"></span> <p class=speech-yellow> <span class=family-english ms-text=item.part_name></span> </p> </div> <div ms-if=item.means ms-repeat-item1=item.means class=section-prep> <i class=prep-order-icon ms-text=$index+1></i> <div class=prep-order> <p class="family-english size-english" ms-html="item1.word_mean | highlight"></p> <ul class=text-sentence> <li ms-if=item1.sentences ms-repeat-item3=item1.sentences class=item ms-html="item3.sentence | highlight"></li> </ul> </div> </div> </div> </div> <div ms-if=data.bidec class=article-section ms-class="none:solutionTag!=1"> <div ms-if=data.bidec.parts ms-repeat-item=data.bidec.parts class=collins-section> <div class=section-h> <span class="h-order family-english" ms-text="$index | numToLetter"></span> <p class=speech-yellow> <span class=family-english ms-text=item.part_name></span> </p> </div> <div ms-if=item.means ms-repeat-means=item.means class=section-prep> <i class=prep-order-icon ms-text=$index+1></i> <div class=prep-order> <p class="family-chinese size-chinese" ms-html="means.word_mean | highlight"></p> <div class=text-sentence> <div ms-if=means.sentences ms-repeat-sentence=means.sentences class=sentence-item> <i class=circle-icon></i> <p class="family-english size-english" ms-html="sentence.en | highlight"></p> <p class="family-chinese size-chinese" ms-html="sentence.cn | highlight"></p> </div> </div> </div> </div> </div> </div> <div ms-if=data.bidce class=article-section ms-class="none:solutionTag!=1"> <div class=collins-section> <div ms-if=data.bidce.word_smv class=suggest> <p class=sug-text>释义相关词条：</p> <p class=sug-words> <a ms-if=data.bidce.word_smv ms-repeat-item=data.bidce.word_smv ms-attr-href="/{{item | trim}}" target=_blank ms-text="item | trim"></a> </p> </div> <div ms-if=data.bidce.symbols ms-repeat-item=data.bidce.symbols> <h1 ms-text="data.bidce.word_name+' '+item.word_symbol"></h1> <div ms-if=item.parts ms-repeat-part=item.parts> <div ms-if=part.part_name class=section-h> <span class="h-order family-english" ms-text="$index | numToLetter"></span> <p> <span class=family-english ms-text=part.part_name></span> </p> </div> <br> <div ms-if=part.means ms-repeat-mean=part.means class=section-prep> <i class=prep-order-icon ms-text=$index+1></i> <div class=prep-order> <p class="family-chinese size-chinese" ms-html="mean.word_mean | highlight"></p> <div class=text-sentence> <div ms-if=mean.ljs ms-repeat-ljs=mean.ljs class=sentence-item> <i class=circle-icon></i> <p class="family-english size-english" ms-html="ljs.en | highlight"></p> <p class="family-chinese size-chinese" ms-text=ljs.cn></p> </div> </div> </div> </div> </div> </div> </div> </div> </div> </div> <div ms-visible=data.chinese class=info-article> <ul class="article-list clearfix"> <li class=current>汉语词典</li> <li class=info-display> <i class=ico-display></i> </li> </ul> <div ms-if=data.chinese class=article> <div class=hanyu-section> <div ms-if=data.chinese.zi> <div class=han-character ms-text=data.chinese.zi[0].hanzi></div> <table class=han-table> <tr> <td class=h>繁体</td> <td ms-text=data.chinese.zi[0].hanzi></td> <td class=h>笔画</td> <td ms-text=data.chinese.zi[0].hanzi></td> <td class=h>造字法</td> <td ms-text=data.chinese.zi[0].zaozi></td> </tr> <tr> <td class=h>首部</td> <td ms-text=data.chinese.zi[0].bushou></td> <td class=h>五笔</td> <td ms-text=data.chinese.zi[0].wubi></td> <td class=h>结构</td> <td ms-text=data.chinese.zi[0].jiegou></td> </tr> </table> </div> <div ms-if=data.chinese.ci> <h1 ms-text=data.chinese.ci.ciyu></h1> <table class=hanci-table> <tr ms-if=data.chinese.ci.ciyi> <td class=h>释义</td> <td> <span ms-if=data.chinese.ci.ciyi ms-repeat-item=data.chinese.ci.ciyi ms-text="$index+1+'. '+item"></span> </td> </tr> <tr ms-if=data.chinese.ci.goucheng> <td class=h>构成</td> <td ms-text=data.chinese.ci.goucheng></td> </tr> <tr ms-if=data.chinese.ci.liju> <td class=h>例句</td> <td ms-text=data.chinese.ci.liju></td> </tr> <tr ms-if=data.chinese.ci.tongyi> <td class=h>同义词</td> <td ms-text=data.chinese.ci.tongyi></td> </tr> <tr ms-if=data.chinese.ci.fanyi> <td class=h>反义词</td> <td ms-text=data.chinese.ci.fanyi></td> </tr> </table> </div> <div ms-if=data.chinese.cy> <h1 ms-text=data.chinese.cy.chengyu></h1> <table class=hanci-table> <tr ms-if=data.chinese.cy.shiyi> <td class=h>释义</td> <td ms-text=data.chinese.cy.shiyi></td> </tr> <tr ms-if=data.chinese.cy.liju> <td class=h>例句</td> <td> <span ms-if=data.chinese.ci.liju ms-repeat-item=data.chinese.ci.liju ms-text="$index+1+'. '+item"></span> </td> </tr> <tr ms-if=data.chinese.cy.jinyi> <td class=h>同义词</td> <td ms-text=data.chinese.cy.jinyi></td> </tr> <tr ms-if=data.chinese.cy.fanyi> <td class=h>反义词</td> <td ms-text=data.chinese.cy.fanyi></td> </tr> </table> </div> <div ms-if=data.chinese.zi ms-repeat-item=data.chinese.zi class=section-prep> <i class=prep-order-icon ms-text=$index+1></i> <div class=prep-order> <p class="family-chinese weight-bold size-chinese"> <span ms-text="item.hanzi+''"></span> <span ms-if=item.pinyin ms-text="【'+item.pinyin+'】"></span> </p> <div class=text-sentence> <div class="sentence-item no-icon"> <p ms-if=item.ziyi ms-repeat-item2=item.ziyi class="family-chinese size-chinese"> <span class=weight-bold ms-text="$index+1+'. '"></span> <span ms-text=item2></span> </p> </div> </div> </div> </div> </div> </div> </div> <div ms-visible=data.netmean class=info-article> <ul class="article-list clearfix"> <li class=current>网络释义</li> <li class=info-display> <i class=ico-display></i> </li> </ul> <div ms-if=data.netmean class=article> <div ms-if=data.netmean.PerfectNetExp.length class=collins-section> <h2 class="family-chinese size-chinese">常用词组</h2> <div ms-if=data.netmean.PerfectNetExp ms-repeat-item=data.netmean.PerfectNetExp class=section-prep> <i class=prep-order-icon ms-text=$index+1></i> <div class=prep-order> <p class="family-chinese size-chinese" ms-text=item.exp></p> <div class=text-sentence> <div class="sentence-item no-icon"> <p class="family-chinese size-chinese" ms-html="item.abs | highlight"></p> </div> </div> </div> </div> </div> <div ms-if=data.netmean.RelatedPhrase.length class=collins-section> <h2 class="family-chinese size-chinese">相关词条</h2> <div ms-repeat-item=data.netmean.RelatedPhrase class=section-prep> <i class=prep-order-icon ms-text=$index+1></i> <div class=prep-order> <p class="family-chinese size-chinese" ms-text=item.word></p> <div class=text-sentence> <div ms-if=item.list ms-repeat-item2=item.list class="sentence-item no-icon"> <p class="family-chinese size-chinese" ms-html="item2.exp | highlight"></p> <p class="family-chinese size-chinese" ms-html="item2.abs | highlight"></p> </div> </div> </div> </div> </div> </div> </div> <div ms-visible=data.trade_means class=info-article> <ul class="article-list clearfix"> <li class=current>行业词典</li> <li class=info-display> <i class=ico-display></i> </li> </ul> <div class=article> <div class=collins-section> <ul class="multiple-list clearfix"> <li ms-if=data.trade_means ms-repeat-item=data.trade_means ms-on-click=tradeTab($index) ms-class="{{tradeCurrentFlag==$index?'current':'text'}}"> <span class=text ms-text=item.word_trade></span> <i ms-if=!$last class=cut-line></i> </li> </ul> <ul class="text-content clearfix"> <li ms-if=trade ms-repeat-item2=trade ms-text="$index+1+'.'+item2"></li> </ul> </div> </div> </div> <div ms-visible=data.encyclopedia class=info-article> <ul class="article-list clearfix"> <li class=current onclick="_czc.push(['_trackEvent','查词结果','四级真题','词典tab切换','','']);">百科</li> <li class=info-display> <i class=ico-display></i> </li> </ul> <div class=article> <div ms-if=data.encyclopedia class=baike-section> <div ms-if=!data.encyclopedia.image> <h2></h2> <ul> <li ms-html=data.encyclopedia.content></li> </ul> <div class=section-more> <a ms-attr-href=data.encyclopedia.url target=_blank>查看更多</a> </div> <div class=info-origin>本内容来源于 <i></i> </div> </div> <div class=clearfix ms-if=data.encyclopedia.image> <div class=baike-img> <img ms-attr-src=data.encyclopedia.image> <p></p> </div> <div class=baike-content> <p ms-html=data.encyclopedia.content></p> <div class=section-more> <a ms-if=data.encyclopedia.url ms-attr-href="{{data.encyclopedia.url}}?fr=iciba" target=_blank>查看更多</a> </div> <div class=info-origin>本内容来源于 <i></i> </div> </div> </div> </div> </div> </div> <div ms-visible=data.sentence||data.auth_sentence||data.jushi class=ad-left> <script type=text/javascript>
+ var cpro_id = "u2673745";
+ (window["cproStyleApi"] = window["cproStyleApi"] || {})[cpro_id] = {
+ at: "3",
+ rsi0: "640",
+ rsi1: "200",
+ pat: "6",
+ tn: "baiduCustNativeAD",
+ rss1: "#FFFFFF",
+ conBW: "0",
+ adp: "1",
+ ptt: "0",
+ titFF: "%E5%BE%AE%E8%BD%AF%E9%9B%85%E9%BB%91",
+ titFS: "14",
+ rss2: "#000000",
+ titSU: "0",
+ ptbg: "90",
+ piw: "0",
+ pih: "0",
+ ptp: "0"
+ }
+ </script> <script src=http://cpro.baidustatic.com/cpro/ui/c.js type=text/javascript></script> </div> <div ms-visible=mainShow class="info-article info-hotwords"> <ul class="article-list clearfix"> <li ms-class="current:hotTag==0" ms-click="set('hotTag', 0)">今日热词</li> <li ms-class="current:hotTag==1" ms-click="set('hotTag', 1)">热门搜索</li> <li class=info-display> <i class=ico-display></i> </li> </ul> <div class="article hotwords"> <div class=hotwords-section ms-class="none:hotTag!=0"> <ul class="word-list clearfix" id=hotword> <li> <a title=你好 href=/你好 target=_blank>你好</a> </li> <li> <a title=海龟 href=/海龟 target=_blank>海龟</a> </li> <li> <a title=allude href=/allude target=_blank>allude</a> </li> <li> <a title=海归 href=/海归 target=_blank>海归</a> </li> <li> <a title=空气污染 href=/空气污染 target=_blank>空气污染</a> </li> <li> <a title=regularly href=/regularly target=_blank>regularly</a> </li> <li> <a title=志愿者 href=/志愿者 target=_blank>志愿者</a> </li> <li> <a title=tendency href=/tendency target=_blank>tendency</a> </li> <li> <a title=test href=/test target=_blank>test</a> </li> <li> <a title=explicitly href=/explicitly target=_blank>explicitly</a> </li> <div class=clear></div> </ul> </div> <div class=hotwords-section ms-class="none:hotTag!=1"> <ul class="word-list clearfix" id=todaynews> <li> <a title=阅卷笔录 href=/阅卷笔录 target=_blank>阅卷笔录</a> </li> <li> <a title=孙中山 href=/孙中山 target=_blank>孙中山</a> </li> <li> <a title=宋慧乔 href=/宋慧乔 target=_blank>宋慧乔</a> </li> <li> <a title=家庭软暴力 href=/家庭软暴力 target=_blank>家庭软暴力</a> </li> <li> <a title=海警 href=/海警 target=_blank>海警</a> </li> <li> <a title="duck feather" href="/duck feather" target=_blank>duck feather</a> </li> <li> <a title=天下第一泉 href=/天下第一泉 target=_blank>天下第一泉</a> </li> <li> <a title=ecotour href=/ecotour target=_blank>ecotour</a> </li> <li> <a title=干菜类 href=/干菜类 target=_blank>干菜类</a> </li> <li> <a title=我是特种兵 href=/我是特种兵 target=_blank>我是特种兵</a> </li> <div class=clear></div> </ul> </div> </div> </div> <div class=scb-mask> <div class=scb-win> <h3>创建新的生词本</h3> <div class=scb-name> <div class="text-wrap error" id=text-wrap> <input id=textarea class=scb-n-input type=text placeholder=输入要创建的生词本名称> <p class="text tip1"> <span>i</span>该生词本已经创建啦!</p> <p class="text tip2"> <span>i</span>不可以出现中文，英文，数字之外的符号哒!</p> <p class="text tip3"> <span>i</span>生词本名称长度不能大于24字符!</p> <p class="text tip4"> <span>i</span>请填写生词本名称!</p> </div> <a class=scb-cancel id=scb_cancel href=javascript:void(0);>取消</a> <a class=scb-sure id=scb_create href=javascript:void(0);>创建</a> <div class=clear></div> </div> </div> </div> </div> </div> <div class=container-right> <div class=sentence ms-controller=sentence> <div class=sentence-title>每日一句</div> <div class=sentence-img> <img ms-attr-src=picture ms-attr-title=title ms-attr-alt=title class=sentence-img-main> <a class=sentence-img-cover onclick="_czc.push(['_trackEvent','查词结果页','图片链接','每日一句','','']);" ms-attr-href=http://news.iciba.com/views/dailysentence/daily.html#!/detail/title/{{title}} target=_blank> <div class=sentence-img-date> <span class=sentence-img-date-big ms-text="title|date('dd')"></span> <span class=sentence-img-date-small ms-text=title|month></span> </div> </a> </div> <div class=sentence-en> <a onclick="_czc.push(['_trackEvent','查词结果页','中英文链接','每日一句','','']);" ms-attr-href=http://news.iciba.com/views/dailysentence/daily.html#!/detail/title/{{title}} ms-text=content target=_blank></a> <i onclick="_czc.push(['_trackEvent','查词结果页','发音喇叭','每日一句','','']);" ms-data-sound=tts></i> </div> <div class=sentence-cn> <a onclick="_czc.push(['_trackEvent','查词结果页','中英文链接','每日一句','','']);" ms-attr-href=http://news.iciba.com/views/dailysentence/daily.html#!/detail/title/{{title}} ms-text=note target=_blank></a> </div> </div> <div class=container-right-ad2> <script>
+ (function() {
+ var s = "_" + Math.random().toString(36).slice(2);
+ document.write('<div id="' + s + '"></div>');
+ (window.slotbydup = window.slotbydup || []).push({
+ id: '3248620',
+ container: s,
+ size: '300,250',
+ display: 'inlay-fix'
+ });
+ })();
+ </script> <script src=http://dup.baidustatic.com/js/os.js></script> </div> <div class=recommend ms-controller=recommend> <div class=recommend-title>精彩推荐</div> <a class=recommend-item ms-repeat-item=list ms-attr-href=item.url||item.link ms-data-cnzz="'_trackEvent,查词结果页,位置'+($index+1)+',精彩推荐,,'" target=_blank> <img ms-attr-src=item.thumb alt="" class=recommend-item-img> <span class=recommend-item-title ms-text=item.title></span> <span class=recommend-item-date ms-text=item.description></span> </a> </div> <div class=js-right-ad-fix> <script type=text/javascript>
+ <!--
+ google_ad_client = "ca-pub-7443704194229694";
+ /* IDG.CN_B2C_iciba.com_WPS_300x250_2_new */
+ google_ad_slot = "1289208146";
+ google_ad_width = 300;
+ google_ad_height = 250;
+ //-->
+ </script> <script type=text/javascript src=//pagead2.googlesyndication.com/pagead/show_ads.js>
+ </script> </div> </div> </div> <p class=foot-top-seo>爱词霸查词为您提供在线翻译、英语翻译、英文翻译、英译汉、汉译英、fanyi等权威在线翻译服务！</p> <div class=foot> <a href=http://www.kingsoft.com/licence/001.jpg target=_blank class=blank>京ICP证100054号</a> <a href="http://www.hd315.gov.cn/beian/view.asp?bianhao=010202010082000006"> <img align=absmiddle border=0 alt=备案 src=http://cdn.iciba.com/web/static/images/ico_ft.gif> </a> <a href=http://cdn.iciba.com/www/img/license/02.png target=_blank class=blank>新出网证<京>字011号</a> <a href=http://cdn.iciba.com/www/img/license/05.png target=_blank class=blank>京网文【2014】0937-238号</a> <a href="http://www.miibeian.gov.cn/" class=blank>京ICP备06025896号</a> 京公网安备 <span data-refresh=cnzz></span> <script type=text/html id=cnzz _src="http://s11.cnzz.com/z_stat.php?id=1256556802&web_id=1256556802"></script> <script>
+ (function() {
+ var bp = document.createElement('script');
+ var curProtocol = window.location.protocol.split(':')[0];
+ if (curProtocol === 'https') {
+ bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
+ } else {
+ bp.src = 'http://push.zhanzhang.baidu.com/push.js';
+ }
+ var s = document.getElementsByTagName("script")[0];
+ s.parentNode.insertBefore(bp, s);
+ })();
+</script> </div> </div> <script id=downloadTipTpl type=text/html> <div class="cb-downmask"> <div class="cb-downwrap"> <a class="cb-downdel" href="javascript:;"></a> <div class="cb-downtop"> <span></span> <a href="http://hoplink.ksosoft.com/wnx0" target="_blank">点击下载</a> </div> <div class="cb-installtip"></div> <div class="cb-downtipbg"></div> </div> </div> </script> </body>
|
refactor
|
refactor COBUILD
|
0475351276cf62ef47fb98c6fcb4c1d7a4d17db2
|
2019-08-04 10:20:24
|
crimx
|
refactor(storybook): refresh when custom dict options are changed
| false
|
diff --git a/src/components/dictionaries/dictionaries.stories.tsx b/src/components/dictionaries/dictionaries.stories.tsx
index a1ed63cb1..a278fdef4 100644
--- a/src/components/dictionaries/dictionaries.stories.tsx
+++ b/src/components/dictionaries/dictionaries.stories.tsx
@@ -40,6 +40,7 @@ Object.keys(getAllDicts()).forEach(id => {
// @ts-ignore: wrong storybook typing
stories.add(id, ({ fontSize, withAnimation }) => (
<Dict
+ key={id}
dictID={id as DictID}
fontSize={fontSize}
withAnimation={withAnimation}
@@ -81,38 +82,43 @@ function Dict(props: {
const [status, setStatus] = useState<'IDLE' | 'SEARCHING' | 'FINISH'>('IDLE')
const [result, setResult] = useState<any>(null)
- // add custom dict options
- const profiles = getDefaultProfile()
+ const [profiles, updateProfiles] = useState(() => getDefaultProfile())
+ // custom dict options
const options = profiles.dicts.all[props.dictID]['options']
- if (options) {
- Object.keys(options).forEach(key => {
- const name = locales.options[key][i18n.language]
- switch (typeof options[key]) {
- case 'boolean':
- options[key] = boolean(name, options[key])
- break
- case 'number':
- options[key] = number(name, options[key])
- break
- case 'string':
- const values: string[] =
- profiles.dicts.all[props.dictID]['options_sel'][key]
- options[key] = select(
- name,
- values.reduce(
- (o, k) => (
- (o[locales.options[`${key}-${k}`][i18n.language]] = k), o
- ),
- {}
+ const optKeys = options ? Object.keys(options) : []
+ const optValues = optKeys.map(key => {
+ const name = locales.options[key][i18n.language]
+ switch (typeof options[key]) {
+ case 'boolean':
+ return boolean(name, options[key])
+ case 'number':
+ return number(name, options[key])
+ case 'string':
+ const values: string[] =
+ profiles.dicts.all[props.dictID]['options_sel'][key]
+ return select(
+ name,
+ values.reduce(
+ (o, k) => (
+ (o[locales.options[`${key}-${k}`][i18n.language]] = k), o
),
- options[key]
- )
- break
- default:
- break
- }
+ {}
+ ),
+ options[key]
+ )
+ default:
+ return options[key]
+ }
+ })
+
+ useEffect(() => {
+ const newProfiles = getDefaultProfile()
+ const newOptions = newProfiles.dicts.all[props.dictID]['options']
+ optKeys.forEach((key, i) => {
+ newOptions[key] = optValues[i]
})
- }
+ updateProfiles(newProfiles)
+ }, optValues)
useEffect(() => {
// mock requests
@@ -134,7 +140,7 @@ function Dict(props: {
setStatus('FINISH')
setResult(result)
})
- }, [searchText])
+ }, [searchText, profiles])
return (
<DictItem
diff --git a/test/specs/components/dictionaries/cobuild/requests.mock.ts b/test/specs/components/dictionaries/cobuild/requests.mock.ts
index 556b7308c..6b0e086c3 100644
--- a/test/specs/components/dictionaries/cobuild/requests.mock.ts
+++ b/test/specs/components/dictionaries/cobuild/requests.mock.ts
@@ -1,6 +1,6 @@
import { MockRequest } from '@/components/dictionaries/helpers'
-export const mockSearchTexts = ['source1', 'source2']
+export const mockSearchTexts = ['test']
export const mockRequest: MockRequest = mock => {
mock
|
refactor
|
refresh when custom dict options are changed
|
05c4169017a7e30b53ee0ae4aa2b3aad6475851d
|
2019-09-09 22:52:38
|
crimx
|
refactor(popup): shrink on start
| false
|
diff --git a/src/popup/Popup.tsx b/src/popup/Popup.tsx
index 08a09524e..cce6114ed 100644
--- a/src/popup/Popup.tsx
+++ b/src/popup/Popup.tsx
@@ -20,7 +20,7 @@ export const Popup: FC<PopupProps> = props => {
const [isShowUrlBox, setIsShowUrlBox] = useState(false)
const [currentTabUrl, setCurrentTabUrl] = useState('')
- const [isExpandDictPanel, setDictPanel] = useState(true)
+ const [isExpandDictPanel, setDictPanel] = useState(false)
const expandDictPanel = useRef(() => setDictPanel(true)).current
const shrinkDictPanel = useRef(() => setDictPanel(false)).current
@@ -32,6 +32,8 @@ export const Popup: FC<PopupProps> = props => {
const [isShowPageNoResponse, setShowPageNoResponse] = useState(false)
useEffect(() => {
+ setTimeout(expandDictPanel, 1000)
+
addConfigListener(({ newConfig }) => {
setConfig(newConfig)
})
|
refactor
|
shrink on start
|
9d8472e8da9c4e8adbf07c8b2d8d8e22fd6b04d6
|
2018-04-28 00:10:56
|
CRIMX
|
style(content): remove unused
| false
|
diff --git a/src/_helpers/__mocks__/config-manager.ts b/src/_helpers/__mocks__/config-manager.ts
index 3d11c1e2d..e27e9f6d6 100644
--- a/src/_helpers/__mocks__/config-manager.ts
+++ b/src/_helpers/__mocks__/config-manager.ts
@@ -1,6 +1,6 @@
import { AppConfig, appConfigFactory } from '@/app-config'
import { StorageListenerCb, StorageChange } from '@/_helpers/browser-api'
-import { map, filter, tap } from 'rxjs/operators'
+import { map } from 'rxjs/operators'
import { Observable, fromEventPattern, of, concat } from 'rxjs'
const listeners = new Set()
diff --git a/src/background/context-menus.ts b/src/background/context-menus.ts
index 94699715a..1a5cb9fd8 100644
--- a/src/background/context-menus.ts
+++ b/src/background/context-menus.ts
@@ -1,4 +1,4 @@
-import { storage, openURL, StorageListenerCb, StorageUpdate } from '@/_helpers/browser-api'
+import { storage, openURL, StorageUpdate } from '@/_helpers/browser-api'
import { AppConfig } from '@/app-config'
import { Observable } from 'rxjs'
|
style
|
remove unused
|
0dc5d0bce84c65284366ba158d66aa3eb450510b
|
2018-11-03 19:48:00
|
CRIMX
|
test(dicts): update dicts tests
| false
|
diff --git a/test/specs/components/dictionaries/bing/engine.spec.ts b/test/specs/components/dictionaries/bing/engine.spec.ts
index c56f7b4b9..7a72a22b1 100644
--- a/test/specs/components/dictionaries/bing/engine.spec.ts
+++ b/test/specs/components/dictionaries/bing/engine.spec.ts
@@ -34,7 +34,7 @@ describe('Dict/Bing/engine', () => {
related: true,
sentence: 4
}
- return search('lex', config, {})
+ return search('lex', config, { isPDF: false })
.then(searchResult => {
expect(searchResult.audio).toHaveProperty('us', expect.stringContaining('mp3'))
expect(searchResult.audio).toHaveProperty('uk', expect.stringContaining('mp3'))
@@ -49,7 +49,7 @@ describe('Dict/Bing/engine', () => {
})
it('should parse machine result correctly', () => {
- return search('machine', appConfigFactory(), {})
+ return search('machine', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio).toBeUndefined()
@@ -61,7 +61,7 @@ describe('Dict/Bing/engine', () => {
})
it('should parse related result correctly', () => {
- return search('related', appConfigFactory(), {})
+ return search('related', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio).toBeUndefined()
diff --git a/test/specs/components/dictionaries/cambridge/engine.spec.ts b/test/specs/components/dictionaries/cambridge/engine.spec.ts
index ba0e11247..ffcff6f90 100644
--- a/test/specs/components/dictionaries/cambridge/engine.spec.ts
+++ b/test/specs/components/dictionaries/cambridge/engine.spec.ts
@@ -30,7 +30,7 @@ describe('Dict/Cambridge/engine', () => {
})
it('should parse result (en) correctly', () => {
- return search('love', appConfigFactory(), {})
+ return search('love', appConfigFactory(), { isPDF: false })
.then(({ result, audio }) => {
expect(audio && typeof audio.uk).toBe('string')
expect(audio && typeof audio.us).toBe('string')
@@ -56,7 +56,7 @@ describe('Dict/Cambridge/engine', () => {
})
it('should parse result (zhs) correctly', () => {
- return search('house', appConfigFactory(), {})
+ return search('house', appConfigFactory(), { isPDF: false })
.then(({ result, audio }) => {
expect(audio && typeof audio.uk).toBe('string')
expect(audio && typeof audio.us).toBe('string')
@@ -80,7 +80,7 @@ describe('Dict/Cambridge/engine', () => {
})
it('should parse result (zht) correctly', () => {
- return search('catch', appConfigFactory(), {})
+ return search('catch', appConfigFactory(), { isPDF: false })
.then(({ result, audio }) => {
expect(audio && typeof audio.uk).toBe('string')
expect(audio && typeof audio.us).toBe('string')
diff --git a/test/specs/components/dictionaries/cobuild/engine.spec.ts b/test/specs/components/dictionaries/cobuild/engine.spec.ts
index 773e1fb6c..468d8d44d 100644
--- a/test/specs/components/dictionaries/cobuild/engine.spec.ts
+++ b/test/specs/components/dictionaries/cobuild/engine.spec.ts
@@ -17,7 +17,7 @@ describe('Dict/COBUILD/engine', () => {
config.dicts.all.cobuild.options = {
sentence: 4
}
- return search('any', config, {})
+ return search('any', config, { isPDF: false })
.then(searchResult => {
expect(searchResult.audio).toHaveProperty('us', expect.stringContaining('mp3'))
expect(searchResult.audio).toHaveProperty('uk', expect.stringContaining('mp3'))
diff --git a/test/specs/components/dictionaries/etymonline/engine.spec.ts b/test/specs/components/dictionaries/etymonline/engine.spec.ts
index 782067692..5b97070e3 100644
--- a/test/specs/components/dictionaries/etymonline/engine.spec.ts
+++ b/test/specs/components/dictionaries/etymonline/engine.spec.ts
@@ -18,7 +18,7 @@ describe('Dict/Etymonline/engine', () => {
chart: true,
resultnum: 4
}
- return search('any', config, {})
+ return search('any', config, { isPDF: false })
.then(searchResult => {
expect(searchResult.audio).toBeUndefined()
diff --git a/test/specs/components/dictionaries/eudic/engine.spec.ts b/test/specs/components/dictionaries/eudic/engine.spec.ts
index 9ff26191a..40068a65a 100644
--- a/test/specs/components/dictionaries/eudic/engine.spec.ts
+++ b/test/specs/components/dictionaries/eudic/engine.spec.ts
@@ -14,7 +14,7 @@ describe('Dict/Eudic/engine', () => {
})
it('should parse result correctly', () => {
- return search('love', appConfigFactory(), {})
+ return search('love', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio && typeof searchResult.audio.us).toBe('string')
expect(searchResult.result).toHaveLength(10)
diff --git a/test/specs/components/dictionaries/google/engine.spec.ts b/test/specs/components/dictionaries/google/engine.spec.ts
index 9cbe5ea39..75d09e0ed 100644
--- a/test/specs/components/dictionaries/google/engine.spec.ts
+++ b/test/specs/components/dictionaries/google/engine.spec.ts
@@ -21,10 +21,10 @@ describe('Dict/Google/engine', () => {
})
it('should parse result correctly', () => {
- return search('any', appConfigFactory(), {})
+ return search('any', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio).toBeUndefined()
- expect(searchResult.result.trans.text).toBe('“当你不需要的时候，这就是你所读到的东西，当你无法帮助它时，它将决定你将会是什么。”\n- 奥斯卡·王尔德\n成功一夜成名需要很长时间。')
+ expect(searchResult.result.trans.text).toBe('“当你不需要的时候，这就是你所读到的东西，当你无法帮助它时，它将决定你将会是什么。”\n - 奥斯卡·王尔德\n 成功一夜成名需要很长时间。')
expect(searchResult.result.id).toBe('google')
expect(searchResult.result.sl).toBe('auto')
expect(searchResult.result.tl).toBe('en')
@@ -35,7 +35,7 @@ describe('Dict/Google/engine', () => {
})
it('should parse result correctly with payload', () => {
- return search('any', appConfigFactory(), { sl: 'en', tl: 'jp' })
+ return search('any', appConfigFactory(), { sl: 'en', tl: 'jp', isPDF: false })
.then(searchResult => {
expect(searchResult.result.sl).toBe('en')
expect(searchResult.result.tl).toBe('jp')
diff --git a/test/specs/components/dictionaries/guoyu/engine.spec.ts b/test/specs/components/dictionaries/guoyu/engine.spec.ts
index 5dcb6ed40..7848c870d 100644
--- a/test/specs/components/dictionaries/guoyu/engine.spec.ts
+++ b/test/specs/components/dictionaries/guoyu/engine.spec.ts
@@ -10,7 +10,7 @@ describe('Dict/GuoYu/engine', () => {
})
it('should parse result correctly', () => {
- return search('any', appConfigFactory(), {})
+ return search('any', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio && typeof searchResult.audio.py).toBe('string')
expect(typeof searchResult.result.t).toBe('string')
diff --git a/test/specs/components/dictionaries/longman/engine.spec.ts b/test/specs/components/dictionaries/longman/engine.spec.ts
index e0d707a50..7bb82b848 100644
--- a/test/specs/components/dictionaries/longman/engine.spec.ts
+++ b/test/specs/components/dictionaries/longman/engine.spec.ts
@@ -35,7 +35,7 @@ describe('Dict/Longman/engine', () => {
related: true,
}
- return search('love', config, {})
+ return search('love', config, { isPDF: false })
.then(searchResult => {
expect(searchResult.audio && typeof searchResult.audio.uk).toBe('string')
expect(searchResult.audio && typeof searchResult.audio.us).toBe('string')
@@ -84,7 +84,7 @@ describe('Dict/Longman/engine', () => {
related: true,
}
- return search('profit', config, {})
+ return search('profit', config, { isPDF: false })
.then(searchResult => {
expect(searchResult.audio && typeof searchResult.audio.uk).toBe('string')
expect(searchResult.audio && typeof searchResult.audio.us).toBe('string')
@@ -135,7 +135,7 @@ describe('Dict/Longman/engine', () => {
})
it('should parse related result correctly', () => {
- return search('jumblish', appConfigFactory(), {})
+ return search('jumblish', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio).toBeUndefined()
diff --git a/test/specs/components/dictionaries/macmillan/engine.spec.ts b/test/specs/components/dictionaries/macmillan/engine.spec.ts
index 7e562ada6..df1dfef71 100644
--- a/test/specs/components/dictionaries/macmillan/engine.spec.ts
+++ b/test/specs/components/dictionaries/macmillan/engine.spec.ts
@@ -24,7 +24,7 @@ describe('Dict/Macmillan/engine', () => {
})
it('should parse lex result correctly', () => {
- return search('love', appConfigFactory(), {})
+ return search('love', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio && typeof searchResult.audio.uk).toBe('string')
@@ -45,7 +45,7 @@ describe('Dict/Macmillan/engine', () => {
})
it('should parse related result correctly', () => {
- return search('jumblish', appConfigFactory(), {})
+ return search('jumblish', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio).toBeUndefined()
diff --git a/test/specs/components/dictionaries/oald/engine.spec.ts b/test/specs/components/dictionaries/oald/engine.spec.ts
index 9a65777a3..a749ec185 100644
--- a/test/specs/components/dictionaries/oald/engine.spec.ts
+++ b/test/specs/components/dictionaries/oald/engine.spec.ts
@@ -24,7 +24,7 @@ describe('Dict/OALD/engine', () => {
})
it('should parse lex result correctly', () => {
- return search('love', appConfigFactory(), {})
+ return search('love', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio && typeof searchResult.audio.uk).toBe('string')
expect(searchResult.audio && typeof searchResult.audio.us).toBe('string')
@@ -44,7 +44,7 @@ describe('Dict/OALD/engine', () => {
})
it('should parse related result correctly', () => {
- return search('jumblish', appConfigFactory(), {})
+ return search('jumblish', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio).toBeUndefined()
diff --git a/test/specs/components/dictionaries/urban/engine.spec.ts b/test/specs/components/dictionaries/urban/engine.spec.ts
index 551f89192..6fe4a96e4 100644
--- a/test/specs/components/dictionaries/urban/engine.spec.ts
+++ b/test/specs/components/dictionaries/urban/engine.spec.ts
@@ -13,7 +13,7 @@ describe('Dict/Urban/engine', () => {
})
it('should parse result correctly', () => {
- return search('any', appConfigFactory(), {})
+ return search('any', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio && typeof searchResult.audio.us).toBe('string')
expect(searchResult.result).toHaveLength(4)
diff --git a/test/specs/components/dictionaries/vocabulary/engine.spec.ts b/test/specs/components/dictionaries/vocabulary/engine.spec.ts
index e016303e8..06a7a87e6 100644
--- a/test/specs/components/dictionaries/vocabulary/engine.spec.ts
+++ b/test/specs/components/dictionaries/vocabulary/engine.spec.ts
@@ -13,7 +13,7 @@ describe('Dict/Vocabulary/engine', () => {
})
it('should parse result correctly', () => {
- return search('any', appConfigFactory(), {})
+ return search('any', appConfigFactory(), { isPDF: false })
.then(({ result, audio }) => {
expect(audio).toBeUndefined()
expect(typeof result.long).toBe('string')
diff --git a/test/specs/components/dictionaries/websterlearner/engine.spec.ts b/test/specs/components/dictionaries/websterlearner/engine.spec.ts
index 2c22bfc72..bceb7e07f 100644
--- a/test/specs/components/dictionaries/websterlearner/engine.spec.ts
+++ b/test/specs/components/dictionaries/websterlearner/engine.spec.ts
@@ -24,7 +24,7 @@ describe('Dict/WebsterLearner/engine', () => {
})
it('should parse lex result correctly', () => {
- return search('house', appConfigFactory(), {})
+ return search('house', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio && typeof searchResult.audio.us).toBe('string')
@@ -84,7 +84,7 @@ describe('Dict/WebsterLearner/engine', () => {
})
it('should parse related result correctly', () => {
- return search('jumblish', appConfigFactory(), {})
+ return search('jumblish', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio).toBeUndefined()
diff --git a/test/specs/components/dictionaries/youdao/engine.spec.ts b/test/specs/components/dictionaries/youdao/engine.spec.ts
index f3b1f4d5a..ca8dac3a0 100644
--- a/test/specs/components/dictionaries/youdao/engine.spec.ts
+++ b/test/specs/components/dictionaries/youdao/engine.spec.ts
@@ -25,7 +25,7 @@ describe('Dict/Youdao/engine', () => {
it('should parse lex result correctly', () => {
const config = appConfigFactory() as AppConfigMutable
- return search('love', config, {})
+ return search('love', config, { isPDF: false })
.then(searchResult => {
expect(searchResult.audio && typeof searchResult.audio.uk).toBe('string')
expect(searchResult.audio && typeof searchResult.audio.us).toBe('string')
@@ -62,7 +62,7 @@ describe('Dict/Youdao/engine', () => {
translation: false,
related: false,
}
- return search('love', config, {})
+ return search('love', config, { isPDF: false })
.then(searchResult => {
expect(searchResult.audio && typeof searchResult.audio.uk).toBe('string')
expect(searchResult.audio && typeof searchResult.audio.us).toBe('string')
@@ -87,7 +87,7 @@ describe('Dict/Youdao/engine', () => {
it('should parse translation result correctly', () => {
const config = appConfigFactory() as AppConfigMutable
- return search('translation', config, {})
+ return search('translation', config, { isPDF: false })
.then(searchResult => {
expect(!searchResult.audio || !searchResult.audio.uk).toBeTruthy()
expect(!searchResult.audio || !searchResult.audio.us).toBeTruthy()
@@ -109,7 +109,7 @@ describe('Dict/Youdao/engine', () => {
})
it('should parse related result correctly', () => {
- return search('jumblish', appConfigFactory(), {})
+ return search('jumblish', appConfigFactory(), { isPDF: false })
.then(searchResult => {
expect(searchResult.audio).toBeUndefined()
diff --git a/test/specs/components/dictionaries/zdic/engine.spec.ts b/test/specs/components/dictionaries/zdic/engine.spec.ts
index c406c2cb3..0e1e53fc9 100644
--- a/test/specs/components/dictionaries/zdic/engine.spec.ts
+++ b/test/specs/components/dictionaries/zdic/engine.spec.ts
@@ -14,7 +14,7 @@ describe('Dict/Zdic/engine', () => {
})
it('should parse word result correctly', () => {
- return search('爱', appConfigFactory(), {})
+ return search('爱', appConfigFactory(), { isPDF: false })
.then(({ result, audio }) => {
expect(audio && typeof audio.py).toBe('string')
expect(result.phsym.length).toBeGreaterThan(0)
@@ -23,7 +23,7 @@ describe('Dict/Zdic/engine', () => {
})
it('should parse phrase result correctly', () => {
- return search('沙拉', appConfigFactory(), {})
+ return search('沙拉', appConfigFactory(), { isPDF: false })
.then(({ result, audio }) => {
expect(audio && typeof audio.py).toBe('string')
expect(result.phsym.length).toBeGreaterThan(0)
|
test
|
update dicts tests
|
8a1cd4c9f5f2598a24994e7c0933f90a2e677d9d
|
2020-07-03 09:52:58
|
crimx
|
refactor(dicts): update baidu favicon
| false
|
diff --git a/src/components/dictionaries/baidu/favicon.png b/src/components/dictionaries/baidu/favicon.png
index 36f26d4a4..79399ae7c 100644
Binary files a/src/components/dictionaries/baidu/favicon.png and b/src/components/dictionaries/baidu/favicon.png differ
|
refactor
|
update baidu favicon
|
da96a1d9c3ba93da3b891a36b2827cbb4ffbd093
|
2019-08-05 22:03:33
|
crimx
|
refactor: sendMessage allows specifying response type
| false
|
diff --git a/src/_helpers/browser-api.ts b/src/_helpers/browser-api.ts
index 6451d5d13..0486f0289 100644
--- a/src/_helpers/browser-api.ts
+++ b/src/_helpers/browser-api.ts
@@ -302,13 +302,13 @@ function storageCreateStream<T = any>(
\* --------------------------------------- */
type MessageThis = typeof message | typeof message.self
-function messageSend<T extends MsgType>(
+function messageSend<T extends MsgType, R = undefined>(
message: Message<T>
-): Promise<MessageResponse<T>>
-function messageSend<T extends MsgType>(
+): Promise<R extends undefined ? MessageResponse<T> : R>
+function messageSend<T extends MsgType, R = undefined>(
tabId: number,
message: Message<T>
-): Promise<MessageResponse<T>>
+): Promise<R extends undefined ? MessageResponse<T> : R>
function messageSend<T extends MsgType>(
...args: [Message<T>] | [number, Message<T>]
): Promise<any> {
@@ -324,9 +324,9 @@ function messageSend<T extends MsgType>(
})
}
-async function messageSendSelf<T extends MsgType>(
+async function messageSendSelf<T extends MsgType, R = undefined>(
message: Message<T>
-): Promise<MessageResponse<T>> {
+): Promise<R extends undefined ? MessageResponse<T> : R> {
if (window.pageId === undefined) {
await initClient()
}
diff --git a/src/typings/message.ts b/src/typings/message.ts
index c7778aba2..338fdbf7c 100644
--- a/src/typings/message.ts
+++ b/src/typings/message.ts
@@ -52,6 +52,17 @@ export type MessageConfig = {
payload: string
}
+ DICT_ENGINE_METHOD: {
+ /** call any method exported from the engine */
+ type: 'DICT_ENGINE_METHOD'
+ payload: {
+ id: DictID
+ method: string
+ args?: any[]
+ }
+ response: any
+ }
+
IS_IN_NOTEBOOK: {
/** Is a word in Notebook */
type: 'IS_IN_NOTEBOOK'
|
refactor
|
sendMessage allows specifying response type
|
7c458079e25da3b14ba5c0a11e8722b3fadf7091
|
2020-04-20 09:11:26
|
crimx
|
refactor(options): add entry ImportExport
| false
|
diff --git a/src/_locales/en/options.ts b/src/_locales/en/options.ts
index 5435113d0..ff033b9dc 100644
--- a/src/_locales/en/options.ts
+++ b/src/_locales/en/options.ts
@@ -109,10 +109,6 @@ export const locale: typeof _locale = {
tripleCtrlPageSel_help: 'Response to page selection.',
opt: {
- export: 'Export Configs',
- help: 'Configs are synced automatically via browser.',
- import: 'Import Configs',
- import_error: 'Import Configs failed',
reset: 'Reset Configs',
reset_confirm: 'Reset to default settings. Confirm？',
upload_error: 'Unable to save settings.',
@@ -313,6 +309,28 @@ export const locale: typeof _locale = {
BOTTOM_RIGHT: 'Bottom Right'
},
+ import_export_help:
+ 'Configs are auto-synced via browser. Here you can also import/export manually. Backups are exported as plain text files. Please encrypt it yourself if needed.',
+
+ import: {
+ title: 'Import Configs',
+ error: {
+ title: 'Import Error',
+ parse: 'Unable to parse backup. Incorrect format.',
+ load: 'Unable to load backup. Browser cannot obtain the local file.',
+ empty: 'No valid data found in the backup.'
+ }
+ },
+
+ export: {
+ title: 'Export Configs',
+ error: {
+ title: 'Export Error',
+ empty: 'No config to export.',
+ parse: 'Unable to parse configs.'
+ }
+ },
+
opt: {
analytics: 'Enable Google Analytics',
analytics_help:
diff --git a/src/_locales/zh-CN/options.ts b/src/_locales/zh-CN/options.ts
index e520824a3..75b83397e 100644
--- a/src/_locales/zh-CN/options.ts
+++ b/src/_locales/zh-CN/options.ts
@@ -100,10 +100,6 @@ export const locale = {
tripleCtrlPageSel_help: '响应网页划词。',
opt: {
- export: '导出设定',
- help: '设定已通过浏览器自动同步，也可以手动导入导出。',
- import: '导入设定',
- import_error: '导入设定失败',
reset: '重置设定',
reset_confirm: '所有设定将还原到默认值，确定？',
upload_error: '设置保存失败',
@@ -298,6 +294,28 @@ export const locale = {
BOTTOM_RIGHT: '右下'
},
+ import_export_help:
+ '设定已通过浏览器自动同步，也可以手动导入导出。备份为明文保存，对安全性有要求的请自行加密。',
+
+ import: {
+ title: '导入设定',
+ error: {
+ title: '导入失败',
+ parse: '备份解析失败，格式不正确。',
+ load: '备份加载失败，浏览器无法获得本地备份。',
+ empty: '备份中没有发现有效数据。'
+ }
+ },
+
+ export: {
+ title: '导出设定',
+ error: {
+ title: '导出失败',
+ empty: '没有设置可以导出。',
+ parse: '设置解析失败，无法导出。'
+ }
+ },
+
opt: {
analytics: '启用 Google Analytics',
analytics_help:
diff --git a/src/_locales/zh-TW/options.ts b/src/_locales/zh-TW/options.ts
index 0c60db1b1..fd9ae2cde 100644
--- a/src/_locales/zh-TW/options.ts
+++ b/src/_locales/zh-TW/options.ts
@@ -103,10 +103,6 @@ export const locale: typeof _locale = {
tripleCtrlPageSel_help: '對網頁滑鼠滑字作出反應。',
opt: {
- export: '匯出設定',
- help: '設定已通過瀏覽器自動同步，也可以手動匯入匯出。',
- import: '匯入設定',
- import_error: '匯入設定失敗',
reset: '重設設定',
reset_confirm: '所有設定將還原至預設值，確定？',
upload_error: '設定儲存失敗',
@@ -302,6 +298,28 @@ export const locale: typeof _locale = {
BOTTOM_RIGHT: '右下'
},
+ import_export_help:
+ '設定已通過瀏覽器自動同步，也可以手動匯入匯出。備份為明文儲存，對安全性有要求的請自行加密。',
+
+ import: {
+ title: '匯入設定',
+ error: {
+ title: '匯入失敗',
+ parse: '備份解析失敗，格式不正確。',
+ load: '備份載入失敗，瀏覽器無法獲得本地備份。',
+ empty: '備份中沒有發現有效資料。'
+ }
+ },
+
+ export: {
+ title: '匯出設定',
+ error: {
+ title: '匯出失敗',
+ empty: '沒有設定可以匯出。',
+ parse: '設定解析失敗，無法匯出。'
+ }
+ },
+
opt: {
analytics: '啟用 Google Analytics',
analytics_help:
diff --git a/src/options/components/Entries/ImportExport.tsx b/src/options/components/Entries/ImportExport.tsx
new file mode 100644
index 000000000..2906d32f8
--- /dev/null
+++ b/src/options/components/Entries/ImportExport.tsx
@@ -0,0 +1,195 @@
+import React, { FC } from 'react'
+import { TFunction } from 'i18next'
+import { Row, Col, Upload, notification } from 'antd'
+import { RcFile } from 'antd/lib/upload'
+import { DownloadOutlined, UploadOutlined } from '@ant-design/icons'
+import { AppConfig } from '@/app-config'
+import mergeConfig from '@/app-config/merge-config'
+import { ProfileIDList, Profile } from '@/app-config/profiles'
+import { mergeProfile } from '@/app-config/merge-profile'
+import { useTranslate } from '@/_helpers/i18n'
+import { storage } from '@/_helpers/browser-api'
+import { updateConfig, getConfig } from '@/_helpers/config-manager'
+import { updateProfile, getProfile } from '@/_helpers/profile-manager'
+import { useListLayout } from '@/options/helpers/layout'
+
+export type ConfigStorage = {
+ baseconfig: AppConfig
+ activeProfileID: string
+ hasInstructionsShown: boolean
+ profileIDList: ProfileIDList
+} & {
+ [id: string]: Profile
+}
+
+export const ImportExport: FC = () => {
+ const { t } = useTranslate('options')
+ const layout = useListLayout()
+
+ return (
+ <Row>
+ <Col {...layout}>
+ <Row gutter={10}>
+ <Col span={12}>
+ <Upload.Dragger
+ showUploadList={false}
+ beforeUpload={file => {
+ importConfig(file, t)
+ return false
+ }}
+ >
+ <p className="ant-upload-drag-icon">
+ <DownloadOutlined />
+ </p>
+ <p className="ant-upload-text">{t('import.title')}</p>
+ </Upload.Dragger>
+ </Col>
+ <Col span={12}>
+ <button
+ className="ant-upload ant-upload-drag"
+ onClick={() => exportConfig(t)}
+ >
+ <div className="ant-upload ant-upload-btn">
+ <p className="ant-upload-drag-icon">
+ <UploadOutlined />
+ </p>
+ <p className="ant-upload-text">{t('export.title')}</p>
+ </div>
+ </button>
+ </Col>
+ </Row>
+ <Row justify="center">
+ <p style={{ margin: '1em 0' }}>{t('import_export_help')}</p>
+ </Row>
+ </Col>
+ </Row>
+ )
+}
+
+async function importConfig(file: RcFile, t: TFunction) {
+ const result = await new Promise<Partial<ConfigStorage> | null>(resolve => {
+ const fr = new FileReader()
+ fr.onload = () => {
+ try {
+ const json = JSON.parse(fr.result as string)
+ resolve(json)
+ } catch (err) {
+ notification.error({
+ message: t('import.error.title'),
+ description: t('import.error.parse')
+ })
+ }
+ resolve()
+ }
+ fr.onerror = () => {
+ notification.error({
+ message: t('import.error.title'),
+ description: t('import.error.parse')
+ })
+ resolve()
+ }
+ fr.readAsText(file)
+ })
+
+ if (!result) {
+ return
+ }
+
+ let {
+ baseconfig,
+ activeProfileID,
+ hasInstructionsShown,
+ profileIDList,
+ syncConfig
+ } = result
+
+ if (
+ !baseconfig &&
+ !activeProfileID &&
+ !profileIDList &&
+ hasInstructionsShown == null
+ ) {
+ notification.error({
+ message: t('import.error.title'),
+ description: t('import.error.empty')
+ })
+ return
+ }
+
+ await storage.sync.clear()
+
+ if (baseconfig) {
+ await updateConfig(mergeConfig(baseconfig))
+ }
+
+ if (syncConfig) {
+ await storage.sync.set({ syncConfig })
+ }
+
+ if (hasInstructionsShown != null) {
+ await storage.sync.set({ hasInstructionsShown })
+ }
+
+ if (profileIDList) {
+ profileIDList = profileIDList.filter(({ id }) => result[id])
+ if (profileIDList.length > 0) {
+ for (const { id } of profileIDList) {
+ await updateProfile(mergeProfile(result[id] as Profile))
+ }
+ if (
+ !activeProfileID ||
+ profileIDList.every(({ id }) => id !== activeProfileID)
+ ) {
+ // use first item instead
+ activeProfileID = profileIDList[0].id
+ }
+ await storage.sync.set({ activeProfileID, profileIDList })
+ }
+ }
+}
+
+async function exportConfig(t: TFunction) {
+ const result = await storage.sync.get([
+ 'activeProfileID',
+ 'hasInstructionsShown',
+ 'profileIDList',
+ 'syncConfig'
+ ])
+
+ result.baseconfig = await getConfig()
+
+ if (!result.baseconfig || !result.activeProfileID || !result.profileIDList) {
+ notification.error({
+ message: t('export.error.title'),
+ description: t('export.error.empty')
+ })
+ return
+ }
+
+ for (const { id } of result.profileIDList) {
+ result[id] = await getProfile(id)
+ }
+
+ try {
+ let text = JSON.stringify(result)
+ const { os } = await browser.runtime.getPlatformInfo()
+ if (os === 'win') {
+ text = text.replace(/\r\n|\n/g, '\r\n')
+ }
+ const file = new Blob([text], { type: 'text/plain;charset=utf-8' })
+ const a = document.createElement('a')
+ a.href = URL.createObjectURL(file)
+ a.download = `config-${Date.now()}.saladict`
+
+ // firefox
+ a.target = '_blank'
+ document.body.appendChild(a)
+
+ a.click()
+ } catch (err) {
+ notification.error({
+ message: t('export.error.title'),
+ description: t('export.error.parse')
+ })
+ }
+}
|
refactor
|
add entry ImportExport
|
e9a2e068547eb8742caedb5b327c952721ba54ae
|
2018-01-31 17:39:46
|
CRIMX
|
build(package): upgrade web-ext-types
| false
|
diff --git a/yarn.lock b/yarn.lock
index 29efc9efe..838f12a4b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8218,8 +8218,8 @@ wbuf@^1.1.0, wbuf@^1.7.2:
minimalistic-assert "^1.0.0"
web-ext-types@crimx/web-ext-types:
- version "1.1.5"
- resolved "https://codeload.github.com/crimx/web-ext-types/tar.gz/b32c41844fae062f7c601f9377eff1582a94ff48"
+ version "1.1.7"
+ resolved "https://codeload.github.com/crimx/web-ext-types/tar.gz/f43910e7cb71d6d5dca3616027c8024887af9b6b"
webextension-polyfill@^0.2.1:
version "0.2.1"
|
build
|
upgrade web-ext-types
|
2c2d6f17e5be8cbe177a1060e55d4582aee891ba
|
2018-02-04 23:41:24
|
CRIMX
|
build(webpack): add vue extension
| false
|
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index d7ad98488..73f3884ef 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -103,7 +103,7 @@ module.exports = {
// https://github.com/facebookincubator/create-react-app/issues/290
// `web` extension prefixes have been added for better support
// for React Native Web.
- extensions: ['.ts', '.tsx', '.js', '.json', '.jsx'],
+ extensions: ['.ts', '.tsx', '.js', '.json', '.jsx', '.vue'],
alias: {
// Support React Native Web
// https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
|
build
|
add vue extension
|
bea7afb407af8d2782289b423b36b8b2ac29bd51
|
2019-12-05 14:04:56
|
crimx
|
docs: wording
| false
|
diff --git a/README.md b/README.md
index 53afa9119..6338e849b 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ cd ext-saladict
yarn install
```
-add a `.env` file following the `.env.example` format.
+Add a `.env` file following the `.env.example` format(leave empty if you don't use these dictionaries).
```bash
yarn build
|
docs
|
wording
|
2c676426d5fb743b880e39171f77e11bb2f47e2c
|
2019-01-20 17:46:23
|
CRIMX
|
fix(profiles): fix addActiveProfileListener
| false
|
diff --git a/src/_helpers/profile-manager.ts b/src/_helpers/profile-manager.ts
index 7b6c32dae..58fbaf57a 100644
--- a/src/_helpers/profile-manager.ts
+++ b/src/_helpers/profile-manager.ts
@@ -191,9 +191,6 @@ export async function getActiveProfile (): Promise<Profile> {
return profile
}
}
- if (process.env.DEV_BUILD) {
- console.error('cannot find profile ' + activeProfileID)
- }
return getDefaultProfile()
}
@@ -245,19 +242,17 @@ export function addProfileIDListListener (
export async function addActiveProfileListener (
cb: (changes: ProfileChanged) => any
) {
- let activeProfileID: ProfileID | undefined = (await getProfileIDList())[0]
+ let activeID: string | undefined = await getActiveProfileID()
storage.sync.addListener(changes => {
- if (changes.profileIDList) {
+ if (changes.activeProfileID) {
const {
- newValue: newList,
- oldValue: oldList
- } = (changes as { profileIDList: StorageChanged<ProfileIDList> }).profileIDList
- if (newList && newList[0]) {
- activeProfileID = newList[0]
- const newID = activeProfileID.id
- if (oldList && oldList[0]) {
- const oldID = oldList[0].id
+ newValue: newID,
+ oldValue: oldID,
+ } = (changes as { activeProfileID: StorageChanged<string> }).activeProfileID
+ if (newID) {
+ activeID = newID
+ if (oldID) {
storage.sync.get([oldID, newID]).then(obj => {
if (obj[newID]) {
cb({ newProfile: obj[newID], oldProfile: obj[oldID] })
@@ -276,8 +271,8 @@ export async function addActiveProfileListener (
}
}
- if (activeProfileID && changes[activeProfileID.id]) {
- const { newValue, oldValue } = changes[activeProfileID.id]
+ if (activeID && changes[activeID]) {
+ const { newValue, oldValue } = changes[activeID]
if (newValue) {
cb({ newProfile: newValue, oldProfile: oldValue })
return
|
fix
|
fix addActiveProfileListener
|
42003e51c0c3778c3ecbc0d6771142baae720ab9
|
2020-07-12 14:35:30
|
crimx
|
fix(dicts): correct machine translator rtl source text collapse fading
| false
|
diff --git a/src/components/MachineTrans/MachineTrans.scss b/src/components/MachineTrans/MachineTrans.scss
index 99bad3603..db078b427 100644
--- a/src/components/MachineTrans/MachineTrans.scss
+++ b/src/components/MachineTrans/MachineTrans.scss
@@ -66,7 +66,7 @@
{
direction: rtl !important;
- .MachineTrans-Lines-collapse {
+ &.MachineTrans-Lines-collapse {
&::after {
background: linear-gradient(270deg, rgba(255,255,255,0) 50%, var(--color-background) 90%);
}
|
fix
|
correct machine translator rtl source text collapse fading
|
c66ed0586a1662d2a9c4611f8ef8e2c4c7099b60
|
2020-04-25 09:27:44
|
crimx
|
fix(options): typo
| false
|
diff --git a/src/options/components/Entries/Dictionaries/EditModal.tsx b/src/options/components/Entries/Dictionaries/EditModal.tsx
index 01d8f59f2..be4165e7c 100644
--- a/src/options/components/Entries/Dictionaries/EditModal.tsx
+++ b/src/options/components/Entries/Dictionaries/EditModal.tsx
@@ -160,7 +160,7 @@ export const EditModal: FC<EditModalProps> = ({ dictID, onClose }) => {
<Select>
{langs.map((option: string) => (
<Select.Option value={option} key={option}>
- {option === 'default' ? '' : options + ' '}
+ {option === 'default' ? '' : option + ' '}
{t(`langcode:${option}`)}
</Select.Option>
))}
|
fix
|
typo
|
98110801d0bb37b82917f43c80e7feead9c273d2
|
2018-05-28 15:57:52
|
CRIMX
|
refactor(options): instant search on first time
| false
|
diff --git a/src/options/index.ts b/src/options/index.ts
index 92fdaddbd..4025b742f 100644
--- a/src/options/index.ts
+++ b/src/options/index.ts
@@ -16,7 +16,7 @@ import { MsgType, MsgSelection } from '@/typings/message'
window.__SALADICT_INTERNAL_PAGE__ = true
window.__SALADICT_OPTIONS_PAGE__ = true
-window.__SALADICT_LAST_SEARCH__ = 'salad'
+window.__SALADICT_LAST_SEARCH__ = ''
injectPanel()
@@ -58,7 +58,7 @@ storage.sync.get('config')
dbClick: false,
ctrlKey: false,
})
- }, 2000)
+ }, window.__SALADICT_LAST_SEARCH__ ? 2000 : 0)
}
}
}
|
refactor
|
instant search on first time
|
9655dc36807b06a0220401a0e3518ef95388b09b
|
2018-10-04 08:51:43
|
CRIMX
|
docs: add link for GFW
| false
|
diff --git a/README.md b/README.md
index ba7e9ad13..25b5995c5 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Chrome/Firefox WebExtension. Feature-rich inline translator with PDF support. Vi
## Downloads
-[Chrome Web Store](https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg?hl=en) / [Firefox Add-ons](https://addons.mozilla.org/firefox/addon/ext-saladict/) / [Github Release](https://github.com/crimx/crx-saladict/releases/)
+[Chrome Web Store](https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg?hl=en) / [Firefox Add-ons](https://addons.mozilla.org/firefox/addon/ext-saladict/)
Saladict 6 is a complete rewrite in React Typescript for both Chrome & Firefox. Built for speed, stability and customization.
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 43d07fc43..f30fae8a8 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -6,7 +6,6 @@
<meta name="description" content="{{ page.description | default: site.description | default: site.github.project_tagline }}"/>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#157878">
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700" media="whatever"/>
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
<style>
* {
@@ -20,10 +19,11 @@
<body>
<section class="page-header">
<h1 class="project-name">Saladict 沙拉查词</h1>
- <h2 class="project-tagline">涵盖所有主流词典，多重划词模式，极致交互体验，灵活导出生词本，高度可配置，支持 PDF，兼容 Vimium 全键盘操作。</h2>
+ <h2 class="project-tagline" style="margin:0">专业多词典网页划词翻译</h2>
+ <h2 class="project-tagline">涵盖所有主流词典，多重划词模式，极致交互体验，灵活导出生词本，骨灰级配置，支持 PDF，兼容 Vimium 全键盘操作。</h2>
<a href="https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg?hl=en" class="btn">进入 Chrome 商店</a>
<a href="https://addons.mozilla.org/firefox/addon/ext-saladict/" class="btn">进入 Firefox 商店</a>
- <a href="{{ site.github.releases_url }}" class="btn">直接下载 crx</a>
+ <a href="https://github.com/crimx/ext-saladict/releases" class="btn">其它下载方式</a>
<a href="{{ site.github.repository_url }}" class="btn">View on GitHub</a>
</section>
@@ -51,5 +51,6 @@ <h2 class="project-tagline">涵盖所有主流词典，多重划词模式，极
ga('send', 'pageview');
</script>
{% endif %}
+ <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700" media="whatever"/>
</body>
</html>
diff --git a/docs/index.md b/docs/index.md
index c61ba1b1c..d0d463478 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -20,8 +20,7 @@ Chrome/Firefox 浏览器插件，网页划词翻译。
# 下载
-[Chrome 商店](https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg?hl=en) / [Firefox 商店](https://addons.mozilla.org/firefox/addon/ext-saladict/) / [直接下载](https://github.com/crimx/crx-saladict/releases/)
-
+见[最新发布版本](https://github.com/crimx/ext-saladict/releases)。
功能一览：
- 词典丰富
|
docs
|
add link for GFW
|
74ae476b0133f408a3393c5c11f83e84ebe2f8ac
|
2018-09-02 10:59:00
|
CRIMX
|
fix(config): add met merge config
| false
|
diff --git a/src/app-config/merge-config.ts b/src/app-config/merge-config.ts
index eac4bde30..d793b5415 100644
--- a/src/app-config/merge-config.ts
+++ b/src/app-config/merge-config.ts
@@ -31,6 +31,7 @@ export function mergeConfig (oldConfig: AppConfig, baseConfig?: AppConfig): AppC
mergeBoolean('searhHistoryInco')
mergeBoolean('newWordSound')
mergeBoolean('editOnFav')
+ mergeString('mtaAutoUnfold')
mergeBoolean('mode.icon')
mergeBoolean('mode.direct')
|
fix
|
add met merge config
|
dc348103828fd4b05e090e0c85e4e7b6fe7852d9
|
2018-10-11 16:37:07
|
CRIMX
|
feat(command): add command for quick search panel
| false
|
diff --git a/src/_locales/messages.json b/src/_locales/messages.json
index 446bf2fbc..a58d31827 100644
--- a/src/_locales/messages.json
+++ b/src/_locales/messages.json
@@ -37,6 +37,13 @@
"en": "Toggle instant capture"
}
},
+ "command_open_quick_search": {
+ "message": {
+ "zh_CN": "打开独立词典窗口",
+ "zh_TW": "開啟獨立詞典視窗",
+ "en": "Open or highlight standalone dict panel"
+ }
+ },
"command_open_google": {
"message": {
"zh_CN": "对当前页启用谷歌翻译",
diff --git a/src/background/initialization.ts b/src/background/initialization.ts
index fc04b2935..6b1458237 100644
--- a/src/background/initialization.ts
+++ b/src/background/initialization.ts
@@ -3,6 +3,7 @@ import checkUpdate from '@/_helpers/check-update'
import { AppConfigMutable } from '@/app-config'
import { getActiveConfig, updateActiveConfig, initConfig } from '@/_helpers/config-manager'
import { init as initMenus, openPDF, openGoogle, openYoudao } from './context-menus'
+import { openQSPanel } from './server'
import { init as initPdf } from './pdf-sniffer'
import { MsgType, MsgQueryPanelState } from '@/typings/message'
@@ -50,6 +51,9 @@ browser.commands.onCommand.addListener(command => {
})
})
break
+ case 'open-quick-search':
+ openQSPanel()
+ break
case 'open-google':
openGoogle()
break
diff --git a/src/background/server.ts b/src/background/server.ts
index baa9bf07e..b02f16ea6 100644
--- a/src/background/server.ts
+++ b/src/background/server.ts
@@ -86,7 +86,7 @@ browser.windows.onRemoved.addListener(async winID => {
}
})
-async function openQSPanel (): Promise<void> {
+export async function openQSPanel (): Promise<void> {
if (qsPanelID !== false) {
await browser.windows.update(qsPanelID, { focused: true })
} else {
diff --git a/src/manifest/common.manifest.json b/src/manifest/common.manifest.json
index 883a09731..5df68f946 100644
--- a/src/manifest/common.manifest.json
+++ b/src/manifest/common.manifest.json
@@ -43,14 +43,17 @@
"toggle-instant": {
"description": "__MSG_command_toggle_instant__"
},
- "open-google": {
- "description": "__MSG_command_open_google__"
+ "open-quick-search": {
+ "description": "__MSG_command_open_quick_search__"
+ },
+ "open-pdf": {
+ "description": "__MSG_command_open_pdf__"
},
"open-youdao": {
"description": "__MSG_command_open_youdao__"
},
- "open-pdf": {
- "description": "__MSG_command_open_pdf__"
+ "open-google": {
+ "description": "__MSG_command_open_google__"
}
},
|
feat
|
add command for quick search panel
|
a2718d4f873728417fb68de12cd8ec400e32500e
|
2019-10-01 15:45:25
|
crimx
|
fix(dicts): hjdict switch buttons. close #489
| false
|
diff --git a/src/components/dictionaries/hjdict/View.tsx b/src/components/dictionaries/hjdict/View.tsx
index dbbf2e5bc..a5a303885 100644
--- a/src/components/dictionaries/hjdict/View.tsx
+++ b/src/components/dictionaries/hjdict/View.tsx
@@ -52,6 +52,7 @@ function LangSelect(props: ViewPorps<HjdictResult>) {
return (
<select
style={{ width: '100%' }}
+ value={langCode}
onChange={e =>
props.searchText({
id: 'hjdict',
@@ -60,7 +61,7 @@ function LangSelect(props: ViewPorps<HjdictResult>) {
}
>
{langSelectList.map(lang => (
- <option key={lang} value={lang} selected={lang === langCode}>
+ <option key={lang} value={lang}>
{t(`hjdict.options.chsas-${lang}`)}
</option>
))}
@@ -74,13 +75,13 @@ function handleClick(e: React.MouseEvent<HTMLElement>): void {
if ($tab.classList.contains('word-details-tab-active')) {
return
}
- const doc = $tab.ownerDocument
- if (doc) {
+ const container = e.currentTarget
+ if (container) {
const index = +($tab.dataset.categories || '0')
- const $panes = doc.querySelectorAll('.word-details-pane')
+ const $panes = container.querySelectorAll('.word-details-pane')
- doc.querySelectorAll('.word-details-tab').forEach(($tab, i) => {
+ container.querySelectorAll('.word-details-tab').forEach(($tab, i) => {
if (i === index) {
$tab.classList.add('word-details-tab-active')
$panes[i].classList.add('word-details-pane-active')
diff --git a/src/components/dictionaries/hjdict/_style.shadow.scss b/src/components/dictionaries/hjdict/_style.shadow.scss
index 27f29da8d..0877ee830 100644
--- a/src/components/dictionaries/hjdict/_style.shadow.scss
+++ b/src/components/dictionaries/hjdict/_style.shadow.scss
@@ -1613,7 +1613,7 @@ a.ui-button:active {
}
.word-details-header {
- padding: 5px;
+ padding-top: 5px;
}
.word-details-header > p {
@@ -1640,6 +1640,7 @@ a.ui-button:active {
padding: 8px 10px;
white-space: nowrap;
word-break: keep-all;
+ color: #333;
background: #f5f8ff;
}
diff --git a/test/specs/components/dictionaries/hjdict/requests.mock.ts b/test/specs/components/dictionaries/hjdict/requests.mock.ts
index 8bbb5062f..346e75f35 100644
--- a/test/specs/components/dictionaries/hjdict/requests.mock.ts
+++ b/test/specs/components/dictionaries/hjdict/requests.mock.ts
@@ -1,6 +1,6 @@
import { MockRequest } from '@/components/dictionaries/helpers'
-export const mockSearchTexts = ['love', '爱', 'henr']
+export const mockSearchTexts = ['爱', 'love', 'henr']
export const mockRequest: MockRequest = mock => {
mock.onGet(/hjdict/).reply(info => {
|
fix
|
hjdict switch buttons. close #489
|
89ccad54ea41b7b759a9ad8aa86e4e1b363f3a27
|
2019-08-02 12:29:27
|
crimx
|
refactor(storybook): center dict panel
| false
|
diff --git a/src/_helpers/storybook.tsx b/src/_helpers/storybook.tsx
index c420432be..96d09c3ba 100644
--- a/src/_helpers/storybook.tsx
+++ b/src/_helpers/storybook.tsx
@@ -69,7 +69,7 @@ export function withSaladictPanel(children: React.ReactNode) {
return function SaladcitPanel(story: Function) {
const width = number('Panel Width', 450)
return (
- <root.div>
+ <root.div style={{ width, margin: '0 auto' }}>
<style>{require('@/_sass_global/_reset.scss').toString()}</style>
<div
className={boolean('Enable Animation', true) ? 'isAnimate' : ''}
|
refactor
|
center dict panel
|
0dcc76ff4586bce5581d49a7300c7ef4e442260c
|
2020-04-18 18:55:36
|
crimx
|
refactor(options): move form item label down a bit
| false
|
diff --git a/src/options/_style.scss b/src/options/_style.scss
index 53b9b9fe1..cafcc2720 100644
--- a/src/options/_style.scss
+++ b/src/options/_style.scss
@@ -15,6 +15,7 @@
white-space: normal !important;
> label {
+ margin-top: 3px !important;
align-items: flex-start !important;
height: auto !important;
|
refactor
|
move form item label down a bit
|
ad947e1a17ec08ab25d2f199b75213ab1f67e426
|
2018-12-04 20:53:44
|
CRIMX
|
chore(release): 6.22.0
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e82c512ab..0dc00654e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,31 @@
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.22.0"></a>
+# [6.22.0](https://github.com/crimx/ext-saladict/compare/v6.21.2...v6.22.0) (2018-12-04)
+
+
+### Bug Fixes
+
+* generate styles for all selected dicts ([1de0599](https://github.com/crimx/ext-saladict/commit/1de0599))
+* highlight window and tab is exist ([840c085](https://github.com/crimx/ext-saladict/commit/840c085)), closes [#251](https://github.com/crimx/ext-saladict/issues/251)
+* **dicts:** add id when searching ([246c9af](https://github.com/crimx/ext-saladict/commit/246c9af))
+* inject panel to every page on install ([f108f2e](https://github.com/crimx/ext-saladict/commit/f108f2e))
+* **manifest:** make dicts styles web accessible ([2bc0dff](https://github.com/crimx/ext-saladict/commit/2bc0dff))
+
+
+### Features
+
+* **dicts:** add dict Hjdict ([76b8210](https://github.com/crimx/ext-saladict/commit/76b8210)), closes [#252](https://github.com/crimx/ext-saladict/issues/252)
+* **helpers:** add lang check ([5375f67](https://github.com/crimx/ext-saladict/commit/5375f67))
+
+
+### Performance Improvements
+
+* **dicts:** only load necessary styles ([e15fbdd](https://github.com/crimx/ext-saladict/commit/e15fbdd))
+
+
+
<a name="6.21.2"></a>
## [6.21.2](https://github.com/crimx/ext-saladict/compare/v6.21.1...v6.21.2) (2018-11-28)
diff --git a/package.json b/package.json
index 4e67b13a5..12f13a87d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.21.2",
+ "version": "6.22.0",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.22.0
|
ce4aa741788776469a49095a77b0905ab7531ded
|
2020-06-01 21:07:09
|
crimx
|
refactor: disable sogou for ctx trans by default
| false
|
diff --git a/src/app-config/index.ts b/src/app-config/index.ts
index 2d8524925..550e65710 100644
--- a/src/app-config/index.ts
+++ b/src/app-config/index.ts
@@ -257,11 +257,11 @@ function _getDefaultConfig() {
/** context tranlate engines */
ctxTrans: {
google: true,
- sogou: true,
youdaotrans: true,
baidu: true,
tencent: false,
- caiyun: false
+ caiyun: false,
+ sogou: false
},
/** start searching when source containing the languages */
|
refactor
|
disable sogou for ctx trans by default
|
9250b25d1d80947d91e8b9e691ca852755a93e5c
|
2019-06-12 13:15:24
|
CRIMX
|
chore(release): 6.33.0
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa04c249e..5ef3f3057 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
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.33.0"></a>
+# [6.33.0](https://github.com/crimx/ext-saladict/compare/v6.32.0...v6.33.0) (2019-06-12)
+
+
+### Bug Fixes
+
+* **dicts:** baidu options mixed with google ([239527e](https://github.com/crimx/ext-saladict/commit/239527e))
+* **selection:** context extraction ([ec7421d](https://github.com/crimx/ext-saladict/commit/ec7421d))
+
+
+### Features
+
+* **dicts:** add weblio ejje ([5b01e1e](https://github.com/crimx/ext-saladict/commit/5b01e1e))
+
+
+
<a name="6.32.0"></a>
# [6.32.0](https://github.com/crimx/ext-saladict/compare/v6.31.1...v6.32.0) (2019-05-31)
diff --git a/package.json b/package.json
index 3429c4abe..44b454faa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.32.0",
+ "version": "6.33.0",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.33.0
|
60a1c15173f7c3d5925859f3c8decfdc184d2df9
|
2019-05-11 23:22:44
|
CRIMX
|
chore(release): 6.30.0
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 687f65d02..5bf07c47b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
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.30.0"></a>
+# [6.30.0](https://github.com/crimx/ext-saladict/compare/v6.29.0...v6.30.0) (2019-05-11)
+
+
+### Bug Fixes
+
+* **sync:** replace settimeout with alarms ([05f1260](https://github.com/crimx/ext-saladict/commit/05f1260)), closes [#361](https://github.com/crimx/ext-saladict/issues/361)
+* check empty word fields ([60f8066](https://github.com/crimx/ext-saladict/commit/60f8066)), closes [#363](https://github.com/crimx/ext-saladict/issues/363)
+* typo ([8b0f3ff](https://github.com/crimx/ext-saladict/commit/8b0f3ff))
+* **dicts:** get correct lang list on consecutive searches ([4ad4dcf](https://github.com/crimx/ext-saladict/commit/4ad4dcf)), closes [#360](https://github.com/crimx/ext-saladict/issues/360)
+
+
+### Features
+
+* **dicts:** add jukuu ([a4775fd](https://github.com/crimx/ext-saladict/commit/a4775fd))
+
+
+
<a name="6.29.0"></a>
# [6.29.0](https://github.com/crimx/ext-saladict/compare/v6.28.1...v6.29.0) (2019-05-02)
diff --git a/package.json b/package.json
index ae48ecfe3..55ce31926 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.29.0",
+ "version": "6.30.0",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.30.0
|
ce741c07038cc536aa2fe39f9174b136cc33de33
|
2019-09-24 18:38:29
|
crimx
|
fix(dicts): update tencent api
| false
|
diff --git a/src/components/dictionaries/tencent/engine.ts b/src/components/dictionaries/tencent/engine.ts
index a14d7b855..923d799bc 100644
--- a/src/components/dictionaries/tencent/engine.ts
+++ b/src/components/dictionaries/tencent/engine.ts
@@ -224,7 +224,7 @@ function setupHeaderModifier() {
}
return { requestHeaders: details.requestHeaders }
},
- { urls: ['https://fanyi.qq.com/api/translate'] },
+ { urls: ['https://fanyi.qq.com/api/*'] },
extraInfoSpec as any
)
}
|
fix
|
update tencent api
|
313ff16cfc3d1f584478a18b06c4e4e836899634
|
2018-06-07 11:09:37
|
CRIMX
|
feat(panel): add double click search #115
| false
|
diff --git a/src/_helpers/merge-config.ts b/src/_helpers/merge-config.ts
index c06b74703..741d2d7a6 100644
--- a/src/_helpers/merge-config.ts
+++ b/src/_helpers/merge-config.ts
@@ -27,6 +27,7 @@ function mergeHistorical (config: AppConfig, baseConfig?: AppConfig): AppConfig
mergeNumber('panelWidth')
mergeNumber('panelMaxHeightRatio')
mergeNumber('fontSize')
+ merge('panelDbSearch', val => val === '' || val === 'double' || val === 'ctrl')
mergeBoolean('pdfSniff')
mergeBoolean('searhHistory')
mergeBoolean('newWordSound')
diff --git a/src/_locales/options/messages.json b/src/_locales/options/messages.json
index ab8c82564..74aa1b406 100644
--- a/src/_locales/options/messages.json
+++ b/src/_locales/options/messages.json
@@ -109,10 +109,30 @@
"zh_CN": "默认展开",
"zh_TW": "自動展開"
},
+ "dict_panel_db_search": {
+ "en": "Double click search",
+ "zh_CN": "面板内继续查词",
+ "zh_TW": "介面内繼續查字"
+ },
+ "dict_panel_db_search_none": {
+ "en": "Disabled",
+ "zh_CN": "关闭",
+ "zh_TW": "關閉"
+ },
+ "dict_panel_db_search_double": {
+ "en": "Double Click",
+ "zh_CN": "双击",
+ "zh_TW": "雙點擊"
+ },
+ "dict_panel_db_search_ctrl": {
+ "en": "Double Click + Ctrl",
+ "zh_CN": "双击同时按 Ctrl",
+ "zh_TW": "雙點擊同時 Ctrl"
+ },
"dict_panel_description": {
- "en": "Dictionary Panel settings",
- "zh_CN": "查词面板相关设置",
- "zh_TW": "查字典介面相關設置"
+ "en": "Dictionary Panel settings. Double click search can be enabled inside dict panel. Or double click with <kbd>Ctrl</kbd> or <kbd>Command ⌘</kbd> pressed.",
+ "zh_CN": "查词面板相关设置。可设置在查词面板内继续双击查词，或者双击同时需要按住 <kbd>Ctrl</kbd> 或 <kbd>Command ⌘</kbd> 键。",
+ "zh_TW": "查字典介面相關設置。可設置在查單字介面內繼續雙點擊查字，或者雙點擊同時需要按住 <kbd>Ctrl</kbd> 或 <kbd>Command ⌘</kbd> 鍵。"
},
"dict_panel_font_size": {
"en": "Font size for search reasults",
diff --git a/src/app-config/index.ts b/src/app-config/index.ts
index 96ec569ef..fbf77356b 100644
--- a/src/app-config/index.ts
+++ b/src/app-config/index.ts
@@ -56,6 +56,14 @@ export interface AppConfigMutable {
/** panel font-size */
fontSize: number
+ /**
+ * panel double click search
+ * empty means no double click search
+ * 'double' means double click
+ * 'ctrl' means double click + ctrl/command pressed
+ */
+ panelDbSearch: '' | 'double' | 'ctrl'
+
/** sniff pdf request */
pdfSniff: boolean
@@ -164,6 +172,8 @@ export function appConfigFactory (): AppConfig {
fontSize: 13,
+ panelDbSearch: '',
+
pdfSniff: true,
searhHistory: false,
diff --git a/src/content/components/DictItem/index.tsx b/src/content/components/DictItem/index.tsx
index 9bdd9b0a4..4ee87e815 100644
--- a/src/content/components/DictItem/index.tsx
+++ b/src/content/components/DictItem/index.tsx
@@ -6,7 +6,7 @@ import { message } from '@/_helpers/browser-api'
import { MsgType, MsgOpenUrl } from '@/typings/message'
import { SearchStatus } from '@/content/redux/modules/dictionaries'
-import { SelectionInfo, getDefaultSelectionInfo } from '@/_helpers/selection'
+import { SelectionInfo, getDefaultSelectionInfo, getSelectionText, getSelectionSentence } from '@/_helpers/selection'
import { Mutable } from '@/typings/helpers'
export interface DictItemDispatchers {
@@ -19,6 +19,7 @@ export interface DictItemProps extends DictItemDispatchers {
readonly text: string
readonly dictURL: string
readonly fontSize: number
+ readonly panelDbSearch: '' | 'double' | 'ctrl'
readonly preferredHeight: number
readonly panelWidth: number
readonly searchStatus: SearchStatus
@@ -140,27 +141,54 @@ export class DictItem extends React.PureComponent<DictItemProps & { t: Translati
handleDictItemClick = (e: React.MouseEvent<HTMLElement>) => {
// use background script to open new page
- if (e.target['tagName'] === 'A') {
- e.preventDefault()
+ const $target = e.target as HTMLElement
+ if (!$target.tagName || !$target.parentElement) { return }
+ const $dictItemBody = this.bodyRef.current || null
- const $a = e.target as HTMLAnchorElement
- if ($a.dataset.target === 'external') {
- message.send<MsgOpenUrl>({
- type: MsgType.OpenURL,
- url: $a.href,
- })
- } else {
- this.props.searchText({
- info: getDefaultSelectionInfo({
- text: e.target['textContent'] || '',
- title: this.props.t('fromSaladict'),
- favicon: 'https://raw.githubusercontent.com/crimx/ext-saladict/dev/public/static/icon-16.png'
- }),
- })
+ for (let el: HTMLElement | null = $target; el && el !== $dictItemBody; el = el.parentElement) {
+ if (el.tagName === 'A') {
+ e.preventDefault()
+ e.stopPropagation()
+
+ const $a = el as HTMLAnchorElement
+ if ($a.dataset.target === 'external') {
+ message.send<MsgOpenUrl>({
+ type: MsgType.OpenURL,
+ url: $a.href,
+ })
+ } else {
+ this.props.searchText({
+ info: getDefaultSelectionInfo({
+ text: $a.textContent || '',
+ title: this.props.t('fromSaladict'),
+ favicon: 'https://raw.githubusercontent.com/crimx/ext-saladict/dev/public/static/icon-16.png'
+ }),
+ })
+ }
+ return
}
}
}
+ handleDictItemDbClick = (e: React.MouseEvent<HTMLElement>) => {
+ const { t, id, searchText, panelDbSearch } = this.props
+ if (!panelDbSearch || (panelDbSearch === 'ctrl' && !(e.ctrlKey || e.metaKey))) {
+ return
+ }
+ const win = e.currentTarget.ownerDocument.defaultView
+ const text = getSelectionText(win)
+ if (text) {
+ searchText({
+ info: getDefaultSelectionInfo({
+ text,
+ context: getSelectionSentence(win),
+ title: `${t('fromSaladict')}: ${t(`dict:${id}`)}`,
+ favicon: `https://raw.githubusercontent.com/crimx/ext-saladict/dev/src/components/dictionaries/${id}/favicon.png`
+ }),
+ })
+ }
+ }
+
handleDictURLClick = (e: React.MouseEvent<HTMLElement>) => {
e.stopPropagation()
e.preventDefault()
@@ -223,6 +251,7 @@ export class DictItem extends React.PureComponent<DictItemProps & { t: Translati
id,
dictURL,
fontSize,
+ panelDbSearch,
searchStatus,
searchResult,
} = this.props
@@ -235,7 +264,10 @@ export class DictItem extends React.PureComponent<DictItemProps & { t: Translati
} = this.state
return (
- <section className='panel-DictItem' onClick={this.handleDictItemClick}>
+ <section className='panel-DictItem'
+ onClick={this.handleDictItemClick}
+ onDoubleClick={panelDbSearch ? this.handleDictItemDbClick : undefined}
+ >
<header className='panel-DictItem_Header' onClick={this.toggleFolding}>
<img className='panel-DictItem_Logo' src={require('@/components/dictionaries/' + id + '/favicon.png')} alt='dict logo' />
<h1 className='panel-DictItem_Title'>
diff --git a/src/content/components/DictPanel/index.tsx b/src/content/components/DictPanel/index.tsx
index e4c397e10..ae8f3231e 100644
--- a/src/content/components/DictPanel/index.tsx
+++ b/src/content/components/DictPanel/index.tsx
@@ -20,6 +20,7 @@ export interface DictPanelProps extends DictPanelDispatchers {
readonly allDictsConfig: DictConfigs
readonly langCode: AppConfig['langCode']
readonly fontSize: number
+ readonly panelDbSearch: '' | 'double' | 'ctrl'
readonly panelWidth: number
readonly isAnimation: boolean
readonly selection: MsgSelection
@@ -76,6 +77,7 @@ export default class DictPanel extends React.Component<DictPanelProps> {
allDictsConfig,
panelWidth,
fontSize,
+ panelDbSearch,
isAnimation,
updateItemHeight,
@@ -127,6 +129,7 @@ export default class DictPanel extends React.Component<DictPanelProps> {
text: (dictionaries.searchHistory[0] || selection.selectionInfo).text,
dictURL,
fontSize,
+ panelDbSearch,
preferredHeight: allDictsConfig[id].preferredHeight,
panelWidth,
searchStatus: (dictsInfo[id] as any).searchStatus,
diff --git a/src/content/components/DictPanelPortal/index.tsx b/src/content/components/DictPanelPortal/index.tsx
index d8e254452..fee476a85 100644
--- a/src/content/components/DictPanelPortal/index.tsx
+++ b/src/content/components/DictPanelPortal/index.tsx
@@ -20,6 +20,7 @@ export interface DictPanelPortalProps extends DictPanelPortalDispatchers {
readonly isAnimation: boolean
readonly allDictsConfig: DictConfigs
readonly fontSize: number
+ readonly panelDbSearch: '' | 'double' | 'ctrl'
readonly langCode: AppConfig['langCode']
readonly isFav: boolean
diff --git a/src/content/containers/DictPanelContainer.tsx b/src/content/containers/DictPanelContainer.tsx
index 3ebb38e68..933ef1299 100644
--- a/src/content/containers/DictPanelContainer.tsx
+++ b/src/content/containers/DictPanelContainer.tsx
@@ -20,6 +20,7 @@ export const mapStateToProps = ({
isAnimation: config.animation,
allDictsConfig: config.dicts.all,
fontSize: config.fontSize,
+ panelDbSearch: config.panelDbSearch,
langCode: config.langCode,
selection,
diff --git a/src/options/OptDictPanel.vue b/src/options/OptDictPanel.vue
index b4e009918..b6babd023 100644
--- a/src/options/OptDictPanel.vue
+++ b/src/options/OptDictPanel.vue
@@ -4,6 +4,16 @@
<strong>{{ $t('opt:dict_panel_title') }}</strong>
</div>
<div class="opt-item__body">
+ <div class="select-box-container">
+ <label class="select-box">
+ <span class="select-label">{{ $t('opt:dict_panel_db_search') }}</span>
+ <select class="form-control" v-model="panelDbSearch">
+ <option value="">{{ $t('opt:dict_panel_db_search_none') }}</option>
+ <option value="double">{{ $t('opt:dict_panel_db_search_double') }}</option>
+ <option value="ctrl">{{ $t('opt:dict_panel_db_search_ctrl') }}</option>
+ </select>
+ </label>
+ </div>
<div class="input-group">
<div class="input-group-addon">{{ $t('opt:dict_panel_height_ratio') }}</div>
<input type="number" step="1" min="10" max="90" class="form-control"
@@ -41,6 +51,7 @@ export default {
panelWidth: 'config.panelWidth',
panelMaxHeightRatio: 'config.panelMaxHeightRatio',
fontSize: 'config.fontSize',
+ panelDbSearch: 'config.panelDbSearch',
searchText: 'searchText',
},
watch: {
|
feat
|
add double click search #115
|
291e306759fb9f11748ffe4e71e27355a2224c6c
|
2019-08-30 20:55:25
|
crimx
|
perf(panel): depend on max-height instead of height
| false
|
diff --git a/src/content/components/DictPanel/DictPanel.tsx b/src/content/components/DictPanel/DictPanel.tsx
index beaa24013..56ec49fe0 100644
--- a/src/content/components/DictPanel/DictPanel.tsx
+++ b/src/content/components/DictPanel/DictPanel.tsx
@@ -58,7 +58,8 @@ export const DictPanel: FC<DictPanelProps> = props => {
'--panel-background-color': '#fff',
'--panel-color': '#333',
'--panel-width': props.width + 'px',
- '--panel-height': height + 'px'
+ '--panel-height': height + 'px',
+ '--panel-max-height': props.maxHeight + 'px'
}}
>
<ReactResizeDetector handleHeight onResize={updateHeightRef.current} />
diff --git a/src/content/components/MenuBar/FloatBox.scss b/src/content/components/MenuBar/FloatBox.scss
index abf6c5f6b..dc94e92ad 100644
--- a/src/content/components/MenuBar/FloatBox.scss
+++ b/src/content/components/MenuBar/FloatBox.scss
@@ -23,7 +23,7 @@
}
.menuBar-FloatBox {
- max-height: calc(var(--panel-height) * 0.75);
+ max-height: calc(var(--panel-max-height) * 0.75);
overflow: hidden;
}
diff --git a/src/content/components/MenuBar/MenuBar.tsx b/src/content/components/MenuBar/MenuBar.tsx
index a9111acaa..92ff07a20 100644
--- a/src/content/components/MenuBar/MenuBar.tsx
+++ b/src/content/components/MenuBar/MenuBar.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useRef, useCallback } from 'react'
+import React, { FC } from 'react'
import { Word } from '@/_helpers/record-manager'
import { useTranslate } from '@/_helpers/i18n'
import {
@@ -12,6 +12,13 @@ import {
import { SearchBox, SearchBoxProps } from './SearchBox'
import { Profiles, ProfilesProps } from './Profiles'
import { message } from '@/_helpers/browser-api'
+import {
+ useObservableCallback,
+ useObservable,
+ useSubscription
+} from 'observable-hooks'
+import { Observable, combineLatest } from 'rxjs'
+import { startWith, debounceTime, map } from 'rxjs/operators'
const ProfilesMemo = React.memo(Profiles)
@@ -52,27 +59,27 @@ export interface MenuBarProps {
export const MenuBar: FC<MenuBarProps> = props => {
const { t } = useTranslate(['content', 'common'])
- const profileHeightRef = useRef(0)
- const searchBoxHeightRef = useRef(0)
+ const [updateProfileHeight, profileHeight$] = useObservableCallback<number>(
+ heightChangeTransform
+ )
- const onProfileHeightChanged = useCallback(
- (height: number) => {
- profileHeightRef.current = height === 0 ? 30 : height + 42 + 30
- props.onHeightChanged(
- Math.max(searchBoxHeightRef.current, profileHeightRef.current)
- )
- },
- [props.onHeightChanged]
+ const [updateSBHeight, searchBoxHeight$] = useObservableCallback<number>(
+ heightChangeTransform
)
- const onSearchBoxHeightChanged = useCallback(
- (height: number) => {
- searchBoxHeightRef.current = height === 0 ? 30 : height + 42 + 30
- props.onHeightChanged(
- Math.max(searchBoxHeightRef.current, profileHeightRef.current)
+ // update panel min height
+ useSubscription(
+ useObservable(() =>
+ combineLatest(profileHeight$, searchBoxHeight$).pipe(
+ // a little delay for organic feeling
+ debounceTime(100),
+ map(heights => {
+ const max = Math.max(...heights)
+ return max > 0 ? max + 72 : 0
+ })
)
- },
- [props.onHeightChanged]
+ ),
+ props.onHeightChanged
)
return (
@@ -94,7 +101,7 @@ export const MenuBar: FC<MenuBarProps> = props => {
enableSuggest={props.enableSuggest}
onInput={props.updateText}
onSearch={props.searchText}
- onHeightChanged={onSearchBoxHeightChanged}
+ onHeightChanged={updateSBHeight}
/>
<div
className={`menuBar-DragArea${isStandalonePage ? '' : ' isActive'}`}
@@ -105,7 +112,7 @@ export const MenuBar: FC<MenuBarProps> = props => {
t={t}
profiles={props.profiles}
activeProfileId={props.activeProfileId}
- onHeightChanged={onProfileHeightChanged}
+ onHeightChanged={updateProfileHeight}
/>
<FavBtn t={t} isFav={props.isInNotebook} onClick={props.addToNoteBook} />
<HistoryBtn
@@ -122,3 +129,9 @@ export const MenuBar: FC<MenuBarProps> = props => {
</header>
)
}
+
+function heightChangeTransform(
+ height$: Observable<number>
+): Observable<number> {
+ return startWith<number>(0)(height$)
+}
diff --git a/src/typings/css.d.ts b/src/typings/css.d.ts
index f4e0ff609..83f76aae8 100644
--- a/src/typings/css.d.ts
+++ b/src/typings/css.d.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line
import * as CSS from 'csstype'
declare module 'csstype' {
@@ -6,5 +7,6 @@ declare module 'csstype' {
'--panel-background-color'?: string
'--panel-width'?: string
'--panel-height'?: string
+ '--panel-max-height'?: string
}
}
|
perf
|
depend on max-height instead of height
|
97d70945d9431e23f0f5e969675f28996759593e
|
2018-04-28 17:36:57
|
CRIMX
|
feat(locale): add back and next
| false
|
diff --git a/src/_locales/content/index.json b/src/_locales/content/index.json
index 961859b4b..26553d177 100644
--- a/src/_locales/content/index.json
+++ b/src/_locales/content/index.json
@@ -1,4 +1,14 @@
{
+ "tipSearchHistoryBack": {
+ "zh_CN": "上一个查词记录",
+ "zh_TW": "上一個查單字記錄",
+ "en": "Previous search history"
+ },
+ "tipSearchHistoryNext": {
+ "zh_CN": "下一个查词记录",
+ "zh_TW": "下一個查單字記錄",
+ "en": "Next search history"
+ },
"tipSearchText": {
"zh_CN": "查单词",
"zh_TW": "查單字",
|
feat
|
add back and next
|
beeea1d3640c7bebc0623b4cf3f709466cd08ad0
|
2018-10-17 08:19:30
|
CRIMX
|
refactor(options): update holding mode switch
| false
|
diff --git a/src/options/OptMode.vue b/src/options/OptMode.vue
index 8e85e1be9..d59e38d81 100644
--- a/src/options/OptMode.vue
+++ b/src/options/OptMode.vue
@@ -72,5 +72,13 @@ export default {
holding: holding.shift || holding.ctrl || holding.meta
}
},
+ watch: {
+ holding (val) {
+ const { holding } = this.$store.config.mode
+ holding.shift = val
+ holding.ctrl = val
+ holding.meta = val
+ }
+ },
}
</script>
diff --git a/src/options/OptPanelMode.vue b/src/options/OptPanelMode.vue
index b0a199115..bde27d299 100644
--- a/src/options/OptPanelMode.vue
+++ b/src/options/OptPanelMode.vue
@@ -69,5 +69,13 @@ export default {
holding: holding.shift || holding.ctrl || holding.meta
}
},
+ watch: {
+ holding (val) {
+ const { holding } = this.$store.config.panelMode
+ holding.shift = val
+ holding.ctrl = val
+ holding.meta = val
+ }
+ },
}
</script>
diff --git a/src/options/OptPinMode.vue b/src/options/OptPinMode.vue
index adfec1879..b86faff47 100644
--- a/src/options/OptPinMode.vue
+++ b/src/options/OptPinMode.vue
@@ -69,5 +69,13 @@ export default {
holding: holding.shift || holding.ctrl || holding.meta
}
},
+ watch: {
+ holding (val) {
+ const { holding } = this.$store.config.pinMode
+ holding.shift = val
+ holding.ctrl = val
+ holding.meta = val
+ }
+ },
}
</script>
diff --git a/src/options/OptTripleCtrl.vue b/src/options/OptTripleCtrl.vue
index b82beeabc..19b301adb 100644
--- a/src/options/OptTripleCtrl.vue
+++ b/src/options/OptTripleCtrl.vue
@@ -115,5 +115,13 @@ export default {
holding: holding.shift || holding.ctrl || holding.meta
}
},
+ watch: {
+ holding (val) {
+ const { holding } = this.$store.config.qsPanelMode
+ holding.shift = val
+ holding.ctrl = val
+ holding.meta = val
+ }
+ },
}
</script>
|
refactor
|
update holding mode switch
|
4b96472d6b59b69950390367a538804c25d1e8e7
|
2018-09-13 14:17:54
|
CRIMX
|
fix(panel): fix profile panel shows on hover
| false
|
diff --git a/src/content/components/MenuBar/index.tsx b/src/content/components/MenuBar/index.tsx
index 9332eeb35..558038f9a 100644
--- a/src/content/components/MenuBar/index.tsx
+++ b/src/content/components/MenuBar/index.tsx
@@ -347,8 +347,8 @@ export default class MenuBar extends React.PureComponent<MenuBarProps, MenuBarSt
<button className='panel-MenuBar_Btn'
onClick={this.handleIconSettingsClick}
onKeyUp={this.handleIconSettingsKeyUp}
- onMouseEnter={this.showProfilePanel}
- onMouseLeave={this.hideProfilePanel}
+ onMouseOver={this.showProfilePanel}
+ onMouseOut={this.hideProfilePanel}
disabled={isSaladictOptionsPage}
>
<svg
|
fix
|
fix profile panel shows on hover
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.