Merge 1d39598 into 1e4bef7

summernote · Jun 17, 2019 · 9a98b6b · 9a98b6b
2 parents 1e4bef7 + 1d39598
commit 9a98b6b
Show file tree

Hide file tree

Showing 44 changed files with 18 additions and 20 deletions.
diff --git a/config/common/dev.common.config.js b/config/common/dev.common.config.js
@@ -68,7 +68,7 @@ module.exports = function() {
             {
               loader: 'html-loader',
               options: {
-                minimize: true,
+                minimize: false,
               },
             },
           ],

diff --git a/config/common/webfont.config.js b/config/common/webfont.config.js
@@ -1,10 +1,10 @@
 module.exports = {
   files: './src/icons/*.svg',
-  dest: './src/less/font/',
+  dest: './dist/font/',
   formats: ['ttf', 'eot', 'woff', 'woff2'],
   fontName: 'summernote',
-  template: './src/icons/templates/summernote.css',
-  destTemplate: './src/less',
+  template: './src/icons/templates/summernote-icons.css',
+  destTemplate: './src/styles/',
   templateFontName: 'summernote',
   templateClassName: 'note-icon',
   templateFontPath: './font/',

diff --git a/src/icons/align-left.svg b/src/icons/align-left.svg
diff --git a/src/icons/circle.svg b/src/icons/circle.svg
diff --git a/src/icons/close.svg b/src/icons/close.svg
diff --git a/src/icons/frame.svg b/src/icons/frame.svg
diff --git a/src/icons/menu-check.svg b/src/icons/menu-check.svg
diff --git a/src/icons/minus.svg b/src/icons/minus.svg
diff --git a/src/icons/pencil.svg b/src/icons/pencil.svg
diff --git a/src/icons/special-character.svg b/src/icons/special-character.svg
diff --git a/src/icons/square.svg b/src/icons/square.svg
diff --git a/src/icons/templates/summernote.css → src/icons/templates/summernote-icons.css b/src/icons/templates/summernote.css → src/icons/templates/summernote-icons.css
diff --git a/src/icons/templates/summernote.json b/src/icons/templates/summernote.json
diff --git a/src/js/bs3/settings.js b/src/js/bs3/settings.js
@@ -2,7 +2,7 @@ import $ from 'jquery';
 import ui from './ui';
 import '../base/settings.js';
 
-import '../../less/summernote.scss';
+import '../../styles/summernote.scss';
 
 $.summernote = $.extend($.summernote, {
   ui: ui,

diff --git a/src/js/bs4/settings.js b/src/js/bs4/settings.js
@@ -2,7 +2,7 @@ import $ from 'jquery';
 import ui from './ui';
 import '../base/settings.js';
 
-import '../../less/summernote-bs4.scss';
+import '../../styles/summernote-bs4.scss';
 
 $.summernote = $.extend($.summernote, {
   ui: ui,

diff --git a/src/js/lite/settings.js b/src/js/lite/settings.js
@@ -2,7 +2,7 @@ import $ from 'jquery';
 import ui from './ui';
 import '../base/settings.js';
 
-import '../../less/summernote-lite.less';
+import '../../styles/summernote-lite.less';
 
 $.summernote = $.extend($.summernote, {
   ui: ui,

diff --git a/src/less/elements.less → src/styles/elements.less b/src/less/elements.less → src/styles/elements.less
diff --git a/src/less/elements.scss → src/styles/elements.scss b/src/less/elements.scss → src/styles/elements.scss
diff --git a/src/less/font/summernote.eot → src/styles/font/summernote.eot b/src/less/font/summernote.eot → src/styles/font/summernote.eot
diff --git a/src/less/font/summernote.ttf → src/styles/font/summernote.ttf b/src/less/font/summernote.ttf → src/styles/font/summernote.ttf
diff --git a/src/less/font/summernote.woff → src/styles/font/summernote.woff b/src/less/font/summernote.woff → src/styles/font/summernote.woff
diff --git a/src/less/font/summernote.woff2 → src/styles/font/summernote.woff2 b/src/less/font/summernote.woff2 → src/styles/font/summernote.woff2
diff --git a/src/less/lite-ui/all.less → src/styles/lite-ui/all.less b/src/less/lite-ui/all.less → src/styles/lite-ui/all.less
diff --git a/src/less/lite-ui/btn-group.less → src/styles/lite-ui/btn-group.less b/src/less/lite-ui/btn-group.less → src/styles/lite-ui/btn-group.less
diff --git a/src/less/lite-ui/buttons.less → src/styles/lite-ui/buttons.less b/src/less/lite-ui/buttons.less → src/styles/lite-ui/buttons.less
diff --git a/src/less/lite-ui/common.less → src/styles/lite-ui/common.less b/src/less/lite-ui/common.less → src/styles/lite-ui/common.less
diff --git a/src/less/lite-ui/dropdown.less → src/styles/lite-ui/dropdown.less b/src/less/lite-ui/dropdown.less → src/styles/lite-ui/dropdown.less
diff --git a/src/less/lite-ui/form.less → src/styles/lite-ui/form.less b/src/less/lite-ui/form.less → src/styles/lite-ui/form.less
diff --git a/src/less/lite-ui/mixins.less → src/styles/lite-ui/mixins.less b/src/less/lite-ui/mixins.less → src/styles/lite-ui/mixins.less
diff --git a/src/less/lite-ui/mixins/buttons.less → src/styles/lite-ui/mixins/buttons.less b/src/less/lite-ui/mixins/buttons.less → src/styles/lite-ui/mixins/buttons.less
diff --git a/src/less/lite-ui/modal.less → src/styles/lite-ui/modal.less b/src/less/lite-ui/modal.less → src/styles/lite-ui/modal.less
diff --git a/src/less/lite-ui/popover.less → src/styles/lite-ui/popover.less b/src/less/lite-ui/popover.less → src/styles/lite-ui/popover.less
diff --git a/src/less/lite-ui/toolbar.less → src/styles/lite-ui/toolbar.less b/src/less/lite-ui/toolbar.less → src/styles/lite-ui/toolbar.less
diff --git a/src/less/lite-ui/tooltip.less → src/styles/lite-ui/tooltip.less b/src/less/lite-ui/tooltip.less → src/styles/lite-ui/tooltip.less
diff --git a/src/less/lite-ui/variables.less → src/styles/lite-ui/variables.less b/src/less/lite-ui/variables.less → src/styles/lite-ui/variables.less
diff --git a/src/less/summernote-bs4.less → src/styles/summernote-bs4.less b/src/less/summernote-bs4.less → src/styles/summernote-bs4.less
@@ -1,4 +1,4 @@
-@import './summernote.css';
+@import './summernote-icons.css';
 @import "elements.less";
 
 /* Theme Variables

diff --git a/src/less/summernote-bs4.scss → src/styles/summernote-bs4.scss b/src/less/summernote-bs4.scss → src/styles/summernote-bs4.scss
@@ -1,4 +1,4 @@
-@import './summernote.css';
+@import './summernote-icons.css';
 @import "elements.scss";
 
 /* Theme Variables

diff --git a/src/less/summernote.css → src/styles/summernote-icons.css b/src/less/summernote.css → src/styles/summernote-icons.css
diff --git a/src/less/summernote-lite.less → src/styles/summernote-lite.less b/src/less/summernote-lite.less → src/styles/summernote-lite.less
@@ -1,4 +1,4 @@
-@import './summernote.css';
+@import './summernote-icons.css';
 @import "elements.less";
 @import "lite-ui/all.less";
 

diff --git a/src/less/summernote.less → src/styles/summernote.less b/src/less/summernote.less → src/styles/summernote.less
@@ -1,4 +1,4 @@
-@import './summernote.css';
+@import './summernote-icons.css';
 @import "elements.less";
 
 /* Theme Variables

diff --git a/src/less/summernote.scss → src/styles/summernote.scss b/src/less/summernote.scss → src/styles/summernote.scss
@@ -1,4 +1,4 @@
-@import './summernote.css';
+@import './summernote-icons.css';
 @import "elements.scss";
 
 /* Theme Variables

diff --git a/src/summernote-bs3.html b/src/summernote-bs3.html
@@ -32,8 +32,9 @@
     <div class="container">
       <div style='float:right;'>
         <a href='bs4.html'>Bootstrap4</a>
+        /
         <a href='lite.html'>Lite</a>
-        -
+        /
         <a href="examples/">Example</a>
       </div>
       <h1>Summernote with Bootstrap 3 </h1>

diff --git a/src/summernote-bs4.html b/src/summernote-bs4.html
@@ -27,8 +27,9 @@
 <div class="container">
     <div style='float:right;'>
       <a href='index.html'>Bootstrap 3</a> 
+      /
       <a href='lite.html'>Lite</a>
-      -
+      /
       <a href="examples/">Example</a>
     </div>  
   <h1>Summernote with Bootstrap 4</h1>

diff --git a/src/summernote-lite.html b/src/summernote-lite.html
@@ -23,8 +23,9 @@
 <body>
   <div style='float:right;'>
     <a href='index.html'>Bootstrap 3</a> 
+    /
     <a href='bs4.html'>Bootstrap 4</a>
-    -
+    /
     <a href="examples/">Example</a>
   </div>  
   <h1>Summernote standalone</h1>