Explorar el Código

Ticket #4847 - Studio: Layout changes. Stage 3.

AntonLV hace 1 año
padre
commit
b166692c46

+ 0 - 10
studio/template/css/general.css

@@ -189,7 +189,6 @@ div.bx-std-pmen-item a,
 div.bx-std-pmen-item .sys-icon {
 div.bx-std-pmen-item .sys-icon {
     color: #595959;
     color: #595959;
 }
 }
-
 div.bx-std-pmen-item a {
 div.bx-std-pmen-item a {
     position: relative;
     position: relative;
     display: block;
     display: block;
@@ -199,15 +198,10 @@ div.bx-std-pmen-item a {
     text-decoration: none;
     text-decoration: none;
     color: rgba(55, 65, 81, 1);
     color: rgba(55, 65, 81, 1);
 }
 }
-
 div.bx-std-pmen-item .sys-icon {
 div.bx-std-pmen-item .sys-icon {
     font-size: 1.0rem;
     font-size: 1.0rem;
     color: #ffffff;
     color: #ffffff;
 }
 }
-
-div.bx-std-pmen-item svg g {
-    opacity: 0.7;
-}
 div.bx-std-pmen-item:hover,
 div.bx-std-pmen-item:hover,
 div.bx-std-pmen-item.bx-menu-tab-active {
 div.bx-std-pmen-item.bx-menu-tab-active {
     background-color: rgba(243, 244, 246, 1);
     background-color: rgba(243, 244, 246, 1);
@@ -225,10 +219,6 @@ div.bx-std-pmen-item.bx-menu-tab-active a {
     color: rgba(17, 24, 39, 1);
     color: rgba(17, 24, 39, 1);
 }
 }
 
 
-div.bx-std-pmen-item:hover svg g,
-div.bx-std-pmen-item.bx-menu-tab-active svg g {
-    opacity: 0.85;
-}
 /*--- Icons ---*/
 /*--- Icons ---*/
 img.bx-item-icon,
 img.bx-item-icon,
 svg.bx-item-icon{
 svg.bx-item-icon{

+ 1 - 1
studio/template/images/icons/mi-qrcode.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" color="#ffffff" fill="none">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" color="currentColor" fill="none">
     <path d="M3 6C3 4.58579 3 3.87868 3.43934 3.43934C3.87868 3 4.58579 3 6 3C7.41421 3 8.12132 3 8.56066 3.43934C9 3.87868 9 4.58579 9 6C9 7.41421 9 8.12132 8.56066 8.56066C8.12132 9 7.41421 9 6 9C4.58579 9 3.87868 9 3.43934 8.56066C3 8.12132 3 7.41421 3 6Z" stroke="currentColor" stroke-width="1.5" />
     <path d="M3 6C3 4.58579 3 3.87868 3.43934 3.43934C3.87868 3 4.58579 3 6 3C7.41421 3 8.12132 3 8.56066 3.43934C9 3.87868 9 4.58579 9 6C9 7.41421 9 8.12132 8.56066 8.56066C8.12132 9 7.41421 9 6 9C4.58579 9 3.87868 9 3.43934 8.56066C3 8.12132 3 7.41421 3 6Z" stroke="currentColor" stroke-width="1.5" />
     <path d="M3 18C3 16.5858 3 15.8787 3.43934 15.4393C3.87868 15 4.58579 15 6 15C7.41421 15 8.12132 15 8.56066 15.4393C9 15.8787 9 16.5858 9 18C9 19.4142 9 20.1213 8.56066 20.5607C8.12132 21 7.41421 21 6 21C4.58579 21 3.87868 21 3.43934 20.5607C3 20.1213 3 19.4142 3 18Z" stroke="currentColor" stroke-width="1.5" />
     <path d="M3 18C3 16.5858 3 15.8787 3.43934 15.4393C3.87868 15 4.58579 15 6 15C7.41421 15 8.12132 15 8.56066 15.4393C9 15.8787 9 16.5858 9 18C9 19.4142 9 20.1213 8.56066 20.5607C8.12132 21 7.41421 21 6 21C4.58579 21 3.87868 21 3.43934 20.5607C3 20.1213 3 19.4142 3 18Z" stroke="currentColor" stroke-width="1.5" />
     <path d="M3 12L9 12" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
     <path d="M3 12L9 12" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />

+ 1 - 1
studio/template/images/icons/mi-wrench.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" color="#ffffff" fill="none">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" color="currentColor" fill="none">
     <path d="M20.3584 13.3567C19.1689 14.546 16.9308 14.4998 13.4992 14.4998C11.2914 14.4998 9.50138 12.7071 9.50024 10.4993C9.50024 7.07001 9.454 4.83065 10.6435 3.64138C11.8329 2.45212 12.3583 2.50027 17.6274 2.50027C18.1366 2.49809 18.3929 3.11389 18.0329 3.47394L15.3199 6.18714C14.6313 6.87582 14.6294 7.99233 15.3181 8.68092C16.0068 9.36952 17.1234 9.36959 17.8122 8.68109L20.5259 5.96855C20.886 5.60859 21.5019 5.86483 21.4997 6.37395C21.4997 11.6422 21.5479 12.1675 20.3584 13.3567Z" stroke="currentColor" stroke-width="1.5" />
     <path d="M20.3584 13.3567C19.1689 14.546 16.9308 14.4998 13.4992 14.4998C11.2914 14.4998 9.50138 12.7071 9.50024 10.4993C9.50024 7.07001 9.454 4.83065 10.6435 3.64138C11.8329 2.45212 12.3583 2.50027 17.6274 2.50027C18.1366 2.49809 18.3929 3.11389 18.0329 3.47394L15.3199 6.18714C14.6313 6.87582 14.6294 7.99233 15.3181 8.68092C16.0068 9.36952 17.1234 9.36959 17.8122 8.68109L20.5259 5.96855C20.886 5.60859 21.5019 5.86483 21.4997 6.37395C21.4997 11.6422 21.5479 12.1675 20.3584 13.3567Z" stroke="currentColor" stroke-width="1.5" />
     <path d="M13.5 14.5L7.32842 20.6716C6.22386 21.7761 4.433 21.7761 3.32843 20.6716C2.22386 19.567 2.22386 17.7761 3.32843 16.6716L9.5 10.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
     <path d="M13.5 14.5L7.32842 20.6716C6.22386 21.7761 4.433 21.7761 3.32843 20.6716C2.22386 19.567 2.22386 17.7761 3.32843 16.6716L9.5 10.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
     <path d="M5.50896 18.5H5.5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
     <path d="M5.50896 18.5H5.5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />

+ 11 - 14
studio/template/scripts/BxBaseStudioBuilderPage.php

@@ -503,29 +503,29 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
             )
             )
         );
         );
 
 
