Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into server_refactor

1 files changed, 286 insertions, 54 deletions

diff --git a/src/client/views/nodes/FormattedTextBox.scss b/src/client/views/nodes/FormattedTextBox.scss
index 29e8b14a8..269a3ca68 100644
--- a/src/client/views/nodes/FormattedTextBox.scss
+++ b/src/client/views/nodes/FormattedTextBox.scss
@@ -10,8 +10,8 @@
     outline: none !important;
 }
 
-.formattedTextBox-cont-scroll,
-.formattedTextBox-cont-hidden {
+.formattedTextBox-cont {
+    cursor: text;
     background: inherit;
     padding: 0;
     border-width: 0px;
@@ -25,10 +25,37 @@
     color: initial;
     height: 100%;
     pointer-events: all;
+    overflow-y: auto;
+    max-height: 100%;
+
+    .formattedTextBox-dictation {
+        height: 20px;
+        width: 20px;
+        top: 0px;
+        left: 0px;
+        position: absolute;
+    }
 }
 
-.formattedTextBox-cont-hidden {
-   // pointer-events: none;
+.collectionfreeformview-container {
+    position: relative;
+}
+
+.formattedTextBox-outer {
+    position: relative;
+    overflow: auto;
+    display: inline-block;
+    width: 100%;
+    height: 100%;
+}
+.formattedTextBox-sidebar,.formattedTextBox-sidebar-inking {
+    border-left: solid 1px black; 
+    height: 100%; 
+    display: inline-block;
+}
+
+.formattedTextBox-sidebar-inking {
+    pointer-events: all;
 }
 
 .formattedTextBox-inner-rounded {
@@ -40,23 +67,23 @@
     left: 10%;
 }
 
-.formattedTextBox-inner-rounded ,
-.formattedTextBox-inner  {
+.formattedTextBox-inner-rounded,
+.formattedTextBox-inner {
     padding: 10px 10px;
     height: 100%;
 }
 
-.menuicon {
-    display: inline-block;
-    border-right: 1px solid rgba(0, 0, 0, 0.2);
-    color: #888;
-    line-height: 1;
-    padding: 0 7px;
-    margin: 1px;
-    cursor: pointer;
-    text-align: center;
-    min-width: 1.4em;
-}
+// .menuicon {
+//     display: inline-block;
+//     border-right: 1px solid rgba(0, 0, 0, 0.2);
+//     color: #888;
+//     line-height: 1;
+//     padding: 0 7px;
+//     margin: 1px;
+//     cursor: pointer;
+//     text-align: center;
+//     min-width: 1.4em;
+// }
 
 .strong,
 .heading {
@@ -68,19 +95,20 @@
 }
 
 .userMarkOpen {
-    background:  rgba(255, 255, 0, 0.267);
+    background: rgba(255, 255, 0, 0.267);
     display: inline;
 }
+
 .userMark {
-    background:  rgba(255, 255, 0, 0.267);
+    background: rgba(255, 255, 0, 0.267);
     font-size: 2px;
     display: inline-grid;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    width:10px;
-    min-height:10px;
-    text-align:center;
+    width: 10px;
+    min-height: 10px;
+    text-align: center;
     align-content: center;
 }
 
@@ -88,8 +116,9 @@ footnote {
     display: inline-block;
     position: relative;
     cursor: pointer;
+
     div {
-        padding : 0 !important;
+        padding: 0 !important;
     }
 }
 
@@ -102,7 +131,7 @@ footnote::after {
 
 .ProseMirror {
     counter-reset: prosemirror-footnote;
-  }
+}
 
 .footnote-tooltip {
     cursor: auto;
@@ -121,6 +150,7 @@ footnote::after {
 .prosemirror-attribution {
     font-size: 8px;
 }
+
 .footnote-tooltip::before {
     border: 5px solid silver;
     border-top-width: 0px;
@@ -135,45 +165,247 @@ footnote::after {
 }
 
 .formattedTextBox-summarizer {
-    opacity :0.5;
+    opacity: 0.5;
     position: relative;
-    width:40px;
-    height:20px;
+    width: 40px;
+    height: 20px;
 }
-.formattedTextBox-summarizer::after{
-    content: "←" ;
+
+.formattedTextBox-summarizer::after {
+    content: "←";
 }
 
 .formattedTextBox-summarizer-collapsed {
-    opacity :0.5;
+    opacity: 0.5;
     position: relative;
-    width:40px;
-    height:20px;
+    width: 40px;
+    height: 20px;
 }
+
 .formattedTextBox-summarizer-collapsed::after {
     content: "...";
 }
 
 .ProseMirror {
-ol { counter-reset: deci1 0; padding-left: 0px; }
-.decimal1-ol {counter-reset: deci1; p { display: inline }; font-size: 24 ; ul, ol {  padding-left:30px; } }
-.decimal2-ol {counter-reset: deci2; p { display: inline }; font-size: 18 ; ul, ol {  padding-left:30px; } }
-.decimal3-ol {counter-reset: deci3; p { display: inline }; font-size: 14 ; ul, ol {  padding-left:30px; } }
-.decimal4-ol {counter-reset: deci4; p { display: inline }; font-size: 10 ; ul, ol {  padding-left:30px; } }
-.decimal5-ol {counter-reset: deci5; p { display: inline }; font-size: 10 ; ul, ol {  padding-left:30px; } }
-.decimal6-ol {counter-reset: deci6; p { display: inline }; font-size: 10 ; ul, ol {  padding-left:30px; } }
-.decimal7-ol {counter-reset: deci7; p { display: inline }; font-size: 10 ; ul, ol {  padding-left:30px; } } 
-.upper-alpha-ol {counter-reset: ualph; p { display: inline }; font-size: 18; }
-.lower-roman-ol {counter-reset: lroman;  p { display: inline }; font-size: 14; }
-.lower-alpha-ol {counter-reset: lalpha;  p { display: inline }; font-size: 10; }
-.decimal1:before { content: counter(deci1) ") "; counter-increment: deci1; display:inline-block; min-width: 30;}
-.decimal2:before { content: counter(deci1) "." counter(deci2) ") "; counter-increment: deci2; display:inline-block; min-width: 35}
-.decimal3:before { content: counter(deci1) "." counter(deci2) "." counter(deci3) ") "; counter-increment: deci3; display:inline-block; min-width: 35}
-.decimal4:before { content: counter(deci1) "." counter(deci2) "." counter(deci3) "." counter(deci4) ") "; counter-increment: deci4; display:inline-block; min-width: 40}
-.decimal5:before { content: counter(deci1) "." counter(deci2) "." counter(deci3) "." counter(deci4) "." counter(deci5) ") "; counter-increment: deci5; display:inline-block; min-width: 40}
-.decimal6:before { content: counter(deci1) "." counter(deci2) "." counter(deci3) "." counter(deci4) "." counter(deci5) "." counter(deci6) ") "; counter-increment: deci6; display:inline-block; min-width: 45}
-.decimal7:before { content: counter(deci1) "." counter(deci2) "." counter(deci3) "." counter(deci4) "." counter(deci5) "." counter(deci6) "." counter(deci7) ") "; counter-increment: deci7; display:inline-block; min-width: 50}
-.upper-alpha:before { content: counter(deci1) "." counter(ualph, upper-alpha) ") "; counter-increment: ualph; display:inline-block; min-width: 35 }
-.lower-roman:before { content: counter(deci1) "." counter(ualph, upper-alpha) "." counter(lroman, lower-roman) ") "; counter-increment: lroman;display:inline-block; min-width: 50 }
-.lower-alpha:before { content: counter(deci1) "." counter(ualph, upper-alpha) "." counter(lroman, lower-roman) "." counter(lalpha, lower-alpha) ") "; counter-increment: lalpha; display:inline-block; min-width: 35}
-}
+    touch-action: none;
+
+    ol {
+        counter-reset: deci1 0;
+        padding-left: 0px;
+    }
+
+    .decimal1-ol {
+        counter-reset: deci1;
+
+        p {
+            display: inline
+        }
+
+        ;
+        font-size: 24;
+
+        ul,
+        ol {
+            padding-left: 30px;
+        }
+    }
+
+    .decimal2-ol {
+        counter-reset: deci2;
+
+        p {
+            display: inline
+        }
+
+        ;
+        font-size: 18;
+
+        ul,
+        ol {
+            padding-left: 30px;
+        }
+    }
+
+    .decimal3-ol {
+        counter-reset: deci3;
+
+        p {
+            display: inline
+        }
+
+        ;
+        font-size: 14;
+
+        ul,
+        ol {
+            padding-left: 30px;
+        }
+    }
+
+    .decimal4-ol {
+        counter-reset: deci4;
+
+        p {
+            display: inline
+        }
+
+        ;
+        font-size: 10;
+
+        ul,
+        ol {
+            padding-left: 30px;
+        }
+    }
+
+    .decimal5-ol {
+        counter-reset: deci5;
+
+        p {
+            display: inline
+        }
+
+        ;
+        font-size: 10;
+
+        ul,
+        ol {
+            padding-left: 30px;
+        }
+    }
+
+    .decimal6-ol {
+        counter-reset: deci6;
+
+        p {
+            display: inline
+        }
+
+        ;
+        font-size: 10;
+
+        ul,
+        ol {
+            padding-left: 30px;
+        }
+    }
+
+    .decimal7-ol {
+        counter-reset: deci7;
+
+        p {
+            display: inline
+        }
+
+        ;
+        font-size: 10;
+
+        ul,
+        ol {
+            padding-left: 30px;
+        }
+    }
+
+    .upper-alpha-ol {
+        counter-reset: ualph;
+
+        p {
+            display: inline
+        }
+
+        ;
+        font-size: 18;
+    }
+
+    .lower-roman-ol {
+        counter-reset: lroman;
+
+        p {
+            display: inline
+        }
+
+        ;
+        font-size: 14;
+    }
+
+    .lower-alpha-ol {
+        counter-reset: lalpha;
+
+        p {
+            display: inline
+        }
+
+        ;
+        font-size: 10;
+    }
+
+    .decimal1:before {
+        content: counter(deci1) ") ";
+        counter-increment: deci1;
+        display: inline-block;
+        min-width: 30;
+    }
+
+    .decimal2:before {
+        content: counter(deci1) "."counter(deci2) ") ";
+        counter-increment: deci2;
+        display: inline-block;
+        min-width: 35
+    }
+
+    .decimal3:before {
+        content: counter(deci1) "."counter(deci2) "."counter(deci3) ") ";
+        counter-increment: deci3;
+        display: inline-block;
+        min-width: 35
+    }
+
+    .decimal4:before {
+        content: counter(deci1) "."counter(deci2) "."counter(deci3) "."counter(deci4) ") ";
+        counter-increment: deci4;
+        display: inline-block;
+        min-width: 40
+    }
+
+    .decimal5:before {
+        content: counter(deci1) "."counter(deci2) "."counter(deci3) "."counter(deci4) "."counter(deci5) ") ";
+        counter-increment: deci5;
+        display: inline-block;
+        min-width: 40
+    }
+
+    .decimal6:before {
+        content: counter(deci1) "."counter(deci2) "."counter(deci3) "."counter(deci4) "."counter(deci5) "."counter(deci6) ") ";
+        counter-increment: deci6;
+        display: inline-block;
+        min-width: 45
+    }
+
+    .decimal7:before {
+        content: counter(deci1) "."counter(deci2) "."counter(deci3) "."counter(deci4) "."counter(deci5) "."counter(deci6) "."counter(deci7) ") ";
+        counter-increment: deci7;
+        display: inline-block;
+        min-width: 50
+    }
+
+    .upper-alpha:before {
+        content: counter(deci1) "."counter(ualph, upper-alpha) ") ";
+        counter-increment: ualph;
+        display: inline-block;
+        min-width: 35
+    }
+
+    .lower-roman:before {
+        content: counter(deci1) "."counter(ualph, upper-alpha) "."counter(lroman, lower-roman) ") ";
+        counter-increment: lroman;
+        display: inline-block;
+        min-width: 50
+    }
+
+    .lower-alpha:before {
+        content: counter(deci1) "."counter(ualph, upper-alpha) "."counter(lroman, lower-roman) "."counter(lalpha, lower-alpha) ") ";
+        counter-increment: lalpha;
+        display: inline-block;
+        min-width: 35
+    }
+}
\ No newline at end of file