From 65b6e23c00f09f3627e29987302cd16c9e069da2 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 28 Jul 2020 01:27:11 +0300 Subject: [PATCH] refactor status --- package.json | 7 +- .../chat_list_item/chat_list_item.scss | 2 +- src/components/conversation/conversation.vue | 33 +- .../notifications/notifications.scss | 15 +- src/components/status/status.scss | 639 ++++---- src/components/status/status.vue | 48 +- .../status_content/status_content.vue | 13 +- .../status_popover/status_popover.vue | 3 +- src/components/timeline/timeline.vue | 2 +- .../user_reporting_modal.vue | 3 +- yarn.lock | 1437 ++++++++++++++++- 11 files changed, 1786 insertions(+), 416 deletions(-) diff --git a/package.json b/package.json index 9623117192..e289729c59 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,8 @@ "cropperjs": "^1.4.3", "diff": "^3.0.1", "escape-html": "^1.0.3", - "parse-link-header": "^1.0.1", "localforage": "^1.5.0", + "parse-link-header": "^1.0.1", "phoenix": "^1.3.0", "portal-vue": "^2.1.4", "v-click-outside": "^2.1.1", @@ -36,7 +36,6 @@ "vuex": "^3.0.1" }, "devDependencies": { - "karma-mocha-reporter": "^2.2.1", "@babel/core": "^7.7.5", "@babel/plugin-transform-runtime": "^7.7.6", "@babel/preset-env": "^7.7.6", @@ -80,6 +79,7 @@ "karma-coverage": "^1.1.1", "karma-firefox-launcher": "^1.1.0", "karma-mocha": "^1.2.0", + "karma-mocha-reporter": "^2.2.1", "karma-sinon-chai": "^2.0.2", "karma-sourcemap-loader": "^0.3.7", "karma-spec-reporter": "0.0.26", @@ -101,6 +101,9 @@ "shelljs": "^0.7.4", "sinon": "^2.1.0", "sinon-chai": "^2.8.0", + "stylelint": "^13.6.1", + "stylelint-config-standard": "^20.0.0", + "stylelint-rscss": "^0.4.0", "url-loader": "^1.1.2", "vue-loader": "^14.0.0", "vue-style-loader": "^4.0.0", diff --git a/src/components/chat_list_item/chat_list_item.scss b/src/components/chat_list_item/chat_list_item.scss index 617054ecc6..10ba45f26c 100644 --- a/src/components/chat_list_item/chat_list_item.scss +++ b/src/components/chat_list_item/chat_list_item.scss @@ -77,7 +77,7 @@ border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius); } - .status-body { + .StatusContent { img.emoji { width: 1.4em; height: 1.4em; diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 2e48240aa1..7e2c6a9db8 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -1,7 +1,7 @@