New version 3.1.34. Read more https://github.com/xdan/jodit/releases/…

…tag/3.1.34
xdan · Feb 8, 2018 · 2a87304 · 2a87304
1 parent 546552d
commit 2a87304
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 92 deletions.
diff --git a/build/jodit.min.css b/build/jodit.min.css
diff --git a/build/jodit.min.js b/build/jodit.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jodit",
-  "version": "3.1.33",
+  "version": "3.1.34",
   "description": "Jodit is awesome and usefully wysiwyg editor with filebrowser",
   "main": "build/jodit.min.js",
   "scripts": {

diff --git a/src/styles/plugins/size.less b/src/styles/plugins/size.less
@@ -8,6 +8,7 @@
 .jodit_container {
   min-height: 100px;
   .jodit_workplace {
+    display: flex;
     height: ~'calc(100% - 33px)';
     min-height: 50px;
   }

diff --git a/src/styles/themes/dark.less b/src/styles/themes/dark.less
@@ -5,103 +5,106 @@
  */
 
 .jodit_dark_theme {
-    .jodit_workplace {
-      border-color: fade(@dark_background_color, 80%);
-    }
-    .jodit_toolbar_popup-inline,
-    .jodit_toolbar_popup {
+  &.jodit_container {
+    background-color: @dark_background_color;
+  }
+  .jodit_workplace {
+    border-color: fade(@dark_background_color, 80%);
+  }
+  .jodit_toolbar_popup-inline,
+  .jodit_toolbar_popup {
+      background: @dark_background_color;
+      &:before{
         background: @dark_background_color;
-        &:before{
-          background: @dark_background_color;
-        }
-    }
-    .jodit_toolbar {
-        background: @dark_toolbar_color;
-        li.jodit_toolbar_btn {
-            > a {
-              color: @dark_text_color;
-              &:hover {
-                background-color: @dark_background_color;
-              }
-            }
-            &.jodit_toolbar_btn-break{
-                border-top-color: @dark_toolbar_seperator_color2;
-            }
-            &.jodit_toolbar_btn-separator{
-                border-right-color: @dark_toolbar_seperator_color2;
-            }
-            &.active, &:active, &:hover,&.jodit_active {
-                background-color: @dark_background_color
+      }
+  }
+  .jodit_toolbar {
+      background: @dark_toolbar_color;
+      li.jodit_toolbar_btn {
+          > a {
+            color: @dark_text_color;
+            &:hover {
+              background-color: @dark_background_color;
             }
-            &.jodit_with_dropdownlist {
-              .jodit_with_dropdownlist-trigger {
-                border-top-color: @dark_icon_color;
-              }
+          }
+          &.jodit_toolbar_btn-break{
+              border-top-color: @dark_toolbar_seperator_color2;
+          }
+          &.jodit_toolbar_btn-separator{
+              border-right-color: @dark_toolbar_seperator_color2;
+          }
+          &.active, &:active, &:hover,&.jodit_active {
+              background-color: @dark_background_color
+          }
+          &.jodit_with_dropdownlist {
+            .jodit_with_dropdownlist-trigger {
+              border-top-color: @dark_icon_color;
             }
-        }
-    }
-    .jodit_icon {
-        fill: @dark_icon_color;
-    }
-    .jodit_wysiwyg_iframe,
-    .jodit_wysiwyg{
-        background-color: @dark_background_color;
-        color: @dark_text_color;
-        [data-jodit-selected-cell] {
-          border-color: @dark_color-border-selected;
-        }
-    }
-    .jodit_dropdownlist {
-        background: @dark_toolbar_color;
-    }
-    .jodit_tabs .jodit_tabs_buttons > a {
-      background-color: @dark_toolbar_seperator_color2;
-      color: @dark_text_color;
-      &:hover {
-        background-color: fade(@dark_toolbar_seperator_color2, 80%);
-        color: @dark_text_color;
-        border-color: fade(@dark_toolbar_seperator_color2, 90%);
+          }
       }
-      &.active {
-        background: @dark_toolbar_seperator_color1;
-        border-color: @dark_toolbar_seperator_color2;
-      }
-      svg {
-        fill: @dark_icon_color;
+  }
+  .jodit_icon {
+      fill: @dark_icon_color;
+  }
+  .jodit_wysiwyg_iframe,
+  .jodit_wysiwyg{
+      background-color: @dark_background_color;
+      color: @dark_text_color;
+      [data-jodit-selected-cell] {
+        border-color: @dark_color-border-selected;
       }
-    }
-    .jodit_form textarea, .jodit_form input[type=url], .jodit_form input[type=text] {
-      background-color: @dark_toolbar_seperator_color1;
-      border-color: @dark_toolbar_seperator_color2;
+  }
+  .jodit_dropdownlist {
+      background: @dark_toolbar_color;
+  }
+  .jodit_tabs .jodit_tabs_buttons > a {
+    background-color: @dark_toolbar_seperator_color2;
+    color: @dark_text_color;
+    &:hover {
+      background-color: fade(@dark_toolbar_seperator_color2, 80%);
       color: @dark_text_color;
+      border-color: fade(@dark_toolbar_seperator_color2, 90%);
     }
-    .jodit_form button {
-      background-color: @dark_toolbar_seperator_color3;
-      color: @dark_text_color;
+    &.active {
+      background: @dark_toolbar_seperator_color1;
+      border-color: @dark_toolbar_seperator_color2;
     }
-    .jodit_placeholder {
-      color: fade(@dark_text_color, 80%);
+    svg {
+      fill: @dark_icon_color;
     }
-    .jodit_draganddrop_file_box, .jodit_uploadfile_button {
-      color: @dark_text_color;
-      &:hover {
-        background-color: @dark_toolbar_seperator_color3;
-      }
+  }
+  .jodit_form textarea, .jodit_form input[type=url], .jodit_form input[type=text] {
+    background-color: @dark_toolbar_seperator_color1;
+    border-color: @dark_toolbar_seperator_color2;
+    color: @dark_text_color;
+  }
+  .jodit_form button {
+    background-color: @dark_toolbar_seperator_color3;
+    color: @dark_text_color;
+  }
+  .jodit_placeholder {
+    color: fade(@dark_text_color, 80%);
+  }
+  .jodit_draganddrop_file_box, .jodit_uploadfile_button {
+    color: @dark_text_color;
+    &:hover {
+      background-color: @dark_toolbar_seperator_color3;
     }
-    .jodit-add-new-line {
-      &:before{
-        border-top-color: @dark_toolbar_seperator_color2;
-      }
-      span {
-        background: @dark_toolbar_seperator_color3;
-        border-color: @dark_toolbar_seperator_color2;
-        svg {
-          fill: @dark_text_color;
-        }
-      }
+  }
+  .jodit-add-new-line {
+    &:before{
+      border-top-color: @dark_toolbar_seperator_color2;
     }
-    .jodit_resizer > i {
+    span {
       background: @dark_toolbar_seperator_color3;
-      border-color: @dark_icon_color;
+      border-color: @dark_toolbar_seperator_color2;
+      svg {
+        fill: @dark_text_color;
+      }
     }
+  }
+  .jodit_resizer > i {
+    background: @dark_toolbar_seperator_color3;
+    border-color: @dark_icon_color;
+  }
 }