Merge branch 'main' into nightly-ci-test

electron/js/preload.js

@@ -26,6 +26,7 @@ contextBridge.exposeInMainWorld('Electron', {
 	fileMime: fp => mime.lookup(fp),
 	fileExt: fp => path.extname(fp),
 	fileSize: fp => fs.statSync(fp).size,
+	isDirectory: fp => fs.lstatSync(fp).isDirectory(),
 	defaultPath: () => path.join(app.getPath('appData'), app.getName()),
 
 	currentWindow: () => getCurrentWindow(),

extension/scss/common.scss

@@ -1,6 +1,6 @@
 html.anytypeWebclipper-iframe, 
 html.anytypeWebclipper-popup { 
-	@import "~scss/font.scss";
+	@import "~scss/font";
 	@import "~scss/_mixins";
 
 	/* Text */
@@ -98,10 +98,10 @@ html.anytypeWebclipper-popup {
 	--line-height-description: 26px; 
 	--letter-spacing-description: -0.28px;
 
-	@import "~scss/common.scss";
-	@import "~scss/form/common.scss";
-	@import "~scss/component/common.scss";
-	@import "~scss/menu/common.scss";
+	@import "~scss/common";
+	@import "~scss/form/common";
+	@import "~scss/component/common";
+	@import "~scss/menu/common";
 	@import "~scss/block/common";
 
 	* { box-sizing: border-box; border: 0px; margin: 0px; padding: 0px; }

middleware.version

@@ -1 +1 @@
-0.36.0-rc3
+0.36.0-rc4

src/json/constant.ts

@@ -39,10 +39,15 @@ export default {
 		graphDepth:		 5,
 
 		chat: {
-			messages:	 100,
-			attachments: 10,
-			mentions:	 10,
-			text:		 2000,
+			messages:		 100,
+			attachments:	 10,
+			files:			 10,
+			mentions:		 10,
+			text:			 2000,
+			reactions:		 {
+				self:		 10,
+				all:		 20,
+			},
 		}
 	},
 

src/json/text.json

@@ -160,6 +160,7 @@
 	"commonFile": "File",
 	"commonMembers": "Members",
 	"commonEntrySpace": "My First Space",
+	"commonNothingFound": "Nothing found",
 
 	"pluralDay": "day|days",
 	"pluralObject": "Object|Objects",
@@ -1747,8 +1748,6 @@
 	"widgetEmptyLabelCreate": "There are no Objects here,<br/>create the first one",
 	"widgetShowAll": "See all Objects",
 
-	"widgetButtonAllContent": "All content",
-
 	"phrasePlaceholder": "Please enter your Key",
 
 	"navigationAccount": "Spaces",

src/json/theme.ts

@@ -37,9 +37,9 @@ export default {
 		},
 
 		icon: {
-			text: '#fff',
+			text: '#b6b6b6',
 			bg: {
-				grey: '#bfbfbf',
+				grey: '#f2f2f2',
 				black: '#252525',
 				brown: '#b6b6b6',
 				orange: '#ffb522',
@@ -98,9 +98,9 @@ export default {
 		},
 
 		icon: {
-			text: '#fff',
+			text: '#9a9a9a',
 			bg: {
-				grey: '#606060',
+				grey: '#2b2b2b',
 				black: '#252525',
 				brown: '#b6b6b6',
 				orange: '#ffb522',

src/scss/block/chat.scss

@@ -30,8 +30,8 @@
 			> .date.hide { opacity: 0; }
 		}
 
-		@import "./chat/attachment.scss";
-		@import "./chat/message.scss";
-		@import "./chat/form.scss";
+		@import "./chat/attachment";
+		@import "./chat/message";
+		@import "./chat/form";
 	}
 }

src/scss/block/chat/form.scss

@@ -33,8 +33,7 @@
 
 	.buttons { display: flex; gap: 0px 8px; padding: 10px 16px 0px 16px; margin-left: -4px; }
 	.buttons {
-		.icon { width: 28px; height: 28px; background-size: 20px 20px; margin: 0px; border-radius: 6px; transition: none; }
-		.icon:hover { background-color: var(--color-shape-highlight-medium); }
+		.icon { margin: 0px; transition: none; }
 
 		/* Chat buttons */
 		.icon.plus { background-image: url('~img/icon/chat/buttons/plus.svg'); }

src/scss/block/common.scss

@@ -31,11 +31,12 @@
 
 		.flex { position: relative; z-index: 2; }
 		.icon.dnd { 
-			width: 12px; height: 100%; background-size: 8px 16px; opacity: 0; cursor: grab; position: absolute; right: 6px; top: 0px;
-			background-image: url('~img/icon/block/menu0.svg'); border: 1px solid var(--color-shape-secondary); border-radius: 12px; 
+			width: 12px; height: 100%; background-size: 2px 12px; opacity: 0; cursor: grab; position: absolute; right: 6px; top: 0px;
+			background-image: url('~img/icon/block/menu0.svg'); border: 1px solid var(--color-shape-secondary); border-radius: 12px;
 		}
 		.icon.dnd:hover { 
-			background-image: url('~img/icon/block/menu2.svg') !important; border-color: var(--color-system-accent-100); box-shadow: 0px 0px 0px 1px var(--color-system-accent-100);
+			background-image: url('~img/icon/block/menu2.svg') !important; background-color: var(--color-shape-tertiary); 
+			border-color: var(--color-shape-tertiary);
 		}
 
 		.inputWithFile { position: relative; }
@@ -108,30 +109,30 @@
 	.block > .wrapMenu > .icon.dnd { opacity: 1; }
 }
 
-@import "./markup.scss";
-@import "./bookmark.scss";
-@import "./cover.scss";
-@import "./dataview.scss";
-@import "./dataview/cell.scss";
-@import "./dataview/view/board.scss";
-@import "./dataview/view/common.scss";
-@import "./dataview/view/gallery.scss";
-@import "./dataview/view/grid.scss";
-@import "./dataview/view/list.scss";
-@import "./dataview/view/calendar.scss";
-@import "./dataview/view/graph.scss";
-@import "./div.scss";
-@import "./featured.scss";
-@import "./file.scss";
-@import "./iconPage.scss";
-@import "./iconUser.scss";
-@import "./layout.scss";
-@import "./link.scss";
-@import "./media.scss";
-@import "./relation.scss";
-@import "./table.scss";
-@import "./tableOfContents.scss";
-@import "./text.scss";
-@import "./type.scss";
-@import "./embed.scss";
-@import "./chat.scss";
+@import "./markup";
+@import "./bookmark";
+@import "./cover";
+@import "./dataview";
+@import "./dataview/cell";
+@import "./dataview/view/board";
+@import "./dataview/view/common";
+@import "./dataview/view/gallery";
+@import "./dataview/view/grid";
+@import "./dataview/view/list";
+@import "./dataview/view/calendar";
+@import "./dataview/view/graph";
+@import "./div";
+@import "./featured";
+@import "./file";
+@import "./iconPage";
+@import "./iconUser";
+@import "./layout";
+@import "./link";
+@import "./media";
+@import "./relation";
+@import "./table";
+@import "./tableOfContents";
+@import "./text";
+@import "./type";
+@import "./embed";
+@import "./chat";

src/scss/block/dataview.scss

@@ -64,10 +64,7 @@
 
 		.dataviewHead { display: flex; flex-direction: row; align-items: center; gap: 0px 2px; width: 100%; color: var(--color-text-primary); }
 		.dataviewHead {
-			.icon.source { 
-				width: 28px; height: 28px; background-size: 24px; background-image: url('~img/icon/dataview/button/source0.svg'); opacity: 0; 
-				flex-shrink: 0;
-			}
+			.icon.source { background-image: url('~img/icon/dataview/button/source0.svg'); opacity: 0; flex-shrink: 0; }
 			.icon.source.active { opacity: 1; }
 
 			.editableWrap { @include text-header2; height: 28px; @include text-overflow-nw; }
@@ -124,9 +121,7 @@
 				}
 			}
 
-			.icon { position: relative; width: 28px; height: 28px; background-size: 20px; border-radius: 6px; transition: $transitionAllCommon; }
-			.icon:hover, .icon.hover { background-color: var(--color-shape-highlight-medium); }
-
+			.icon { position: relative; transition: $transitionAllCommon; }
 			.icon.btn-filter { background-image: url('~img/icon/dataview/button/filter0.svg'); }
 			.icon.btn-filter.on { background-image: url('~img/icon/dataview/button/filter1.svg'); }
 			.icon.btn-sort { background-image: url('~img/icon/dataview/button/sort0.svg'); }

src/scss/block/embed.scss

@@ -89,8 +89,8 @@
 		}
 
 		.icon.source { 
-			position: absolute; top: 10px; right: 10px; width: 28px; height: 28px; opacity: 0; border-radius: 4px;
-			background-color: rgba(37, 37, 37, 0.35); background-image: url('~img/icon/block/edit.svg'); transition: $transitionAllCommon;
+			position: absolute; top: 10px; right: 10px; opacity: 0; border-radius: 6px; background-color: rgba(37, 37, 37, 0.35); 
+			background-image: url('~img/icon/block/edit.svg'); transition: $transitionAllCommon;
 		}
 
 		.icon.resize { 

src/scss/common.scss

@@ -202,5 +202,5 @@ a { color: var(--color-text-primary); }
 	.icon.download { display: none; }
 }
 
-@import "scss/debug.scss";
-@import "scss/font.scss";
+@import "scss/debug";
+@import "scss/font";

src/scss/component/common.scss

@@ -1,32 +1,32 @@
-@import "./cover.scss";
-@import "./deleted.scss";
-@import "./dragbox.scss";
-@import "./dragLayer.scss";
-@import "./dotIndicator.scss";
-@import "./editor.scss";
-@import "./emptySearch.scss";
-@import "./error.scss";
-@import "./footer.scss";
-@import "./frame.scss";
-@import "./header.scss";
-@import "./headSimple.scss";
-@import "./icon.scss";
-@import "./iconObject.scss";
-@import "./loader.scss";
-@import "./pager.scss";
-@import "./progress.scss";
-@import "./selection.scss";
-@import "./sidebar.scss";
-@import "./vault.scss";
-@import "./sync.scss";
-@import "./tag.scss";
-@import "./title.scss";
-@import "./toast.scss";
-@import "./tooltip.scss";
-@import "./navigation.scss";
-@import "./hightlight.scss";
-@import "./progressBar.scss";
-@import "./share.scss";
+@import "./cover";
+@import "./deleted";
+@import "./dragbox";
+@import "./dragLayer";
+@import "./dotIndicator";
+@import "./editor";
+@import "./emptySearch";
+@import "./error";
+@import "./footer";
+@import "./frame";
+@import "./header";
+@import "./headSimple";
+@import "./icon";
+@import "./iconObject";
+@import "./loader";
+@import "./pager";
+@import "./progress";
+@import "./selection";
+@import "./sidebar";
+@import "./vault";
+@import "./sync";
+@import "./tag";
+@import "./title";
+@import "./toast";
+@import "./tooltip";
+@import "./navigation";
+@import "./hightlight";
+@import "./progressBar";
+@import "./share";
 
-@import "./preview/common.scss";
-@import "./media/common.scss";
+@import "./preview/common";
+@import "./media/common";