From 1bdb0ff3eaa0f8a874bbf306ca5fe8a45f8e6ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Sat, 13 Apr 2019 20:28:28 +0200
Subject: Add first working version of collaborative editing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 css/style.scss | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'css')

diff --git a/css/style.scss b/css/style.scss
index 3e8be7259..18b8f125d 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -62,7 +62,6 @@ li.ProseMirror-selectednode:after {
 }
 
 .ProseMirror-tooltip .ProseMirror-menu {
-  width: -webkit-fit-content;
   width: fit-content;
   white-space: pre;
 }
@@ -79,7 +78,6 @@ li.ProseMirror-selectednode:after {
 }
 
 .ProseMirror-menu-dropdown, .ProseMirror-menu-dropdown-menu {
-  font-size: 90%;
   white-space: nowrap;
 }
 
@@ -111,7 +109,7 @@ li.ProseMirror-selectednode:after {
   position: absolute;
   background: white;
   color: #666;
-  border: 1px solid #aaa;
+  box-shadow: 0 0 3px var(--color-box-shadow);
   padding: 2px;
 }
 
@@ -193,7 +191,7 @@ li.ProseMirror-selectednode:after {
   position: relative;
 }
 
-.ProseMirror-icon {
+.ProseMirror-icon, .ProseMirror-menu-dropdown-wrap {
   display: inline-block;
   line-height: .8;
   vertical-align: -2px; /* Compensate for padding */
@@ -205,6 +203,15 @@ li.ProseMirror-selectednode:after {
   }
 }
 
+.ProseMirror-menu-dropdown-menu {
+  padding: 8px;
+  border-radius: 2px;
+  cursor: pointer;
+  .ProseMirror-menu-dropdown-item {
+    padding: 8px;
+  }
+}
+
 .ProseMirror-menu-disabled.ProseMirror-icon {
   cursor: default;
 }
@@ -248,6 +255,7 @@ li.ProseMirror-selectednode:after {
   padding: 2px 10px;
   border: none;
   margin: 1em 0;
+  width: 100%;
 }
 
 .ProseMirror-example-setup-style hr:after {
@@ -261,7 +269,9 @@ li.ProseMirror-selectednode:after {
 .ProseMirror ul, .ProseMirror ol {
   padding-left: 30px;
 }
-
+.ProseMirror ul li {
+  list-style-type: disc;
+}
 .ProseMirror blockquote {
   padding-left: 1em;
   border-left: 3px solid #eee;
-- 
cgit v1.2.3