Merge branch 'master' of https://github.com/unacms/una

inc/classes/BxDolTemplate.php

@@ -3243,7 +3243,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
         $aLocationsList = array_reverse($this->_aLocations, true);
         $aLocationsGrouped = ['mod' => [], 'sys' => []];
         foreach($aLocationsList as $sLocation => $aLocation) {
-            if($sLocation == 'system')
+            if(in_array($sLocation, ['system', 'studio']))
                 $aLocationsGrouped['sys'][$sLocation] = $aLocation;
             else
                 $aLocationsGrouped['mod'][$sLocation] = $aLocation;

inc/js/classes/BxDolPage.js

@@ -138,6 +138,7 @@ BxDolPage.prototype.creativeEdit = function(oLink, iBlockId)
 
 
     var sContainer = 'bx-cc-' + iBlockId;
+    var iContainerHeight = $('#' + sContainer).height();
     this._oCreativeEditor = grapesjs.init({
         // Indicate where to init the editor. You can also pass an HTMLElement
         container: '#' + sContainer,
@@ -148,7 +149,7 @@ BxDolPage.prototype.creativeEdit = function(oLink, iBlockId)
             'grapesjs-preset-webpage': {}
         },
 
-        height: $('#' + sContainer).height(),
+        height: iContainerHeight > 800 ? iContainerHeight : 800,
 /*
         blockManager: {
             appendTo: '.bx-c-blocks',

studio/template/css/common.less

@@ -59,25 +59,25 @@ a:hover > .sys-icon-a i {
     width: 50rem;
 }
 .bx-popup-border {
-	border: 1px solid rgba(40, 60, 80, 0.1);
-	.radius(3px);
+    border: 1px solid rgba(40, 60, 80, 0.1);
+    .radius(3px);
 }
 .bx-popup-color-bg {
-	background-color: rgba(255, 255, 255, 1);
+    background-color: rgba(255, 255, 255, 1);
 }
 .bx-popup-content-indent {
-	padding: 1.25rem;
+    padding: 1.25rem;
 }
 .bx-popup-header {
-	padding: 1.25rem;
+    padding: 1.25rem;
 }
 .bx-popup-header-color-bg {
-	background-color: rgba(40, 60, 80, 0.9);
+    background-color: rgba(40, 60, 80, 0.9);
 }
 .bx-popup-header h2 {
-	font-family: sans-serif;
-	font-size: 1.5rem;
-	color: rgba(255, 255, 255, 1);
+    font-family: sans-serif;
+    font-size: 1.5rem;
+    color: rgba(255, 255, 255, 1);
 }
 
 
@@ -85,33 +85,54 @@ a:hover > .sys-icon-a i {
 .bx-btn,
 .bx-btn.bx-btn-primary {
     .box-sizing(border-box);
-    height: 36px;
+
     height: 2.4rem;
 
-    .background-color(rgba(68, 134, 244, 1.0));
+    .radius(6px);
 
-    .radius(4px);
+    -webkit-box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.08);
+    -moz-box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.08);
+    box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.08);
 
     text-shadow: none;
 
-    font-family: 'Helvetica Neue' ,sans-serif;
-    font-size: 1.075rem;
-    font-weight: 400;
-    color: rgba(251, 252, 253, 1.0);
+    font-family: sans-serif;
+    font-size: 0,875rem;
+    font-weight: 500;
+}
+.bx-btn {
+    border: 1px solid rgba(228, 228, 231, 1.0);
+    .background-color(rgba(255, 255, 255, 1.0));
+    color: rgba(82, 82, 91, 1.0);
+}
+.bx-btn.bx-btn-primary {
     border-width: 0px;
+    .background-color(rgba(68, 134, 244, 1.0));
+    color: rgba(251, 252, 253, 1.0);
+}
+
+.bx-btn:not(.bx-btn-primary):hover,
+.bx-btn:not(.bx-btn-primary):active {
+    border: 1px solid rgba(228, 228, 231, 0.8);
+    .background-color(rgba(255, 255, 255, 1.0));
+    color: rgba(82, 82, 91, 0.8);
 }
-.bx-btn:hover,
-.bx-btn:active,
+.bx-btn:not(.bx-btn-primary) .sys-icon:not(.sys-colored) {
+    color: rgba(82, 82, 91, 1.0);
+}
+.bx-btn:not(.bx-btn-primary):hover .sys-icon:not(.sys-colored),
+.bx-btn:not(.bx-btn-primary):active .sys-icon:not(.sys-colored) {
+    color: rgba(82, 82, 91, 0.8);
+}
+
 .bx-btn.bx-btn-primary:hover,
 .bx-btn.bx-btn-primary:active {
     .background-color(rgba(68, 134, 244, 0.8));
     color: rgba(251, 252, 253, 1.0);
 }
-.bx-btn .sys-icon:not(.sys-colored) {
+.bx-btn.bx-btn-primary .sys-icon:not(.sys-colored) {
     color: rgba(255, 255, 255, 0.9);
 }
-.bx-btn:hover .sys-icon:not(.sys-colored),
-.bx-btn:active .sys-icon:not(.sys-colored),
 .bx-btn.bx-btn-primary:hover .sys-icon:not(.sys-colored),
 .bx-btn.bx-btn-primary:active .sys-icon:not(.sys-colored) {
     color: rgba(255, 255, 255, 1);
@@ -119,51 +140,26 @@ a:hover > .sys-icon-a i {
 
 /* button small */
 .bx-btn.bx-btn-small {
-	.box-sizing(content-box);
-
-	height: 24px;
-	height: 1.5rem;
-	line-height: 24px;
-	line-height: 1.5rem;
-
-	.background-color (rgba(40, 60, 80, 0.8));
-
-	border: 1px solid rgba(20, 40, 60, 0.8);
-	.radius(3px);
+    .box-sizing(border-box);
 
-	-webkit-box-shadow: 0px 0px 0px 1px rgba(0,0,0,0.1);;
-	-moz-box-shadow: 0px 0px 0px 1px rgba(0,0,0,0.1);;
-	box-shadow: 0px 0px 0px 1px rgba(0,0,0,0.1);;
+    height: 1.5rem;
+    line-height: 1.5rem;
 
-	text-shadow: none;
+    .radius(4px);
 
-	font-family: sans-serif;
-	font-size: 0.75rem;
-	font-weight: 400;
-	color: rgba(255, 255, 255, 0.9);
-}
-.bx-btn.bx-btn-small:hover,
-.bx-btn.bx-btn-small:active {
-	border: 1px solid rgba(20, 40, 60, 0.9);
-	.background-color (rgba(40, 60, 80, 0.9));
+    text-shadow: none;
 
-	color: rgba(255, 255, 255, 1);
-}
-.bx-btn.bx-btn-small .sys-icon {
-	color: rgba(255, 255, 255, 0.9);
-}
-.bx-btn.bx-btn-small:hover .sys-icon,
-.bx-btn.bx-btn-small:active .sys-icon {
-	color: rgba(255, 255, 255, 1);
+    font-family: sans-serif;
+    font-size: 0.75rem;
+    font-weight: 400;
 }
 
-
 /**
  * General
  */
 div.bx-db-note {
-	position: relative;
-	float: left;
-	line-height: 40px;
-	font-size: 11px;
+    position: relative;
+    float: left;
+    line-height: 40px;
+    font-size: 11px;
 }

studio/template/css/page.css

@@ -91,8 +91,7 @@ div.bx-std-block-panel-bottom .bx-std-pt-cnt {
 /**
  * Builder based blocks
  */
-
-.bx-page-block-container {
+.bx-layout-wrapper {
     padding-top: 1.875rem;
     padding-bottom: 0;
 }

studio/template/designbox_11.html

@@ -0,0 +1,8 @@
+<!-- Design Box 11 [start]: Content + title + background + padding -->
+<div class="bx-db-container bx-def-color-bg-block rounded-3xl">
+    <div class="bx-db-header px-3 md:px-4 pt-2 md:pt-3">
+        <div class="bx-db-title">__title__</div>__caption_item__
+    </div>
+    <div class="bx-db-content bx-content-padding-block relative">__designbox_content__</div>
+</div>
+<!-- Design Box 11 [ end ] -->

studio/template/scripts/BxBaseStudioFormsForms.php

@@ -20,6 +20,7 @@ class BxBaseStudioFormsForms extends BxDolStudioFormsForms
 
         $this->_aOptions['actions_single']['edit']['attr']['title'] = _t('_adm_form_btn_forms_edit');
 
+        $this->_sFilter = '';
         if(($sFilter = $this->_getFilterValue()))
             $this->_sFilter = $sFilter;
 

studio/template/scripts/BxBaseStudioFormsPreLists.php

@@ -21,6 +21,7 @@ class BxBaseStudioFormsPreLists extends BxDolStudioFormsPreLists
         $this->_aOptions['actions_single']['edit']['attr']['title'] = _t('_adm_form_btn_pre_lists_edit');
         $this->_aOptions['actions_single']['delete']['attr']['title'] = _t('_adm_form_btn_pre_lists_delete');
 
+        $this->_sFilter = '';
         if(($sFilter = $this->_getFilterValue()))
             $this->_sFilter = $sFilter;
 

studio/template/scripts/BxBaseStudioFormsSearchForms.php

@@ -21,6 +21,7 @@ class BxBaseStudioFormsSearchForms extends BxDolStudioFormsSearchForms
 
         $this->_aOptions['actions_single']['edit']['attr']['title'] = _t('_adm_form_btn_search_forms_edit');
 
+        $this->_sFilter = '';
         if(($sFilter = $this->_getFilterValue()))
             $this->_sFilter = $sFilter;
 

studio/template/scripts/BxBaseStudioGridNavigation.php

@@ -16,6 +16,7 @@ class BxBaseStudioGridNavigation extends BxTemplStudioGrid
     {
         parent::__construct($aOptions, $oTemplate);
 
+        $this->_sFilter = '';
         if(($sFilter = $this->_getFilterValue()))
             $this->_sFilter = $sFilter;
     }