Selaa lähdekoodia

Ticket #3399 - Updates for Blocks, Menus, Cover, etc.

AntonLV 5 vuotta sitten
vanhempi
sitoutus
8bebc058ce

+ 2 - 2
modules/boonex/artificer/data/template/mod_profile/cover.html

@@ -18,10 +18,10 @@
                         <div class="bx-base-pofile-cover-thumb flex justify-center lg:flex-none">
                             <a class="bx-base-pofile-cover-thumb" href="__picture_href__" onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();">
                                 <bx_if:show_ava_image>
-                                    <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 h-48 w-48 lg:h-32 lg:w-32" src="__ava_url__" />
+                                    <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 h-48 w-48" src="__ava_url__" />
                                 </bx_if:show_ava_image>
                                 <bx_if:show_ava_letter>
-                                    <p class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size flex items-center justify-center box-border m-0 rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 h-48 w-48 lg:h-32 lg:w-32 text-white font-bold text-5xl" style="background-color:rgba(__color__)">__letter__</p>
+                                    <p class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size flex items-center justify-center box-border m-0 rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 h-48 w-48 text-white font-bold text-5xl" style="background-color:rgba(__color__)">__letter__</p>
                                 </bx_if:show_ava_letter>
                             </a>
                             <bx_if:show_online>

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

@@ -20,6 +20,6 @@ import url(../../../../../../../template/css/general.css);
 
 
 /*--- Profile Avatar ---*/
-#bx-profile-switcher .bx-def-hr {
+#bx-profile-switcher .bx-pas-list .bx-def-hr:first-child {
     display: none;
 }

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