-        $aMenu = array(
-            BX_DOL_STUDIO_BP_SKELETONS => array(
+        $aMenu = [
+            BX_DOL_STUDIO_BP_SKELETONS => [
                 'name' => BX_DOL_STUDIO_BP_SKELETONS,
                 'name' => BX_DOL_STUDIO_BP_SKELETONS,
                 'icon' => 'mi-qrcode.svg',
                 'icon' => 'mi-qrcode.svg',
                 'icon_bg' => true,
                 'icon_bg' => true,
                 'title' => '_sys_block_types_skeletons',
                 'title' => '_sys_block_types_skeletons',
                 'selected' => $sSelected == BX_DOL_STUDIO_BP_SKELETONS,
                 'selected' => $sSelected == BX_DOL_STUDIO_BP_SKELETONS,
-            ),
-            BX_DOL_STUDIO_MODULE_SYSTEM => array(
+            ],
+            BX_DOL_STUDIO_MODULE_SYSTEM => [
                 'name' => BX_DOL_STUDIO_MODULE_SYSTEM,
                 'name' => BX_DOL_STUDIO_MODULE_SYSTEM,
                 'icon' => 'mi-cog.svg',
                 'icon' => 'mi-cog.svg',
                 'icon_bg' => true,
                 'icon_bg' => true,
                 'title' => '_sys_block_types_system',
                 'title' => '_sys_block_types_system',
                 'selected' => $sSelected == BX_DOL_STUDIO_MODULE_SYSTEM,
                 'selected' => $sSelected == BX_DOL_STUDIO_MODULE_SYSTEM,
-            ),
-            BX_DOL_STUDIO_MODULE_CUSTOM => array(
+            ],
+            BX_DOL_STUDIO_MODULE_CUSTOM => [
                 'name' => BX_DOL_STUDIO_MODULE_CUSTOM,
                 'name' => BX_DOL_STUDIO_MODULE_CUSTOM,
                 'icon' => 'mi-wrench.svg',
                 'icon' => 'mi-wrench.svg',
                 'icon_bg' => true,
                 'icon_bg' => true,
                 'title' => '_sys_block_types_custom',
                 'title' => '_sys_block_types_custom',
                 'selected' => $sSelected == BX_DOL_STUDIO_MODULE_CUSTOM,
                 'selected' => $sSelected == BX_DOL_STUDIO_MODULE_CUSTOM,
-            )
-        );
+            ]
+        ];
 
 
         $aModules = BxDolModuleQuery::getInstance()->getModulesBy(['type' => 'type', 'value' => [BX_DOL_MODULE_TYPE_MODULE, BX_DOL_MODULE_TYPE_TEMPLATE]]);
         $aModules = BxDolModuleQuery::getInstance()->getModulesBy(['type' => 'type', 'value' => [BX_DOL_MODULE_TYPE_MODULE, BX_DOL_MODULE_TYPE_TEMPLATE]]);
         $aModulesWithBlocks = $this->oDb->getModulesWithCopyableBlocks();
         $aModulesWithBlocks = $this->oDb->getModulesWithCopyableBlocks();
@@ -546,16 +546,13 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
         foreach($aMenu as $sKey => $aItem)
         foreach($aMenu as $sKey => $aItem)
             $aMenu[$sKey]['onclick'] =  $sJsObject . '.onChangeModule(\'' . $aItem['name'] . '\', this);';
             $aMenu[$sKey]['onclick'] =  $sJsObject . '.onChangeModule(\'' . $aItem['name'] . '\', this);';
 
 
-        $oMenu = new BxTemplStudioMenu(array('template' => 'menu_side.html', 'menu_items' => $aMenu));
-        $oMenu->setInlineIcons(false);
+        $oMenu = new BxTemplStudioMenu(['template' => 'menu_side.html', 'menu_items' => $aMenu]);
 
 
-        $aTmplParams = array(
+        $aForm['inputs']['blocks']['content'] = $oTemplate->parseHtmlByName('bp_add_block_form.html', [
             'menu' => $oMenu->getCode(),
             'menu' => $oMenu->getCode(),
             'html_block_lists_id' => $this->aHtmlIds['block_lists_id'],
             'html_block_lists_id' => $this->aHtmlIds['block_lists_id'],
             'blocks' => $this->getBlockList($sSelected)
             'blocks' => $this->getBlockList($sSelected)
-        );
-
-        $aForm['inputs']['blocks']['content'] = $oTemplate->parseHtmlByName('bp_add_block_form.html', $aTmplParams);
+        ]);
 
 
         $oForm = new BxTemplStudioFormView($aForm);
         $oForm = new BxTemplStudioFormView($aForm);
         $oForm->initChecker();
         $oForm->initChecker();