Skip to content

Commit cb56626

Browse files
keillerakeillera
authored
Merge pull request #1173 from AlisProject/upd_nuxt
Update nuxt.
2 parents eb5e312 + 84fd9a2 commit cb56626

File tree

6 files changed

+4902
-3669
lines changed

6 files changed

+4902
-3669
lines changed

‎app/components/organisms/ArticleTopicRecommendedCardList.vue‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,33 +57,33 @@ export default {
5757
grid-auto-rows: min-content;
5858
grid-template-columns: min-content min-content;
5959
}
60-
/deep/ a.recommended-article-card {
60+
:deep(a.recommended-article-card) {
6161
width: 312px;
6262
}
6363
a.recommended-article-card {
64-
/deep/ .eye-catch-image-box {
64+
:deep(.eye-catch-image-box) {
6565
width: 268px;
6666
}
67-
/deep/ .title {
67+
:deep(.title) {
6868
width: 268px;
6969
}
70-
/deep/ .username {
70+
:deep(.username) {
7171
width: 162px;
7272
}
7373
}
7474
7575
@media screen and (max-width: 640px) {
76-
/deep/ a.recommended-article-card {
76+
:deep(a.recommended-article-card) {
7777
width: 340px;
7878
}
7979
a.recommended-article-card {
80-
/deep/ .eye-catch-image-box {
80+
:deep(.eye-catch-image-box) {
8181
width: 296px;
8282
}
83-
/deep/ .title {
83+
:deep(.title) {
8484
width: 296px;
8585
}
86-
/deep/ .username {
86+
:deep(.username) {
8787
width: 168px;
8888
}
8989
}
@@ -103,17 +103,17 @@ a.recommended-article-card {
103103
.area-article-topic-recommended-title {
104104
margin-left: calc(50% - 150px);
105105
}
106-
/deep/ a.recommended-article-card {
106+
:deep(a.recommended-article-card) {
107107
width: 300px;
108108
}
109109
a.recommended-article-card {
110-
/deep/ .eye-catch-image-box {
110+
:deep(.eye-catch-image-box) {
111111
width: 256px;
112112
}
113-
/deep/ .title {
113+
:deep(.title) {
114114
width: 256px;
115115
}
116-
/deep/ .username {
116+
:deep(.username) {
117117
width: 150px;
118118
}
119119
}

‎app/components/pages/ArticleDetailV1.vue‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -229,24 +229,24 @@ header.area-app-header {
229229
width: 100%;
230230
position: fixed;
231231
transition: 0.5s;
232-
/deep/ a.logo-link {
232+
:deep(a.logo-link) {
233233
position: absolute;
234234
left: calc(50% - 540px);
235235
}
236-
/deep/ .session-items {
236+
:deep(.session-items) {
237237
position: absolute;
238238
left: calc(50% + 277px);
239239
}
240-
/deep/ .menu {
240+
:deep(.menu) {
241241
right: auto;
242242
left: -100px;
243243
}
244-
&.is-logged-in /deep/ .session-items {
244+
&.is-logged-in :deep(.session-items) {
245245
left: calc(50% + 366px);
246246
}
247247
&.is-scroll {
248248
transform: translateY(-100%);
249-
/deep/ .modal {
249+
:deep(.modal) {
250250
&-mask {
251251
top: 100px;
252252
}
@@ -332,33 +332,33 @@ header.area-app-header {
332332
grid-template-rows: 100px minmax(0, 1fr) min-content min-content min-content 75px;
333333
}
334334
header.area-app-header {
335-
/deep/ a.logo-link {
335+
:deep(a.logo-link) {
336336
position: absolute;
337337
left: 34px;
338338
}
339-
/deep/ .session-items {
339+
:deep(.session-items) {
340340
position: absolute;
341341
left: auto;
342342
right: 34px;
343343
}
344-
&.is-logged-in /deep/ .session-items {
344+
&.is-logged-in :deep(.session-items) {
345345
left: auto;
346346
}
347347
}
348348
}
349349
350350
@media screen and (max-width: 920px) {
351351
header.area-app-header {
352-
/deep/ a.logo-link {
352+
:deep(a.logo-link) {
353353
position: absolute;
354354
left: 12px;
355355
}
356-
/deep/ .session-items {
356+
:deep(.session-items) {
357357
position: absolute;
358358
left: auto;
359359
right: 12px;
360360
}
361-
/deep/ .menu {
361+
:deep(.menu) {
362362
right: 0;
363363
left: auto;
364364
}
@@ -382,7 +382,7 @@ header.area-app-header {
382382
header.area-app-header {
383383
height: 66px;
384384
&.is-scroll {
385-
/deep/ .modal {
385+
:deep(.modal) {
386386
&-mask {
387387
top: 66px;
388388
}

‎app/components/pages/ArticleDetailV2.vue‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -270,24 +270,24 @@ header.area-app-header {
270270
width: 100%;
271271
position: fixed;
272272
transition: 0.5s;
273-
/deep/ a.logo-link {
273+
:deep(a.logo-link) {
274274
position: absolute;
275275
left: calc(50% - 540px);
276276
}
277-
/deep/ .session-items {
277+
:deep(.session-items) {
278278
position: absolute;
279279
left: calc(50% + 277px);
280280
}
281-
/deep/ .menu {
281+
:deep(.menu) {
282282
right: auto;
283283
left: -100px;
284284
}
285-
&.is-logged-in /deep/ .session-items {
285+
&.is-logged-in :deep(.session-items) {
286286
left: calc(50% + 366px);
287287
}
288288
&.is-scroll {
289289
transform: translateY(-100%);
290-
/deep/ .modal {
290+
:deep(.modal) {
291291
&-mask {
292292
top: 100px;
293293
}
@@ -391,33 +391,33 @@ header.area-app-header {
391391
grid-template-rows: 100px minmax(0, 1fr) min-content min-content min-content 75px;
392392
}
393393
header.area-app-header {
394-
/deep/ a.logo-link {
394+
:deep(a.logo-link) {
395395
position: absolute;
396396
left: 34px;
397397
}
398-
/deep/ .session-items {
398+
:deep(.session-items) {
399399
position: absolute;
400400
left: auto;
401401
right: 34px;
402402
}
403-
&.is-logged-in /deep/ .session-items {
403+
&.is-logged-in :deep(.session-items) {
404404
left: auto;
405405
}
406406
}
407407
}
408408
409409
@media screen and (max-width: 920px) {
410410
header.area-app-header {
411-
/deep/ a.logo-link {
411+
:deep(a.logo-link) {
412412
position: absolute;
413413
left: 12px;
414414
}
415-
/deep/ .session-items {
415+
:deep(.session-items) {
416416
position: absolute;
417417
left: auto;
418418
right: 12px;
419419
}
420-
/deep/ .menu {
420+
:deep(.menu) {
421421
right: 0;
422422
left: auto;
423423
}
@@ -441,7 +441,7 @@ header.area-app-header {
441441
header.area-app-header {
442442
height: 66px;
443443
&.is-scroll {
444-
/deep/ .modal {
444+
:deep(.modal) {
445445
&-mask {
446446
top: 66px;
447447
}

‎app/utils/article.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* global iframely */
2-
import { XmlEntities } from 'html-entities'
2+
import { decodeEntity } from 'html-entities'
33
import { BigNumber } from 'bignumber.js'
44
import axios from './axios'
55

@@ -272,8 +272,7 @@ export function preventDropImageOnOGPContent() {
272272
}
273273

274274
export function htmlDecode(text) {
275-
const entities = new XmlEntities()
276-
return entities.decode(text)
275+
return decodeEntity(text, { level: 'xml' })
277276
}
278277

279278
export function isYouTubeVideoURL(url) {

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"aws-serverless-express": "^3.3.5",
3737
"bignumber.js": "^8.1.1",
3838
"blueimp-load-image": "^2.26.0",
39-
"cheerio": "^1.0.0-rc.3",
39+
"cheerio": "1.0.0-rc.10",
4040
"crypto-js": "^4.0.0",
4141
"dayjs": "^1.8.9",
4242
"ethereumjs-common": "^1.5.0",
@@ -48,7 +48,7 @@
4848
"medium-editor": "^5.23.3",
4949
"node-fetch": "^2.6.7",
5050
"normalize.css": "^8.0.1",
51-
"nuxt": "^2.14.6",
51+
"nuxt": "^2.15.8",
5252
"nuxt-dropzone": "^1.0.4",
5353
"sass-loader": "^10.2.0",
5454
"serverless-plugin-aws-alerts": "^1.2.4",

0 commit comments

Comments
 (0)