Merge remote-tracking branch 'refs/remotes/origin/master' into outlineCloseButtonOnModal

# Conflicts:
#	css/obBase.css

Author: jjeffryes

css/obBase.css

@@ -4319,6 +4319,10 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   border-color: #616161;
 }
 
+#ov1 .medium-editor-toolbar {
+  background: #353443;
+}
+
 #ov1::-webkit-scrollbar {
   display: none;
   box-sizing: border-box;
@@ -5899,7 +5903,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   text-shadow: 0 0 1px rgba(0,0,0,1), 0 0 2px rgba(255,255,255, 1) !important;
 }
 
-
 /* hide unfinished elements */
 
 #ov1 .TODO.TODO.TODO.TODO.TODO {