Jelajahi Sumber

Ticket #3399 - Menus.

AntonLV 5 tahun lalu
induk
melakukan
3d7883610e

+ 0 - 6
modules/boonex/artificer/data/template/system/css/menu.css

@@ -3,12 +3,6 @@ import url(../../../../../../../template/css/menu.css);
 --*/
 --*/
 
 
 /* --- Horizontal menu ---*/
 /* --- Horizontal menu ---*/
-.bx-menu-hor li.bx-menu-tab-active a,
-.bx-menu-custom-hor li.bx-menu-tab-active a {
-    font-weight: 600;
-    color: #000;
-}
-
 .bx-menu-custom.bx-menu-custom-hor.bx-menu-more-auto .bx-menu-item {
 .bx-menu-custom.bx-menu-custom-hor.bx-menu-more-auto .bx-menu-item {
     padding: 0 0.5rem;
     padding: 0 0.5rem;
 }
 }

+ 1 - 1
modules/boonex/artificer/data/template/system/menu_account_popup.html

@@ -1,4 +1,4 @@
-<div id="bx-sliding-menu-account" class="bx-sliding-menu-main bx-sliding-menu-fullheight bx-def-z-index-nav ring-1 ring-gray-200 dark:ring-gray-700 bg-gray-50 dark:bg-gray-800 shadow-sm rounded-bl" style="display:none; opacity:1;">
+<div id="bx-sliding-menu-account" class="bx-sliding-menu-main bx-sliding-menu-fullheight bx-def-z-index-nav border-l border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-800 shadow-sm rounded-bl" style="display:none; opacity:1;">
     <div class="bx-sliding-menu-main-cnt">
     <div class="bx-sliding-menu-main-cnt">
         <a class="bx-sliding-menu-close mt-2 mr-4 text-3xl" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
         <a class="bx-sliding-menu-close mt-2 mr-4 text-3xl" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
 
 

+ 1 - 1
modules/boonex/artificer/data/template/system/menu_loading.html

@@ -1,4 +1,4 @@
-<div id="bx-sliding-menu-loading" class="bx-sliding-menu bx-sliding-menu-fullheight bx-def-z-index-nav bg-gray-50 dark:bg-gray-800" style="display:none; opacity:1;">
+<div id="bx-sliding-menu-loading" class="bx-sliding-menu bx-sliding-menu-fullheight bx-def-z-index-nav border-l border-b border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-800 shadow-sm rounded-bl" style="display:none; opacity:1;">
     <div class="bx-def-centered">
     <div class="bx-def-centered">
         <a class="bx-sliding-menu-close mt-2 mr-4 text-3xl" href="javascript:void(0);" onclick="bx_menu_slide_inline($(this).parents('.bx-sliding-menu:visible:first'))"><i class="sys-icon times"></i></a>
         <a class="bx-sliding-menu-close mt-2 mr-4 text-3xl" href="javascript:void(0);" onclick="bx_menu_slide_inline($(this).parents('.bx-sliding-menu:visible:first'))"><i class="sys-icon times"></i></a>
         <div class="bx-sliding-menu-cnt p-4">
         <div class="bx-sliding-menu-cnt p-4">

+ 1 - 1
modules/boonex/artificer/data/template/system/menu_main_sliding.html

@@ -1,3 +1,3 @@
-<div id="__id__" class="__class__ bx-def-z-index-nav ring-1 ring-gray-200 dark:ring-gray-700 bg-gray-50 dark:bg-gray-800 shadow-sm rounded-bl" style="__style__">
+<div id="__id__" class="__class__ bx-def-z-index-nav border-l border-b border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-800 shadow-sm rounded-bl" style="__style__">
     <div class="bx-sliding-menu-main-cnt">__content__</div>
     <div class="bx-sliding-menu-main-cnt">__content__</div>
 </div>
 </div>

+ 16 - 2
modules/boonex/artificer/template/css/tailwind.css

