Merge branch 'dev' of https://github.com/microweber/microweber into dev

microweber · Feb 23, 2022 · cc5947c · cc5947c
2 parents d63ebe6 + de66737
commit cc5947c
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 22 deletions.
diff --git a/userfiles/modules/microweber/api/libs/bootstrap5/js/bootstrap.bundle.js b/userfiles/modules/microweber/api/libs/bootstrap5/js/bootstrap.bundle.js
@@ -6724,4 +6724,4 @@
   return index_umd;
 
 })));
-//# sourceMappingURL=bootstrap.bundle.js.map
+//$xsourceMappingURL=bootstrap.bundle.js.map
diff --git a/userfiles/modules/microweber/api/libs/bootstrap5/js/bootstrap.esm.js b/userfiles/modules/microweber/api/libs/bootstrap5/js/bootstrap.esm.js
@@ -4943,4 +4943,4 @@ class Toast extends BaseComponent {
 defineJQueryPlugin(Toast);
 
 export { Alert, Button, Carousel, Collapse, Dropdown, Modal, Offcanvas, Popover, ScrollSpy, Tab, Toast, Tooltip };
-//# sourceMappingURL=bootstrap.esm.js.map
+//$xsourceMappingURL=bootstrap.esm.js.map
diff --git a/userfiles/modules/microweber/api/libs/bootstrap5/js/bootstrap.esm.min.js b/userfiles/modules/microweber/api/libs/bootstrap5/js/bootstrap.esm.min.js
diff --git a/userfiles/modules/microweber/api/libs/bootstrap5/js/bootstrap.js b/userfiles/modules/microweber/api/libs/bootstrap5/js/bootstrap.js
@@ -4992,4 +4992,4 @@
   return index_umd;
 
 })));
-//# sourceMappingURL=bootstrap.js.map
+//$xsourceMappingURL=bootstrap.js.map
diff --git a/userfiles/modules/microweber/api/libs/bootstrap5/js/bootstrap.min.js b/userfiles/modules/microweber/api/libs/bootstrap5/js/bootstrap.min.js
diff --git a/userfiles/modules/microweber/api/libs/codemirror/codemirror.min.js b/userfiles/modules/microweber/api/libs/codemirror/codemirror.min.js
diff --git a/userfiles/modules/microweber/api/libs/codemirror/css.min.js b/userfiles/modules/microweber/api/libs/codemirror/css.min.js
diff --git a/userfiles/modules/microweber/api/libs/codemirror/htmlmixed.min.js b/userfiles/modules/microweber/api/libs/codemirror/htmlmixed.min.js
diff --git a/userfiles/modules/microweber/api/libs/codemirror/php.min.js b/userfiles/modules/microweber/api/libs/codemirror/php.min.js
diff --git a/userfiles/modules/microweber/api/liveedit/modules.toolbar.js b/userfiles/modules/microweber/api/liveedit/modules.toolbar.js
@@ -6,6 +6,26 @@ mw.liveedit.modulesToolbar = {
             if(!document.body.classList.contains('dragStart')/* && !this.classList.contains('module-item-layout')*/) {
                 if(this.classList.contains('module-item-layout')) {
 
+
+                    /**/
+
+                    var node = Array.from(document.querySelectorAll('.edit .module-layouts')).pop()
+                    if(node) {
+                        mw.element(node)['after'](this.outerHTML);
+                        var next = this.nextElementSibling;
+                        mw.tools.scrollTo(next, undefined, )
+
+                        setTimeout(function (){
+                            mw.drag.load_new_modules();
+
+                            mw.wysiwyg.change(node.lastElementChild)
+                        }, 78)
+                    }
+
+                    return;
+
+                    /**/
+
                     var el = mw.liveEditSelector.selected[0];
                     var action = 'after';
                     var all;

diff --git a/userfiles/modules/microweber/css/wysiwyg.css b/userfiles/modules/microweber/css/wysiwyg.css
@@ -220,12 +220,14 @@
     top: -9999px;
     visibility: hidden;
     z-index: 1003;
-    /*width: 250px;
-    height: 68px;*/
-    box-shadow: 0 2px 22px rgba(0,0,0,.2);
+    box-shadow: rgba(60, 64, 67, 0.3) 0px 1px 2px 0px, rgba(60, 64, 67, 0.15) 0px 2px 6px 2px;
     background: #F5F5F5;
-    border-radius: 1px;
+
     margin-left: 12px;
+
+    border-radius: 3px;
+    border: 1px solid #cccccc82;
+    box-shadow: rgb(0 0 0 / 9%) 0px 3px 12px;
 }
 
 #font_family_selector_small {
@@ -250,16 +252,17 @@
     margin-right: 1px;
 }
 
-.mw_small_editor_bottom,
-.mw_small_editor_top {
-    padding: 12px;
+/*.mw_small_editor_bottom{
+    padding: 5px 10px 10px;
 }
-.mw_small_editor_top{
-    padding-bottom: 6px;
+.mw_small_editor_top {
+    padding: 10px 10px 5px;
+}*/
+.mw_small_editor_top {
+    border-bottom:  1px solid #cccccc82;
 }
-
-.mw_small_editor_bottom{
-    padding-top: 6px;
+.mw_small_editor_bottom, .mw_small_editor_top {
+    padding: 10px ;
 }
 
 

diff --git a/userfiles/modules/pictures/templates/shop-inner-templates.php b/userfiles/modules/pictures/templates/shop-inner-templates.php
@@ -4,7 +4,7 @@
 
 type: layout
 
-name: Shop Inner
+name: Shop Inner For Templates
 
 description: Default skin for shop inner of the templates