Răsfoiți Sursa

Ticket #2095 - related changes in Lucid.

AntonLV 7 ani în urmă
părinte
comite
674c696d7f

+ 14 - 14
modules/boonex/lucid/data/template/system/_sub_header.html

@@ -32,25 +32,25 @@
 		<div class="cd-main-content bx-clearfix">
 	        <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-page-width bx-def-centered 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>
-					
-					<bx_injection:injection_between_content_menu />
-				
-					<div id="bx-content-wrapper" class="bx-content-wrapper">
-						__informer__
-						<div class="bx-page-wrapper bx-def-centered bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
-						    <div id="bx-content-container" class="bx-def-padding-sec-left bx-def-padding-sec-right">
-						        <bx_injection:injection_content_before />
-						        <div id="bx-content-main" class="bx-def-margin-sec-topbottom">
+                                    </div>
+
+                                    <bx_injection:injection_between_content_menu />
+
+                                    <div id="bx-content-wrapper" class="bx-content-wrapper">
+                                            __informer__
+                                            <div class="bx-page-wrapper bx-def-centered bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
+                                                <div id="bx-content-container" class="bx-def-padding-sec-left bx-def-padding-sec-right">
+                                                    <bx_injection:injection_content_before />
+                                                    <div id="bx-content-main" class="bx-def-margin-sec-topbottom">

+ 1 - 2
modules/boonex/lucid/data/template/system/css/default.less

@@ -350,8 +350,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;
 }
 

+ 2 - 2
modules/boonex/lucid/data/template/system/css/general.css

@@ -88,8 +88,8 @@
 }
 
 /*--- Page Submenu bar ---*/
-.bx-menu-main-bar-wrapper {
-	overflow: hidden;
+.bx-menu-main-bar {
+    overflow: hidden;
 }
 
 /*--- Main Page Content ---*/

+ 7 - 0
modules/boonex/lucid/data/template/system/css/menu.css

@@ -585,3 +585,10 @@ ul.bx-menu-toolbar li a .bx-menu-item-addon {
 .bx-menu-ver.bx-menu-object-sys_profile_stats li .bx-menu-addon-cnt.bx-def-color-bg-hl {
 	background-color: transparent;
 }
+
+/*--- 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;
+}

+ 1 - 1
modules/boonex/lucid/data/template/system/menu_main_submenu.html

@@ -1,4 +1,4 @@
-<div class="bx-menu-main-submenu-wrp bx-def-padding-sec-leftright">
+<div class="bx-menu-main-submenu-wrp">
 	<div class="bx-menu-main-submenu-group">
 		<ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-menu-object-__object__ bx-clearfix">
 		    <bx_repeat:menu_items>

+ 1 - 0
modules/boonex/lucid/data/template/system/scripts/BxTemplConfig.php

@@ -140,6 +140,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)');

+ 1 - 0
modules/boonex/lucid/install/langs/en.xml

@@ -9,6 +9,7 @@
 	<string name="_bx_lucid_stg_cpt_category_styles_general"><![CDATA[General]]></string>
 	<string name="_bx_lucid_stg_cpt_option_general_item_bg_color_hover"><![CDATA[On-hover item background color]]></string>
 	<string name="_bx_lucid_stg_cpt_option_general_item_bg_color_active"><![CDATA[Active item background color]]></string>
+        <string name="_bx_lucid_stg_cpt_option_general_item_bg_color_disabled"><![CDATA[Disabled item background color]]></string>
 
 	<string name="_bx_lucid_stg_cpt_category_styles_header"><![CDATA[Header]]></string>
 	<string name="_bx_lucid_stg_cpt_option_header_height"><![CDATA[Height]]></string>

+ 3 - 1
modules/boonex/lucid/install/sql/install.sql

@@ -22,7 +22,9 @@ 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_lucid_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_lucid_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_lucid_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_lucid_stg_cpt_option_general_item_bg_color_disabled', 'rgba(221, 221, 221, 1.0)', 'rgba', '', '', '', 3);
+
 
 
 -- SETTINGS: Lucid template Styles Header