diff --git a/build/dev-server.js b/build/dev-server.js index 9fb6318ef..8e3b3a12c 100644 --- a/build/dev-server.js +++ b/build/dev-server.js @@ -53,7 +53,8 @@ Object.keys(proxyTable).forEach(function (context) { if (typeof options === 'string') { options = { target: options } } - app.use(proxyMiddleware.createProxyMiddleware(context, options)) + options.pathFilter = context + app.use(proxyMiddleware.createProxyMiddleware(options)) }) // handle fallback for HTML5 history API diff --git a/changelog.d/roundup4.skip b/changelog.d/roundup4.skip new file mode 100644 index 000000000..e69de29bb diff --git a/package.json b/package.json index 6857dea54..fa85eaf47 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "hash-sum": "^2.0.0", "js-cookie": "3.0.5", "localforage": "1.10.0", - "pako": "^2.1.0", "parse-link-header": "2.0.0", "phoenix": "1.7.19", "pinia": "^2.0.33", diff --git a/src/App.scss b/src/App.scss index c0f2e3fec..fa02ad929 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,6 +1,6 @@ // stylelint-disable rscss/class-format /* stylelint-disable no-descending-specificity */ -@import "./panel"; +@use "panel"; :root { --status-margin: 0.75em; @@ -762,12 +762,6 @@ option { margin-left: 0.7em; margin-top: -1em; } - - &.-neutral { - background-color: var(--badgeNeutral); - color: white; - color: var(--badgeNeutralText, white); - } } .alert { @@ -1100,3 +1094,8 @@ option { } } } + +@property --shadow { + syntax: "*"; + inherits: false; +} diff --git a/src/components/attachment/attachment.style.js b/src/components/attachment/attachment.style.js index fde8a50a6..45baa5546 100644 --- a/src/components/attachment/attachment.style.js +++ b/src/components/attachment/attachment.style.js @@ -4,7 +4,7 @@ export default { notEditable: true, validInnerComponents: [ 'Border', - 'ButtonUnstyled', + 'Button', 'Input' ], defaultRules: [ @@ -14,7 +14,7 @@ export default { } }, { - component: 'ButtonUnstyled', + component: 'Button', parent: { component: 'Attachment' }, directives: { background: '#FFFFFF', diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 3ab7040ef..0701a393e 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -1,7 +1,7 @@ - + + + + + + +