Просмотр исходного кода

Ticket #3766 - Artificer template (part 3): Menus.

AntonLV 4 лет назад
Родитель
Сommit
36ea6b463f

+ 6 - 1
modules/boonex/artificer/data/template/system/css/vote.css

@@ -64,7 +64,12 @@ import url(../../../../../../../template/css/vote.css);
 .bx-vote-counter-wrapper-reactions .bx-vote-counter.bx-vc-hidden {
     display: none;
 }
-.bx-menu-object-sys_vote_reactions_do li .sys-icon {
+.bx-menu-object-sys_vote_reactions_do li.bx-menu-item {
+    padding: 0.25rem;
+}
+.bx-menu-object-sys_vote_reactions_do li.bx-menu-item .sys-icon {
+    width: 2rem;
+    height: 2rem;
     font-size: 1.5rem;
 }
 

+ 11 - 4
modules/boonex/artificer/data/template/system/menu_horizontal.html

@@ -1,7 +1,14 @@
-<ul class="bx-menu-hor bx-menu-object-__object__ flex flex-row">
+<ul class="bx-menu-hor bx-menu-object-__object__ flex flex-row space-x-1">
     <bx_repeat:menu_items>
-        <li class="bx-def-margin-right-auto __class_add__ __class__">
-            <a href="__link__" onclick="__onclick__"__attrs__><bx_include_auto:menu_icon.html /><bx_if:title><span>__title__</span></bx_if:title></a>
+        <li class="bx-menu-item __name__ __class_add__ __class__ bx-stl-mil group">
+            <a class="__name__ flex flex-2 items-center truncate" href="__link__" onclick="__onclick__"__attrs__>
+                <span class="bx-menu-item-icon bx-stl-mii group-hover:text-gray-700 dark:group-hover:text-gray-300">
+                    <bx_include_auto:menu_icon.html />
+                </span>
+                <bx_if:title>
+                    <span class="bx-menu-item-title bx-stl-mit">__title__</span>
+                </bx_if:title>
+            </a>
         </li>
     </bx_repeat:menu_items>
-</ul>
+</ul>

+ 0 - 29
modules/boonex/artificer/data/template/system/scripts/BxTemplVoteReactionsMenuDo.php

@@ -16,35 +16,6 @@ class BxTemplVoteReactionsMenuDo extends BxBaseVoteReactionsMenuDo
     {
         parent::__construct ($aObject, $oTemplate);
     }
-    
-    protected function getMenuItemsRaw()
-    {
-        $sJsObject = $this->_oObject->getJsObjectName();
-        $aReactions = $this->_oObject->getReactions(true);
-        $sDefault = $this->_oObject->getDefault();
-
-        $aMenuItems = array();        
-        foreach($aReactions as $sName => $aReaction) {
-            if($sName == $sDefault)
-                continue;
-
-            $sEmoji = $this->_oObject->getEmoji($sName);
-            
-            $aMenuItems[] = array(
-                'id' => $sName, 
-                'name' => $sName, 
-                'class' => 'group inline-flex items-center border border-transparent rounded-md space-x-1 text-gray-500 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-700 px-1', 
-                'link' => 'javascript:void(0)', 
-                'onclick' => 'javascript:' . $this->_oObject->getJsClickDo($sName, $this->_iValue), 
-                'target' => '_self', 
-                'title' => _t($aReaction['title']), 
-                'icon' => $sEmoji != '' ? $sEmoji : $this->_oObject->getIcon($sName), 
-                'active' => 1
-            );
-        }
-
-        return $aMenuItems;
-    }
 }
 
 /** @} */

+ 2 - 2
plugins_public/tailwind/css/tailwind.css

@@ -841,8 +841,8 @@
     .bx-artificer .bx-stl-mil-active {
         @apply active:bg-gray-300 dark:active:bg-black/50;
     }
-    .bx-artificer .bx-popup .bx-stl-mil,
-    .bx-artificer .bx-popup .bx-stl-mil-sm {
+    .bx-artificer .bx-popup ul:not(.bx-menu-hor) .bx-stl-mil,
+    .bx-artificer .bx-popup ul:not(.bx-menu-hor) .bx-stl-mil-sm {
         @apply rounded-none;
     }
     .bx-artificer .bx-menu-tab-active .bx-stl-mil,

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
plugins_public/tailwind/css/tailwind.min.css


Некоторые файлы не были показаны из-за большого количества измененных файлов