diff --git a/changelog.d/emoji-upload.-zip.add b/changelog.d/emoji-upload.-zip.add deleted file mode 100644 index 798720eef..000000000 --- a/changelog.d/emoji-upload.-zip.add +++ /dev/null @@ -1 +0,0 @@ -Added a way to upload new packs from a URL or ZIP file via the admin-fe diff --git a/changelog.d/weight-loss.change b/changelog.d/weight-loss.change deleted file mode 100644 index 8c1322bf9..000000000 --- a/changelog.d/weight-loss.change +++ /dev/null @@ -1 +0,0 @@ -Reduced time taken processing theme by half diff --git a/package.json b/package.json index 62164fe61..eea94a10e 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "lint-fix": "eslint --fix src test/unit/specs test/e2e/specs" }, "dependencies": { - "@babel/runtime": "7.28.2", + "@babel/runtime": "7.27.1", "@chenfengyuan/vue-qrcode": "2.0.0", "@fortawesome/fontawesome-svg-core": "6.7.2", "@fortawesome/free-regular-svg-icons": "6.7.2", @@ -54,10 +54,10 @@ "vuex": "4.1.0" }, "devDependencies": { - "@babel/core": "7.28.0", - "@babel/eslint-parser": "7.28.0", - "@babel/plugin-transform-runtime": "7.28.0", - "@babel/preset-env": "7.28.0", + "@babel/core": "7.27.1", + "@babel/eslint-parser": "7.27.1", + "@babel/plugin-transform-runtime": "7.27.1", + "@babel/preset-env": "7.27.2", "@babel/register": "7.27.1", "@ungap/event-target": "0.2.4", "@vitejs/plugin-vue": "^5.2.1", @@ -70,13 +70,13 @@ "@vue/test-utils": "2.4.6", "autoprefixer": "10.4.21", "babel-plugin-lodash": "3.3.4", - "chai": "5.2.1", + "chai": "5.2.0", "chalk": "5.4.1", "chromedriver": "135.0.4", "connect-history-api-fallback": "2.0.0", "cross-spawn": "7.0.6", "custom-event-polyfill": "1.0.7", - "eslint": "9.33.0", + "eslint": "9.26.0", "vue-eslint-parser": "10.1.3", "eslint-config-standard": "17.1.0", "eslint-formatter-friendly": "7.0.0", @@ -91,9 +91,9 @@ "iso-639-1": "3.1.5", "lodash": "4.17.21", "msw": "2.10.2", - "nightwatch": "3.12.2", + "nightwatch": "3.12.1", "playwright": "1.52.0", - "postcss": "8.5.6", + "postcss": "8.5.3", "postcss-html": "^1.5.0", "postcss-scss": "^4.0.6", "sass": "1.89.2", diff --git a/src/components/attachment/attachment.style.js b/src/components/attachment/attachment.style.js new file mode 100644 index 000000000..a9455e367 --- /dev/null +++ b/src/components/attachment/attachment.style.js @@ -0,0 +1,27 @@ +export default { + name: 'Attachment', + selector: '.Attachment', + notEditable: true, + validInnerComponents: [ + 'Border', + 'Button', + 'Input' + ], + defaultRules: [ + { + directives: { + roundness: 3 + } + }, + { + component: 'Button', + parent: { + component: 'Attachment' + }, + directives: { + background: '#FFFFFF', + opacity: 0.5 + } + } + ] +} diff --git a/src/components/chat_message/chat_message.style.js b/src/components/chat_message/chat_message.style.js index 76b565823..9b57ad371 100644 --- a/src/components/chat_message/chat_message.style.js +++ b/src/components/chat_message/chat_message.style.js @@ -8,6 +8,9 @@ export default { 'Text', 'Icon', 'Border', + 'Button', + 'RichContent', + 'Attachment', 'PollGraph' ], defaultRules: [ diff --git a/src/components/list/list_item.style.js b/src/components/list/list_item.style.js new file mode 100644 index 000000000..49b2b035f --- /dev/null +++ b/src/components/list/list_item.style.js @@ -0,0 +1,48 @@ +export default { + name: 'ListItem', + selector: '.list-item', + states: { + active: '.-active', + hover: ':is(:hover, :focus-visible, :has(:focus-visible)):not(.-non-interactive)' + }, + validInnerComponents: [ + 'Text', + 'Link', + 'Icon', + 'Border', + 'Button', + 'ButtonUnstyled', + 'RichContent', + 'Input', + 'Avatar' + ], + defaultRules: [ + { + directives: { + background: '--bg', + opacity: 0 + } + }, + { + state: ['active'], + directives: { + background: '--inheritedBackground, 10', + opacity: 1 + } + }, + { + state: ['hover'], + directives: { + background: '--inheritedBackground, 10', + opacity: 1 + } + }, + { + state: ['hover', 'active'], + directives: { + background: '--inheritedBackground, 20', + opacity: 1 + } + } + ] +} diff --git a/src/components/menu_item.style.js b/src/components/menu_item.style.js index 859932062..883355efa 100644 --- a/src/components/menu_item.style.js +++ b/src/components/menu_item.style.js @@ -4,7 +4,11 @@ export default { validInnerComponents: [ 'Text', 'Icon', - 'Border' + 'Input', + 'Border', + 'ButtonUnstyled', + 'Badge', + 'Avatar' ], states: { hover: ':is(:hover, :focus-visible, :has(:focus-visible)):not(.disabled)', diff --git a/src/components/mobile_drawer.style.js b/src/components/mobile_drawer.style.js index 0f2cf4e59..398bc186e 100644 --- a/src/components/mobile_drawer.style.js +++ b/src/components/mobile_drawer.style.js @@ -2,7 +2,18 @@ export default { name: 'MobileDrawer', selector: '.mobile-drawer', validInnerComponents: [ - 'MenuItem' + 'Text', + 'Link', + 'Icon', + 'Border', + 'Button', + 'ButtonUnstyled', + 'Input', + 'PanelHeader', + 'MenuItem', + 'Notification', + 'Alert', + 'UserCard' ], defaultRules: [ { @@ -10,6 +21,21 @@ export default { background: '--bg', backgroundNoCssColor: 'yes' } + }, + { + component: 'PanelHeader', + parent: { component: 'MobileDrawer' }, + directives: { + background: '--fg', + shadow: [{ + x: 0, + y: 0, + blur: 4, + spread: 0, + color: '#000000', + alpha: 0.6 + }] + } } ] } diff --git a/src/components/notification/notification.style.js b/src/components/notification/notification.style.js index 05c1f6f23..c6d317d1c 100644 --- a/src/components/notification/notification.style.js +++ b/src/components/notification/notification.style.js @@ -6,7 +6,12 @@ export default { 'Link', 'Icon', 'Border', + 'Button', + 'ButtonUnstyled', + 'RichContent', + 'Input', 'Avatar', + 'Attachment', 'PollGraph' ], defaultRules: [] diff --git a/src/components/panel.style.js b/src/components/panel.style.js index 2c8956ae1..a017a52bc 100644 --- a/src/components/panel.style.js +++ b/src/components/panel.style.js @@ -6,17 +6,29 @@ export default { 'Link', 'Icon', 'Border', + 'Button', + 'ButtonUnstyled', + 'Input', 'PanelHeader', + 'MenuItem', 'Post', 'Notification', - 'MenuItem' + 'Alert', + 'UserCard', + 'Chat', + 'Attachment', + 'Tab', + 'ListItem' ], validInnerComponentsLite: [ 'Text', 'Link', 'Icon', 'Border', - 'PanelHeader' + 'Button', + 'Input', + 'PanelHeader', + 'Alert' ], defaultRules: [ { diff --git a/src/components/panel_header.style.js b/src/components/panel_header.style.js index 4e5f97760..226ff9e16 100644 --- a/src/components/panel_header.style.js +++ b/src/components/panel_header.style.js @@ -7,7 +7,9 @@ export default { 'Icon', 'Button', 'ButtonUnstyled', - 'Alert' + 'Badge', + 'Alert', + 'Avatar' ], defaultRules: [ { diff --git a/src/components/popover.style.js b/src/components/popover.style.js index 455b5f5e0..0197271b9 100644 --- a/src/components/popover.style.js +++ b/src/components/popover.style.js @@ -6,7 +6,16 @@ export default { modal: '.modal' }, validInnerComponents: [ - 'MenuItem' + 'Text', + 'Link', + 'Icon', + 'Border', + 'Button', + 'ButtonUnstyled', + 'Input', + 'MenuItem', + 'Post', + 'UserCard' ], defaultRules: [ { diff --git a/src/components/rich_content/rich_content.scss b/src/components/rich_content/rich_content.scss index 6b70d1356..140be2f98 100644 --- a/src/components/rich_content/rich_content.scss +++ b/src/components/rich_content/rich_content.scss @@ -2,7 +2,6 @@ font-family: var(--font); &.-faint { - color: var(--text); /* stylelint-disable declaration-no-important */ --text: var(--textFaint) !important; --link: var(--linkFaint) !important; diff --git a/src/components/rich_content/rich_content.style.js b/src/components/rich_content/rich_content.style.js new file mode 100644 index 000000000..eaba9c4b1 --- /dev/null +++ b/src/components/rich_content/rich_content.style.js @@ -0,0 +1,20 @@ +export default { + name: 'RichContent', + selector: '.RichContent', + notEditable: true, + transparent: true, + validInnerComponents: [ + 'Text', + 'FunText', + 'Link' + ], + defaultRules: [ + { + directives: { + '--font': 'generic | inherit', + '--monoFont': 'generic | monospace', + textNoCssColor: 'yes' + } + } + ] +} diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.js b/src/components/settings_modal/admin_tabs/emoji_tab.js index a315756e8..7f575bcb4 100644 --- a/src/components/settings_modal/admin_tabs/emoji_tab.js +++ b/src/components/settings_modal/admin_tabs/emoji_tab.js @@ -32,10 +32,7 @@ const EmojiTab = { newPackName: '', deleteModalVisible: false, remotePackInstance: '', - remotePackDownloadAs: '', - - remotePackURL: '', - remotePackFile: null + remotePackDownloadAs: '' } }, @@ -223,7 +220,7 @@ const EmojiTab = { .then(data => data.json()) .then(resp => { if (resp === 'ok') { - this.$refs.downloadPackPopover.hidePopover() + this.$refs.dlPackPopover.hidePopover() return this.refreshPackList() } else { @@ -235,47 +232,6 @@ const EmojiTab = { this.remotePackDownloadAs = '' }) }, - downloadRemoteURLPack () { - this.$store.state.api.backendInteractor.downloadRemoteEmojiPackZIP({ - url: this.remotePackURL, packName: this.newPackName - }) - .then(data => data.json()) - .then(resp => { - if (resp === 'ok') { - this.$refs.additionalRemotePopover.hidePopover() - - return this.refreshPackList() - } else { - this.displayError(resp.error) - return Promise.reject(resp) - } - }).then(() => { - this.packName = this.newPackName - this.newPackName = '' - this.remotePackURL = '' - }) - }, - downloadRemoteFilePack () { - this.$store.state.api.backendInteractor.downloadRemoteEmojiPackZIP({ - file: this.remotePackFile[0], packName: this.newPackName - }) - .then(data => data.json()) - .then(resp => { - if (resp === 'ok') { - this.$refs.additionalRemotePopover.hidePopover() - - return this.refreshPackList() - } else { - this.displayError(resp.error) - return Promise.reject(resp) - } - }).then(() => { - this.packName = this.newPackName - this.newPackName = '' - this.remotePackURL = '' - }) - }, - displayError (msg) { useInterfaceStore().pushGlobalNotice({ messageKey: 'admin_dash.emoji.error', diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.vue b/src/components/settings_modal/admin_tabs/emoji_tab.vue index 333ff8b0e..4bf64c921 100644 --- a/src/components/settings_modal/admin_tabs/emoji_tab.vue +++ b/src/components/settings_modal/admin_tabs/emoji_tab.vue @@ -62,64 +62,6 @@ -