Merge pull request #44 from Automattic/collab/avatars

Collab: Add presence avatars
Automattic · Sep 7, 2021 · 6311f85 · 6311f85
2 parents ba7d09b + 546630f
commit 6311f85
Show file tree

Hide file tree

Showing 104 changed files with 889 additions and 2,492 deletions.
diff --git a/.storybook/global.scss b/.storybook/global.scss
@@ -0,0 +1,5 @@
+@import '@wordpress/base-styles/_variables';
+
+body {
+	font-family: $default-font;
+}
diff --git a/.storybook/preview.js b/.storybook/preview.js
@@ -1,4 +1,5 @@
 import '../build-browser/core.css';
+import './global.scss';
 
 export const parameters = {
 	actions: { argTypesRegex: '^on[A-Z].*' },

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Show outline around blocks that are currently being modified by peers when collaborative editing.
+- Presence avatars for collaborative editing peers.
 
 ### Fixed
 

diff --git a/build-browser/isolated-block-editor.css b/build-browser/isolated-block-editor.css
diff --git a/build-browser/isolated-block-editor.js b/build-browser/isolated-block-editor.js
diff --git a/build-module/components/block-editor-contents/use-yjs/README.md b/build-module/components/block-editor-contents/use-yjs/README.md