diff --git a/css/At.css b/css/At.css deleted file mode 100644 index 33577071ef7..00000000000 --- a/css/At.css +++ /dev/null @@ -1,147 +0,0 @@ -/* Copied from vue-at (https://github.com/fritx/vue-at/blob/d16d5eefdae8987c0bffe2d9c3867b7da12c808f/src/At.scss) - * and wrapped to affect only the panel for candidate mentions. */ - -/* atwho.css https://github.com/ichord/At.js */ -.talk.candidate-mentions .atwho-view { - /* position:absolute; */ - /* top: 0; */ - /* left: 0; */ - /* display: none; */ - /* margin-top: 18px; */ - /* background: white; */ - /* color: black; */ - /* border: 1px solid #DDD; */ - /* border-radius: 3px; */ - /* box-shadow: 0 0 5px rgba(0,0,0,0.1); */ - /* min-width: 120px; */ - z-index: 11110 !important; - - /* added 1 */ - /* font-size: 14px; */ - /* min-width: 140px; */ - /* max-width: 180px; */ - border-radius: 6px; - /* overflow: hidden; */ - /* box-shadow: 0 0 10px 0 rgba(101, 111, 122, .5); */ - position: absolute; - bottom: 0; - left: -0.8em; /* 抵消左边距 */ - cursor: default; - /* background-color: rgba(255,255,255,.94); */ - /* min-width: 140px; */ - /* max-width: 180px; */ - /* max-height: 200px; */ - overflow-y: auto; - - /* Override "max-width: 180px", as that makes the autocompletion panel too - * narrow. */ - max-width: 300px; - min-width: 250px; - /* mention height: 48 * visible mentions: 4.5 */ - max-height: 216px; - - /* Override all colors with our theming and dark mode */ - background: var(--color-main-background); - color: var(--color-main-text); - box-shadow: 0 0 5px var(--color-box-shadow); - - /* Override conflicting rules from the comments tab. */ - top: unset; - display: unset; -} - -.talk.candidate-mentions .atwho-ul { - /* width: 100px; */ - list-style:none; - /* padding:0; */ - /* margin:auto; */ - /* max-height: 200px; */ - /* overflow-y: auto; */ - /* max-height: 135px; */ - padding: 0; - margin: 0; - - /* Override max height to show 4.5 mentions to make clear you can scroll for more options */ - /* (padding top: 4 + avatar height: 48 + padding bottom: 4) * visible mentions: 4.5 */ - max-height: unset; -} - -.talk.candidate-mentions .atwho-li { - /* display: block; */ - /* padding: 5px 10px; */ - /* border-bottom: 1px solid #DDD; */ - /* cursor: pointer; */ - /* border-top: 1px solid #C8C8C8; */ - box-sizing: border-box; - /* height: 27px; */ - /* padding: 0 12px; */ - white-space: nowrap; - display: flex; - align-items: center; - - /* Override autocompletion panel items height, as they are too short - * for the avatars and also need some padding. */ - height: 64px; - padding: 4px 12px; -} - -.talk.candidate-mentions .atwho-li span { - overflow: hidden; - text-overflow: ellipsis; -} - -.talk.candidate-mentions .atwho-cur { - /* background: #44a8f2; */ - background: #5BB8FF; - color: white; -} - -/* added 2 */ -.talk.candidate-mentions .atwho-wrap { - position: relative; -} - -.talk.candidate-mentions.atwho-panel { - position: absolute; -} - -.talk.candidate-mentions .atwho-inner { - position: relative; -} - -.talk.candidate-mentions .atwho-view::-webkit-scrollbar { - width: 11px; - height: 11px; -} - -.talk.candidate-mentions .atwho-view::-webkit-scrollbar-track { - /* background-color: rgba(127, 127, 127, .1); */ - /* background-color: #F5F5F5; */ - background-color: var(--color-background-dark); -} - -.talk.candidate-mentions .atwho-view::-webkit-scrollbar-thumb { - min-height: 36px; - border: 2px solid transparent; - border-top: 3px solid transparent; - border-bottom: 3px solid transparent; - background-clip: padding-box; - border-radius: 7px; - /* background-color: rgba(0, 0, 0, 0.2); */ - /* background-color: #C4C4C4; */ - background-color: var(--color-background-darker); -} - - -/* Although the height of its wrapper is 32px the height of the icon - * is the default 16px. This is a temporary fix until it is fixed - * in the avatar component. */ -.talk.candidate-mentions .atwho-li .icon-group-forced-white { - width: 44px; - height: 44px; -} - -.talk.candidate-mentions .atwho-view .atwho-cur { - background: var(--color-primary-light); - color: var(--color-main-text); -} diff --git a/css/icons.css b/css/icons.css index 64cf1b8e84d..68cc2cb1a96 100644 --- a/css/icons.css +++ b/css/icons.css @@ -67,14 +67,18 @@ background-image: url(../img/changelog.svg); } -/* The atwho panel is a direct child of the body, so it is not affected by +/* The tribute panel is a direct child of the body, so it is not affected by * .app-Talk rules above. * "forced-white" needs to be included in the class name as the Avatar does * not accept several classes. */ -.talk.candidate-mentions.atwho-panel .icon-group-forced-white { +.tribute-container .icon-group-forced-white { background-image: url(../img/icon-contacts-white.svg); } +.tribute-container .icon-user-forced-white { + background-image: url(../img/icon-user-white.svg) +} + /* Needed to use white color also in dark mode. */ .app-files .app-sidebar__close.forced-white { color: #ffffff; diff --git a/package-lock.json b/package-lock.json index 977ff82fe28..73c75f8a71d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,6 @@ "url-parse": "^1.5.10", "util": "^0.12.5", "vue": "^2.7.14", - "vue-at": "^2.5.1", "vue-frag": "^1.4.2", "vue-material-design-icons": "^5.2.0", "vue-observe-visibility": "^1.0.0", @@ -18538,17 +18537,6 @@ "csstype": "^3.1.0" } }, - "node_modules/vue-at": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/vue-at/-/vue-at-2.5.1.tgz", - "integrity": "sha512-c17Rn8vVTXp/rvWV76jNB2PVx534eqIAP5/Tv1twCt0ebtRPIgNaJJwSaoRVISQ6vM6m3+owmtpAG1qr5g9fyQ==", - "engines": { - "node": ">= 14.x" - }, - "peerDependencies": { - "vue": "2.x" - } - }, "node_modules/vue-color": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/vue-color/-/vue-color-2.8.1.tgz", @@ -34167,12 +34155,6 @@ "csstype": "^3.1.0" } }, - "vue-at": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/vue-at/-/vue-at-2.5.1.tgz", - "integrity": "sha512-c17Rn8vVTXp/rvWV76jNB2PVx534eqIAP5/Tv1twCt0ebtRPIgNaJJwSaoRVISQ6vM6m3+owmtpAG1qr5g9fyQ==", - "requires": {} - }, "vue-color": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/vue-color/-/vue-color-2.8.1.tgz", diff --git a/package.json b/package.json index 29e83834b1d..8ddef696e22 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,6 @@ "url-parse": "^1.5.10", "util": "^0.12.5", "vue": "^2.7.14", - "vue-at": "^2.5.1", "vue-frag": "^1.4.2", "vue-material-design-icons": "^5.2.0", "vue-observe-visibility": "^1.0.0", diff --git a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue deleted file mode 100644 index 18a0cf2b10f..00000000000 --- a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue +++ /dev/null @@ -1,482 +0,0 @@ - - - - - - - - {{ getFirstLetterOfGuestName(scope.item.label) }} - - - - - - {{ scope.item.label }} - - {{ getStatusMessage(scope.item) }} - - - - - - - - - - - - - - - - - diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue index 32b0d67f45c..8d4293cbddc 100644 --- a/src/components/NewMessageForm/NewMessageForm.vue +++ b/src/components/NewMessageForm/NewMessageForm.vue @@ -113,15 +113,19 @@ :parent-id="messageToBeReplied.id" v-bind="messageToBeReplied" /> - + @shortkey="focusInput" + @keydown.esc.prevent="blurInput" + @paste="handlePastedFiles" + @submit="handleSubmit({ silent: false })" />