Quellcode durchsuchen

Ticket #4504 - Application: Updates in Vertical menu.

AntonLV vor 3 Jahren
Ursprung
Commit
ca4fdd1851

+ 14 - 0
modules/boonex/artificer/data/template/system/css/common.css

@@ -26,6 +26,20 @@ import url(../../../../../../../template/css/common.css);
     font-weight: normal;
 }
 
+.sys-icon-emoji {
+    font-weight: normal !important;
+}
+
+.sys-icon-image,
+.sys-icon-svg {
+    display: inline-block;
+    width: 1.5rem;
+    height: 1.5rem;
+    background-size: contain;
+    background-position: center;
+    background-repeat: no-repeat;
+}
+
 /*--- Application ---*/
 .bx-main.bx-pt-application .bx-menu-toolbar-padding {
     padding-top: 0;

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

@@ -179,11 +179,6 @@ div.bx-popup-menu-main.sys-add-content ul {
 .bx-db-container:not(.bx-dbc-notitle) .bx-menu-profile-followings {
     margin-top: 0;
 }
-.bx-main.bx-pt-application .bx-main-column.narrow .bx-menu-vertical-more-less,
-.bx-main.bx-pt-application .bx-main-column.narrow .bx-menu-profile-followings {
-    margin-left: -0.75rem;
-    margin-right: -0.75rem;
-}
 
 /*--- Profile Followings Menu ---*/
 .bx-menu-ver.bx-menu-object-sys_profile_followings li .bx-menu-show {

+ 3 - 0
modules/boonex/artificer/data/template/system/menu_profile_followings.html

@@ -4,6 +4,9 @@
             <div class="bx-menu-item-cnt">
                 <div class="bx-menu-item-link bx-stl-mil-wo-gaps">
                     <a class="bx-stl-mil-gaps flex flex-auto items-center" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
+                        <span class="bx-menu-item-icon bx-stl-mii flex-none group-hover:text-gray-700 dark:group-hover:text-gray-300">
+                            <bx_include_auto:menu_icon.html />
+                        </span>
                         <span class="bx-menu-item-title bx-stl-mit flex-1 uppercase" sidebar-toggle-item>__title__</span>
                         <span class="bx-menu-collapse flex-none pl-2" sidebar-toggle-item>
                             <i class="sys-icon chevron-up bx-menu-hide"></i>

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

@@ -1,7 +1,7 @@
 <bx_repeat:menu_items>
     <li class="bx-menu-subitem bx-menu-subitem-__name__ __class_add__">
         <div class="bx-menu-item-cnt bx-stl-mil-wo-gaps">
-            <a class="bx-stl-mil-gaps group flex flex-auto items-center pl-2 truncate" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
+            <a class="bx-stl-mil-gaps group flex flex-auto items-center truncate" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
                 <span class="bx-menu-item-icon bx-stl-mii flex-none group-hover:text-gray-700 dark:group-hover:text-gray-300">
                     <bx_include_auto:menu_icon.html />
                 </span>

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

@@ -54,7 +54,7 @@
     <div class="bx-main-content flex pt-16 overflow-hidden">
         <!-- BEG: Sidebar -->
         <aside id="sidebar" class="bx-main-column narrow fixed top-0 left-0 z-20 hidden xl:flex flex-col flex-shrink-0 w-64 h-full pt-16 duration-75 transition-width" aria-label="Sidebar">
-            <div class="bx-mc-border relative flex flex-col flex-1 min-h-0 max-h-full pt-0 bg-white border-r border-gray-200 dark:bg-gray-800 dark:border-gray-700">
+            <div class="bx-mc-border relative flex flex-col flex-1 min-h-0 max-h-full h-full pt-0 bg-white border-r border-gray-200 dark:bg-gray-800 dark:border-gray-700">
                 <div class="flex flex-col flex-1 py-2 overflow-y-auto">
                     <div class="bx-mc-cnt flex-1 px-4 space-y-1 bg-white divide-y divide-gray-200 dark:bg-gray-800 dark:divide-gray-700">
                         <bx_menu:sys_site_panel />

+ 0 - 13
template/css/colors.css

@@ -57,16 +57,3 @@
 .bg-col-gray { background-color: #616161; }
 .col-gray-dark { color: #333333; } /* 26.13.13: prev val #575757; */
 .bg-col-gray-dark { background-color: #575757; }
-
-/* icons */
-.sys-icon-emoji{
-    font-weight: normal !important;
-}
-
-.sys-icon-image,
-.sys-icon-svg{
-    width: 1.5rem;
-    height: 1.5rem;
-    background-size: contain;
-    display: inline-block;
-}

+ 14 - 0
template/css/common.css

@@ -157,6 +157,20 @@ blockquote {
     height:1.5rem;
 }
 
+.sys-icon-emoji{
+    font-weight: normal !important;
+}
+
+.sys-icon-image,
+.sys-icon-svg{
+    display: inline-block;
+    width: 1.5rem;
+    height: 1.5rem;
+    background-size: contain;
+    background-position: center;
+    background-repeat: no-repeat;
+}
+
 .bx-search-site {
     width:20rem;
     margin-left:auto;

+ 2 - 1
template/menu_profile_followings.html

@@ -2,8 +2,9 @@
     <bx_repeat:menu_items>
         <li class="bx-menu-item bx-menu-item-__name__ bx-def-round-corners __class_add__">
             <div class="bx-menu-item-cnt">
-                <div class="bx-menu-item-link bx-def-padding-thd-topbottom bx-def-padding-sec-leftright bx-def-color-bg-hl-hover">
+                <div class="bx-menu-item-link bx-def-color-bg-hl-hover">
                     <a class="bx-stl-mil-gaps flex flex-auto items-center" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
+                        <bx_include_auto:menu_icon.html />
                         <span class="bx-menu-item-title bx-stl-mit flex-1 uppercase" sidebar-toggle-item>__title__</span>
                         <span class="bx-menu-collapse bx-def-padding-sec-left" sidebar-toggle-item>
                             <i class="sys-icon chevron-up bx-menu-hide"></i>

+ 2 - 2
template/menu_profile_followings_subitems.html

@@ -1,7 +1,7 @@
 <bx_repeat:menu_items>
     <li class="bx-menu-subitem bx-menu-subitem-__name__ bx-def-round-corners bx-def-color-bg-hl-hover __class_add__">
-        <div class="bx-menu-item-cnt bx-def-padding-thd-topbottom bx-def-padding-left bx-def-padding-sec-right">
-            <a href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
+        <div class="bx-menu-item-cnt">
+            <a class="bx-stl-mil-gaps flex flex-auto items-center" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
                 <bx_include_auto:menu_icon.html />
                 <span class="bx-def-margin-sec-left-auto" sidebar-toggle-item>__title__</span>
             </a>

+ 3 - 0
template/scripts/BxBaseMenuProfileFollowings.php

@@ -66,6 +66,9 @@ class BxBaseMenuProfileFollowings extends BxTemplMenu
         $iProfile = bx_get_logged_profile_id();
 
         foreach($aMenuItems as $iIndex => $aItem) {
+            if(bx_is_srv($aItem['module'], 'module_icon'))
+                $aMenuItems[$iIndex]['icon'] = bx_srv($aItem['module'], 'module_icon');
+
             if(empty($aItem['onclick']))
                 $aMenuItems[$iIndex]['onclick'] = "javascript:bx_menu_toggle(this, '" . $this->_sObject . "', '" . $aItem['name'] . "')";