Merge branch 'main' into feature/node-views

2020-10-30 16:06:53 +01:00
parent 62149cc5b2 4482ad00d5
commit 9dabdfe288
36 changed files with 258 additions and 112 deletions
--- a/docs/src/demos/Extensions/CollaborationCursor/index.vue
+++ b/docs/src/demos/Extensions/CollaborationCursor/index.vue
@@ -61,8 +61,8 @@ export default {
 }
 </script>

-<style lang="scss">
-/* This gives the remote user caret */
+<style lang="scss" scoped>
+/* Give a remote user a caret */
 .collaboration-cursor__caret {
  position: relative;
  margin-left: -1px;
@@ -73,7 +73,7 @@ export default {
  pointer-events: none;
 }

-/* This renders the username above the caret */
+/* Render the username above the caret */
 .collaboration-cursor__label {
  position: absolute;
  top: -1.4em;