summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-12-18 12:32:29 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-12-18 12:32:29 +0900
commitd995bf0326c6bd2951f575be1908afb06f7186e7 (patch)
tree91021b9cff7b01b32bcabcf71f13eb7034d40566
parentfix(backend): add missing kind definition for admin endpoints to improve secu... (diff)
parent設定を付けた & 設定自体をフォーマット (#12693) (diff)
downloadsharkey-d995bf0326c6bd2951f575be1908afb06f7186e7.tar.gz
sharkey-d995bf0326c6bd2951f575be1908afb06f7186e7.tar.bz2
sharkey-d995bf0326c6bd2951f575be1908afb06f7186e7.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
-rw-r--r--.vscode/settings.json24
-rw-r--r--packages/frontend/src/components/MkPostForm.vue1
2 files changed, 14 insertions, 11 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 71fb02a59d..e2a82b1ffe 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,11 +1,15 @@
{
- "search.exclude": {
- "**/node_modules": true
- },
- "typescript.tsdk": "node_modules/typescript/lib",
- "files.associations": {
- "*.test.ts": "typescript"
- },
- "jest.jestCommandLine": "pnpm run jest",
- "jest.autoRun": "off"
-} \ No newline at end of file
+ "search.exclude": {
+ "**/node_modules": true
+ },
+ "typescript.tsdk": "node_modules/typescript/lib",
+ "files.associations": {
+ "*.test.ts": "typescript"
+ },
+ "jest.jestCommandLine": "pnpm run jest",
+ "jest.autoRun": "off",
+ "editor.codeActionsOnSave": {
+ "source.fixAll": "explicit"
+ },
+ "editor.formatOnSave": false
+}
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 8a2a21a89e..f800d16524 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -1039,7 +1039,6 @@ defineExpose({
}
}
-
.colorBar {
position: absolute;
top: 0px;