@@ -4,12 +4,12 @@
 @tailwind utilities;
 @tailwind utilities;
 
 
 @layer components {
 @layer components {
-    /* defaults */
+    /* Defaults */
     .bx-def-hr {
     .bx-def-hr {
         @apply m-0 p-0 border-t border-gray-200 dark:border-gray-700;
         @apply m-0 p-0 border-t border-gray-200 dark:border-gray-700;
     }
     }
 
 
-    /* common elements */
+    /* Common elements: Buttons */
     .bx-btn {
     .bx-btn {
         @apply group relative inline-flex items-center box-border w-min h-8 px-2.5 rounded border border-gray-300 dark:border-gray-700 bg-white dark:bg-gray-800 text-base font-medium whitespace-nowrap text-gray-400 hover:text-gray-700 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-600 focus:border-blue-600;
         @apply group relative inline-flex items-center box-border w-min h-8 px-2.5 rounded border border-gray-300 dark:border-gray-700 bg-white dark:bg-gray-800 text-base font-medium whitespace-nowrap text-gray-400 hover:text-gray-700 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-600 focus:border-blue-600;
     }
     }
@@ -30,8 +30,22 @@
     .bx-btn.bx-btn-small {
     .bx-btn.bx-btn-small {
         @apply group relative inline-flex items-center box-border w-min h-7 px-2 rounded border border-gray-300 dark:border-gray-700 bg-white dark:bg-gray-800 text-xs font-medium whitespace-nowrap text-gray-400 hover:text-gray-700 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-600 focus:border-blue-600;
         @apply group relative inline-flex items-center box-border w-min h-7 px-2 rounded border border-gray-300 dark:border-gray-700 bg-white dark:bg-gray-800 text-xs font-medium whitespace-nowrap text-gray-400 hover:text-gray-700 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-600 focus:border-blue-600;
     }
     }
+    
+    /* Common elements: Menus */
+    .bx-menu-hor li.bx-menu-tab-active a,
+    .bx-menu-custom-hor li.bx-menu-tab-active a {
+        @apply text-gray-700 dark:text-gray-200 font-medium;
+    }
+
+    .bx-menu-custom-hor.bx-menu-object-sys_create_post li.bx-menu-tab-active a {
+        @apply rounded ring-1 ring-gray-200 dark:ring-gray-800;
+    }
 
 
     /* Timeline */
     /* Timeline */
+    .bx-menu-custom-hor.bx-menu-object-bx_timeline_menu_view li.bx-menu-tab-active a {
+        @apply rounded ring-1 ring-gray-200 dark:ring-gray-800;
+    }
+
     .bx-tl-view.bx-tl-view-timeline .bx-tl-cnt .bx-tl-items:before {
     .bx-tl-view.bx-tl-view-timeline .bx-tl-cnt .bx-tl-items:before {
         @apply bg-gray-200 dark:bg-gray-700;
         @apply bg-gray-200 dark:bg-gray-700;
     }
     }

File diff ditekan karena terlalu besar
+ 0 - 0
modules/boonex/artificer/template/css/tailwind.min.css


+ 3 - 11
template/scripts/BxBaseMenuCustom.php

@@ -10,23 +10,15 @@
 
 
 class BxBaseMenuCustom extends BxTemplMenuMoreAuto
 class BxBaseMenuCustom extends BxTemplMenuMoreAuto
 {
 {
-    protected static $_sTmplContentDefault;
-    protected static $_sTmplContentItemDefault;
-
     protected $_sTmplContent;
     protected $_sTmplContent;
     protected $_sTmplContentItem;
     protected $_sTmplContentItem;
-    
+
     public function __construct($aObject, $oTemplate = false)
     public function __construct($aObject, $oTemplate = false)
     {
     {
         parent::__construct($aObject, $oTemplate);
         parent::__construct($aObject, $oTemplate);
 
 
-        if(empty(self::$_sTmplContentDefault))
-            self::$_sTmplContentDefault = $this->_oTemplate->getHtml($this->getTemplateName());
-        $this->_sTmplContent = self::$_sTmplContentDefault;
-
-        if(empty(self::$_sTmplContentItemDefault))
-            self::$_sTmplContentItemDefault = $this->_oTemplate->getHtml($this->getTemplateNameItem());
-        $this->_sTmplContentItem = self::$_sTmplContentItemDefault;
+        $this->_sTmplContent = $this->_oTemplate->getHtml($this->getTemplateName());
+        $this->_sTmplContentItem = $this->_oTemplate->getHtml($this->getTemplateNameItem());
 
 
         $this->_sTmplNameItemMore = 'menu_custom_item_more.html';
         $this->_sTmplNameItemMore = 'menu_custom_item_more.html';
     }
     }

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini