Ticket #2095 - related changes in Decorous

modules/boonex/decorous/data/template/system/_sub_header.html

@@ -27,19 +27,18 @@
             <bx_menu:sys_site />
 	        <div class="content-wrapper-wrp">
 		        <div class="content-wrapper bx-def-box-sizing">
-					<bx_injection:injection_between_cover_logo />
-				
+                                    <bx_injection:injection_between_cover_logo />
 				    __cover__
-					
-					<bx_injection:injection_between_cover_top_menu />
-					
+                                    <bx_injection:injection_between_cover_top_menu />
+				    <div class="bx-menu-main-bar-gap bx-def-centered bx-def-padding-leftright bx-def-page-width bx-def-box-sizing">
 					<div id="bx-menu-main-bar-wrapper" class="bx-menu-main-bar-wrapper bx-def-color-bg-sec">
-					    <div id="bx-menu-main-bar" class="bx-menu-main-bar bx-def-padding-sec-leftright bx-def-box-sizing">
+					    <div id="bx-menu-main-bar" class="bx-menu-main-bar">
 					        <bx_injection:injection_top_menu_before />
 				        	<bx_menu:sys_site_submenu />
 					        <bx_injection:injection_top_menu_after />
 					    </div>
 					</div>
+                                    </div>
 					
 					<bx_injection:injection_between_content_menu />
 				

modules/boonex/decorous/data/template/system/css/default.less

@@ -353,8 +353,7 @@ a.bx-def-font-h3:hover {
 }
 
 /* cover */
-.bx-menu-toolbar-padding,
-.bx-menu-toolbar-padding .bx-cover-wrapper {
+.bx-menu-toolbar-padding .bx-def-cover-color-bg {
     background-color: @bx-color-cover;
 }
 

modules/boonex/decorous/data/template/system/css/menu.css

@@ -168,3 +168,10 @@
 	display: block;
     width: 100%;
 }
+
+/*--- Custom Menu with More Auto ---*/
+.bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-submenu-more-auto .bx-menu-item a,
+.bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-submenu-more-auto .bx-menu-item .bx-btn,
+.bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-submenu-more-auto .bx-menu-item .bx-btn .sys-icon {
+    color: inherit;
+}

modules/boonex/decorous/data/template/system/scripts/BxTemplConfig.php

@@ -124,6 +124,7 @@ class BxTemplConfig extends BxBaseConfig
         if($this->_isModule) {
             $this->_aConfig['aLessConfig']['bx-color-hl'] = $this->_setColorRgba($sName . '_general_item_bg_color_hover', 'rgba(196, 248, 156, 0.2)');
             $this->_aConfig['aLessConfig']['bx-color-active'] = $this->_setColorRgba($sName . '_general_item_bg_color_active', 'rgba(196, 248, 156, 0.4)');
+            $this->_aConfig['aLessConfig']['bx-color-disabled'] = $this->_setColorRgba($sName . '_general_item_bg_color_disabled', 'rgba(221, 221, 221, 1.0)');
         }
 
         $this->_aConfig['aLessConfig']['bx-color-header'] = $this->_setColorRgba($sName . '_header_bg_color', 'rgba(59, 134, 134, 1)');

modules/boonex/decorous/install/langs/en.xml

@@ -9,6 +9,7 @@
 	<string name="_bx_decorous_stg_cpt_category_styles_general"><![CDATA[General]]></string>
 	<string name="_bx_decorous_stg_cpt_option_general_item_bg_color_hover"><![CDATA[On-hover item background color]]></string>
 	<string name="_bx_decorous_stg_cpt_option_general_item_bg_color_active"><![CDATA[Active item background color]]></string>
+        <string name="_bx_decorous_stg_cpt_option_general_item_bg_color_disabled"><![CDATA[Disabled item background color]]></string>
 
 	<string name="_bx_decorous_stg_cpt_category_styles_header"><![CDATA[Header]]></string>
 	<string name="_bx_decorous_stg_cpt_option_header_height"><![CDATA[Height]]></string>

modules/boonex/decorous/install/sql/install.sql

@@ -22,7 +22,8 @@ SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
 (@iCategoryId, CONCAT(@sName, '_general_item_bg_color_hover'), '_bx_decorous_stg_cpt_option_general_item_bg_color_hover', 'rgba(210, 230, 250, 0.2)', 'rgba', '', '', '', 1),
-(@iCategoryId, CONCAT(@sName, '_general_item_bg_color_active'), '_bx_decorous_stg_cpt_option_general_item_bg_color_active', 'rgba(210, 230, 250, 0.4)', 'rgba', '', '', '', 2);
+(@iCategoryId, CONCAT(@sName, '_general_item_bg_color_active'), '_bx_decorous_stg_cpt_option_general_item_bg_color_active', 'rgba(210, 230, 250, 0.4)', 'rgba', '', '', '', 2),
+(@iCategoryId, CONCAT(@sName, '_general_item_bg_color_disabled'), '_bx_decorous_stg_cpt_option_general_item_bg_color_disabled', 'rgba(221, 221, 221, 1.0)', 'rgba', '', '', '', 3);
 
 
 -- SETTINGS: Decorous template Styles Header

modules/boonex/russian/data/langs/bx_decorous/ru.xml

@@ -9,6 +9,7 @@
 	<string name="_bx_decorous_stg_cpt_category_styles_general"><![CDATA[Общие]]></string>
 	<string name="_bx_decorous_stg_cpt_option_general_item_bg_color_hover"><![CDATA[Цвет фона пункта при наведении курсора]]></string>
 	<string name="_bx_decorous_stg_cpt_option_general_item_bg_color_active"><![CDATA[Цвет фона активного пункта]]></string>
+        <string name="_bx_decorous_stg_cpt_option_general_item_bg_color_disabled"><![CDATA[Цвет фона не активного пункта]]></string>
 
 	<string name="_bx_decorous_stg_cpt_category_styles_header"><![CDATA[Заголовок]]></string>
 	<string name="_bx_decorous_stg_cpt_option_header_height"><![CDATA[Высота]]></string>