@@ -30,6 +30,11 @@ li.bx-menu-inter-hidden {
 .bx-menu-custom.bx-menu-custom-hor.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto {
     display: none;
 }
+.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto .bx-popup .bx-menu-item a.p-2,
+.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto .bx-popup .bx-menu-item a.px-2 {
+    padding-left: 1rem;
+    padding-right: 1rem;
+}
 
 /*--- Page Main menu ---*/
 .bx-menu-main .bx-menu-item.bx-menu-item-more-auto .bx-popup .bx-menu-custom .bx-menu-item,
@@ -44,7 +49,7 @@ li.bx-menu-inter-hidden {
 }
 .bx-menu-main-submenu .bx-menu-item.bx-menu-item-more-auto .bx-popup .bx-menu-custom .bx-menu-item > a {
     width: 100%;
-    padding: 0.5rem; 
+    padding: 0.5rem 1.0rem; 
     text-align: left;
 }
 .bx-menu-main-submenu .bx-menu-item.bx-menu-item-more-auto .bx-popup .bx-menu-custom .bx-menu-item .bx-mi-underline {

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

@@ -1,5 +1,5 @@
 <!-- Design Box 1 [start]: Content + title + background -->
-<div class="bx-db-container bx-dbc-nopadding max-w-7xl ring-1 ring-gray-200 dark:ring-gray-800 bg-gray-50 dark:bg-gray-900 shadow-sm rounded divide-y divide-gray-200 dark:divide-gray-800">
+<div class="bx-db-container bx-dbc-nopadding max-w-7xl ring-1 ring-gray-200 dark:ring-gray-800 bg-gray-50 dark:bg-gray-900 shadow-sm rounded-md divide-y divide-gray-200 dark:divide-gray-800">
     <div class="bx-db-header px-4 py-2 lg:px-6 lg:py-4">
         <div class="bx-db-title text-base lg:text-xl leading-6 font-semibold text-gray-800 dark:text-gray-100 align-middle">__title__</div>__caption_item__
     </div>

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

@@ -1,5 +1,5 @@
 <!-- Design Box 11 [start]: Content + title + background + padding -->
-<div class="bx-db-container max-w-7xl ring-1 ring-gray-200 dark:ring-gray-800 bg-gray-50 dark:bg-gray-900 shadow-sm rounded divide-y divide-gray-200 dark:divide-gray-800">
+<div class="bx-db-container max-w-7xl ring-1 ring-gray-200 dark:ring-gray-800 bg-gray-50 dark:bg-gray-900 shadow-sm rounded-md divide-y divide-gray-200 dark:divide-gray-800">
     <div class="bx-db-header px-4 py-2 lg:px-6 lg:py-4">
         <div class="bx-db-title text-base lg:text-xl leading-6 font-semibold text-gray-800 dark:text-gray-100 align-middle">__title__</div>__caption_item__
     </div>

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

@@ -1,5 +1,5 @@
 <!-- Design Box 13 [start]: Content + background + padding -->
-<div class="bx-db-container max-w-7xl ring-1 ring-gray-200 dark:ring-gray-800 bg-gray-50 dark:bg-gray-900 shadow-sm rounded">
+<div class="bx-db-container max-w-7xl ring-1 ring-gray-200 dark:ring-gray-800 bg-gray-50 dark:bg-gray-900 shadow-sm rounded-md">
     <div class="bx-db-content relative p-2 md:p-4 lg:p-6">__designbox_content__</div>
 </div>
 <!-- Design Box 13 [ end ] -->

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

@@ -1,5 +1,5 @@
 <!-- Design Box 14 [start]: Content + title + padding -->
-<div class="bx-db-container bx-dbc-nobg max-w-7xl rounded">
+<div class="bx-db-container bx-dbc-nobg max-w-7xl rounded-md">
     <div class="bx-db-header px-4 py-2 lg:px-6 lg:py-4">
         <div class="bx-db-title text-base lg:text-xl leading-6 font-semibold text-gray-800 dark:text-gray-100 align-middle">__title__</div>__caption_item__
     </div>

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

@@ -1,5 +1,5 @@
 <!-- Design Box 3 [start]: Content + background -->
-<div class="bx-db-container bx-dbc-nopadding max-w-7xl ring-1 ring-gray-200 dark:ring-gray-800 bg-gray-50 dark:bg-gray-900 shadow-sm rounded">
+<div class="bx-db-container bx-dbc-nopadding max-w-7xl ring-1 ring-gray-200 dark:ring-gray-800 bg-gray-50 dark:bg-gray-900 shadow-sm rounded-md">
     <div class="bx-db-content relative">__designbox_content__</div>
 </div>
 <!-- Design Box 3 [ end ] -->

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

@@ -1,5 +1,5 @@
 <!-- Design Box 4 [start]: Content + title -->
-<div class="bx-db-container bx-dbc-nopadding bx-dbc-nobg max-w-7xl rounded">
+<div class="bx-db-container bx-dbc-nopadding bx-dbc-nobg max-w-7xl rounded-md">
     <div class="bx-db-header px-4 py-2 lg:px-6 lg:py-4">
         <div class="bx-db-title text-base lg:text-xl leading-6 font-semibold text-gray-800 dark:text-gray-100 align-middle">__title__</div>__caption_item__
     </div>

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

@@ -1,14 +1,15 @@
 <div id="bx-sliding-menu-account" class="bx-def-z-index-nav bx-popup bx-popup-trans relative rounded ring-1 ring-gray-200 dark:ring-gray-700 bg-white dark:bg-gray-800 overflow-hidden" style="display:none; opacity:1;">
     <div class="bx-popup-content">
-        <div class="bx-menu-account-popup bx-menu-object-__object__ pt-4 px-4">
-            <div class="bx-menu-account-popup-profile bx-clearfix">__active_profile__</div>
+        <div class="bx-menu-account-popup bx-menu-object-__object__ pt-4">
+            <div class="bx-menu-account-popup-profile bx-clearfix px-4">__active_profile__</div>
+            <hr class="bx-def-hr" />
             <div class="bx-menu-account-popup-menu my-2">__menu_notifications__</div>
         </div>
         <div class="bx-menu-account-popup-profile-switcher box-border">__profile_switcher__</div>
         <bx_if:multiple_profiles_mode>
             <hr class="bx-def-hr" />
             <div class="bx-menu-account-popup-profile-switcher-link p-4">
-                <a class="bx-btn" href="__url_switch_profile__">
+                <a class="bx-btn w-full" href="__url_switch_profile__">
                     <i class="sys-icon plus"></i><span class="pl-2"><bx_text:_sys_txt_my_profiles /></span>
                 </a>
             </div>

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

@@ -1,6 +1,6 @@
 <ul id="__html_id__" class="bx-menu-main<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-nowrap py-2">
     <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ rounded __class_add__">
-        <a href="__link__" onclick="__onclick__" class="group flex items-center p-2 text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:text-gray-100 dark:hover:bg-gray-700 hover:text-gray-900 text-sm font-normal"__attrs__>
+        <a href="__link__" onclick="__onclick__" class="group flex items-center px-4 py-2 text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:text-gray-100 dark:hover:bg-gray-700 hover:text-gray-900 text-sm font-normal"__attrs__>
             <div class="bx-menu-floating-blocks-icon flex items-center justify-center text-gray-500 group-hover:text-gray-600 dark:group-hover:text-gray-300 mr-2 h-5 w-5">
                 <bx_include_auto:menu_icon.html />
             </div>

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

@@ -1,4 +1,4 @@
-<ul id="__html_id__" class="bx-menu-floating-blocks<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-wrap justify-center">
+<ul id="__html_id__" class="bx-menu-floating-blocks<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-wrap justify-center space-x-2 space-y-2">
     <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ w-20 rounded __class_add__">
         <a href="__link__" onclick="__onclick__" class="flex flex-col items-center p-2 text-gray-600 dark:text-gray-300 dark:hover:bg-gray-700 hover:bg-gray-100 hover:text-gray-700 dark:hover:text-white rounded text-sm font-medium"__attrs__>
             <div class="bx-menu-floating-blocks-icon m-2">

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

@@ -1,5 +1,5 @@
 <ul class="bx-menu-floating-blocks-wide bx-menu-object-__object__">
-    <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ __class_add__ group relative flex justify-between items-center px-2 py-2 text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:text-gray-100 dark:hover:bg-gray-700 hover:text-gray-900 text-sm font-medium rounded">
+    <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ __class_add__ group relative flex justify-between items-center px-4 py-2 text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:text-gray-100 dark:hover:bg-gray-700 hover:text-gray-900 text-sm font-medium">
         <a class="flex items-center" href="__link__" onclick="__onclick__"__attrs__>
             <div class="bx-menu-floating-blocks-icon flex items-center justify-center h-5 w-5 mr-2">
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>

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

@@ -1,6 +1,6 @@
 <ul id="__html_id__" class="bx-menu-main<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-nowrap space-x-2">
     <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ rounded __class_add__">
-        <a href="__link__" onclick="__onclick__" class="group text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:text-gray-100 dark:hover:bg-gray-700 hover:text-gray-900 flex items-center p-2 text-sm font-normal rounded"__attrs__>
+        <a href="__link__" onclick="__onclick__" class="group opacity-80 hover:opacity-100 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:text-gray-100 dark:hover:bg-gray-900 hover:text-gray-900 flex items-center px-2 py-2 text-sm font-normal rounded-md"__attrs__>
             <div class="bx-menu-floating-blocks-icon flex items-center justify-center text-gray-500 group-hover:text-gray-600 dark:group-hover:text-gray-300 mr-2 h-5 w-5">
                 <bx_include_auto:menu_icon.html />
             </div>

+ 2 - 2
modules/boonex/artificer/data/template/system/profile_avatar.html

@@ -1,6 +1,6 @@
-<div class="bx-profile-avatar group text-gray-600 hover:text-gray-800 hover:bg-gray-200 dark:text-gray-300 dark:hover:bg-gray-800">
+<div class="bx-profile-avatar group text-gray-600 hover:text-gray-800 hover:bg-gray-200 dark:text-gray-300 dark:hover:bg-gray-800 rounded-md">
     <a href="javascript:void(0)" onclick="javascript:$('#bx-profile-switcher').dolPopup({});">
-        <div class="bx-profile-avatar-cnt flex items-center p-2">
+        <div class="bx-profile-avatar-cnt flex items-center px-4 py-2">
             <div class="bx-pa-img">__profile_unit__</div>
             <div class="bx-pa-info w-full">
                 <div class="bx-pa-info-cnt pl-4 box-border">

+ 13 - 0
modules/boonex/artificer/data/template/system/profile_avatar_switcher.html

@@ -0,0 +1,13 @@
+<div class="bx-profile-avatar-switcher bx-popup-width">
+    <div class="bx-pas-cnt">
+        <div class="bx-pas-list">__profile_switcher__</div>
+        <bx_if:multiple_profiles_mode>
+            <hr class="bx-def-hr" />
+            <div class="bx-pas-list-link p-4">
+                <a class="bx-btn w-full" href="__url_switch_profile__">
+                    <i class="sys-icon plus"></i><span class="pl-2"><bx_text:_sys_txt_my_profiles /></span>
+                </a>
+            </div>
+        </bx_if:multiple_profiles_mode>
+    </div>
+</div>

+ 1 - 1
modules/boonex/artificer/install/sql/install.sql

@@ -30,7 +30,7 @@ INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `ex
 (@iSystemCategoryId, CONCAT(@sName, '_site_logo'), '', '0', 'digit', '', '', '', @iSystemCategoryOrder + 1),
 (@iSystemCategoryId, CONCAT(@sName, '_site_logo_alt'), '', '', 'text', '', '', '', @iSystemCategoryOrder + 2),
 (@iSystemCategoryId, CONCAT(@sName, '_site_logo_width'), '', '240', 'digit', '', '', '', @iSystemCategoryOrder + 3),
-(@iSystemCategoryId, CONCAT(@sName, '_site_logo_height'), '', '48', 'digit', '', '', '', @iSystemCategoryOrder + 4);
+(@iSystemCategoryId, CONCAT(@sName, '_site_logo_height'), '', '32', 'digit', '', '', '', @iSystemCategoryOrder + 4);
 
 
 -- STUDIO PAGE & WIDGET

+ 1 - 1
modules/boonex/artificer/template/css/tailwind.css

@@ -103,7 +103,7 @@
 
     /* Main menu */
     .bx-toolbar-item.bx-ti-menu .bx-menu-main .bx-menu-item.bx-menu-tab-active {
-        @apply bg-gray-50 dark:bg-gray-700 ring-1 ring-gray-200 dark:ring-gray-600 shadow text-gray-900 dark:text-white;
+        @apply opacity-100 bg-gray-50 dark:bg-gray-700 ring-1 ring-gray-200 dark:ring-gray-600 shadow text-gray-900 dark:text-white;
     }
 
     /* Main menu: Mobile */

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
modules/boonex/artificer/template/css/tailwind.min.css


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä