merge with master

1 files changed, 39 insertions, 31 deletions

diff --git a/src/client/views/nodes/FormattedTextBox.scss b/src/client/views/nodes/FormattedTextBox.scss
index d3045ae2f..247f7d1ea 100644
--- a/src/client/views/nodes/FormattedTextBox.scss
+++ b/src/client/views/nodes/FormattedTextBox.scss
@@ -1,34 +1,37 @@
 @import "../globalCssVariables";
+
 .ProseMirror {
-  width: 100%;
-  height: 100%;
-  min-height: 100%;
-  font-family: $serif;
+    width: 100%;
+    height: 100%;
+    min-height: 100%;
+    font-family: $serif;
 }
 
 .ProseMirror:focus {
-  outline: none !important;
+    outline: none !important;
 }
 
-.formattedTextBox-cont-scroll, .formattedTextBox-cont-hidden  {
-  background: inherit;
-  padding: 0;
-  border-width: 0px;
-  border-radius: inherit;
-  border-color: $intermediate-color;
-  box-sizing: border-box;
-  background-color: inherit;
-  border-style: solid;
-  overflow-y: auto;
-  overflow-x: hidden;
-  color: initial;
-  height: 100%;
-  pointer-events: all;
+.formattedTextBox-cont-scroll,
+.formattedTextBox-cont-hidden {
+    background: inherit;
+    padding: 0;
+    border-width: 0px;
+    border-radius: inherit;
+    border-color: $intermediate-color;
+    box-sizing: border-box;
+    background-color: inherit;
+    border-style: solid;
+    overflow-y: auto;
+    overflow-x: hidden;
+    color: initial;
+    height: 100%;
+    pointer-events: all;
 }
 
 .formattedTextBox-cont-hidden {
     pointer-events: none;
 }
+
 .formattedTextBox-inner-rounded {
     height: calc(100% - 25px);
     width: calc(100% - 40px);
@@ -38,23 +41,28 @@
     left: 20;
 }
 
+.formattedTextBox-inner-rounded div,
+.formattedTextBox-inner div {
+    padding: 10px 10px;
+}
+
 .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;
+    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 {
-  font-weight: bold;
+    font-weight: bold;
 }
 
 .em {
-  font-style: italic;
-}
+    font-style: italic;
+}
\ No newline at end of file