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

Ticket #3629 - Artificer template (Part 2): Different.

AntonLV 4 лет назад
Родитель
Сommit
9d723c48d9

+ 16 - 14
modules/boonex/artificer/data/template/system/cover.html

@@ -5,22 +5,24 @@
     }
 </style>
 </bx_if:logged_in>
-<div class="bx-cover-gap overflow-hidden" >
-    <div class="bx-cover-wrapper<bx_if:empty_cover_class> bx-cover-empty</bx_if:empty_cover_class> relative" <bx_if:bg>style="background-image:url(__image_url__)"</bx_if:bg>>
-        <div class="bx-cover-gradient bx-def-page-width relative mx-auto"></div>
-        <div class="relative mx-auto py-16 text-center">
-            <bx_if:image>
-                <div class="bx-cover-image">
-                    <img class="border rounded-md" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" />
+<div class="bx-menu-toolbar-padding pt-16">
+    <div class="bx-cover-gap overflow-hidden">
+        <div class="bx-cover-wrapper<bx_if:empty_cover_class> bx-cover-empty</bx_if:empty_cover_class> relative" <bx_if:bg>style="background-image:url(__image_url__)"</bx_if:bg>>
+            <div class="bx-cover-gradient bx-def-page-width relative mx-auto"></div>
+            <div class="relative mx-auto py-16 text-center">
+                <bx_if:image>
+                    <div class="bx-cover-image">
+                        <img class="border rounded-md" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" />
+                    </div>
+                </bx_if:image>
+                <div class="bx-cover-title flex justify-center items-center">
+                    <h1 class="text-4xl font-bold tracking-tight text-gray-900 dark:text-gray-50">
+                        <span class="block pb-1 relative">__title__</span>
+                        <span class="block pb-1  bg-clip-text text-transparent bg-gradient-to-r from-green-500 to-blue-500"></span>
+                    </h1>
                 </div>
-            </bx_if:image>
-            <div class="bx-cover-title flex justify-center items-center">
-                <h1 class="text-4xl font-bold tracking-tight text-gray-900 dark:text-gray-50">
-                    <span class="block pb-1 relative">__title__</span>
-                    <span class="block pb-1  bg-clip-text text-transparent bg-gradient-to-r from-red-500 to-blue-500 "></span>
-                </h1>
+                <div class="bx-cover-actions">__actions__</div>
             </div>
-            <div class="bx-cover-actions">__actions__</div>
         </div>
     </div>
 </div>

+ 24 - 22
modules/boonex/artificer/data/template/system/cover_home.html

@@ -5,28 +5,30 @@
     }
 </style>
 </bx_if:logged_in>
-<div class="bx-cover-gap overflow-hidden">
-    <div class="bx-cover-wrapper<bx_if:empty_cover_class> bx-cover-empty</bx_if:empty_cover_class> relative" <bx_if:bg>style="background-image:url(__image_url__)"</bx_if:bg>>
-        <div class="bx-cover-gradient bx-def-page-width relative mx-auto"></div>
-        <div class="relative mx-auto py-16 text-center">
-            <div>
-                <div class="text-4xl  sm:text-5xl xl:text-6xl tracking-tight  font-bold text-gray-800 dark:text-white ">
-                    <span class="block pb-1 relative"><bx_text:_bx_artificer_txt_splash_welcome_l1 /></span>
-                    <span class="block pb-1  bg-clip-text text-transparent bg-gradient-to-r from-red-500 to-blue-500 "><bx_text:_bx_artificer_txt_splash_welcome_l2 /></span>
-                </div>
-                <p class="p-8  font-light text-gray-700 dark:text-gray-300 text-base  sm:text-lg xl:text-xl">
-                    <span class="block"><bx_text:_bx_artificer_txt_splash_welcome_l3 /></span>
-                </p>
-                <div class=" w-full flex justify-center items-center">
-                    <button type="button" onclick="document.location='__link_join__'"  class="bx-btn bx-btn-primary">
-                        <bx_text:_bx_artificer_txt_splash_welcome_a1 />
-                    </button>
-                    <button type="button"  onclick="document.location='__link_login__'" class="bx-btn ml-3">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="-ml-1 mr-2 h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
-                          <path fill-rule="evenodd" d="M3 3a1 1 0 011 1v12a1 1 0 11-2 0V4a1 1 0 011-1zm7.707 3.293a1 1 0 010 1.414L9.414 9H17a1 1 0 110 2H9.414l1.293 1.293a1 1 0 01-1.414 1.414l-3-3a1 1 0 010-1.414l3-3a1 1 0 011.414 0z" clip-rule="evenodd"></path>
-                        </svg>
-                        <bx_text:_bx_artificer_txt_splash_welcome_a2 />
-                    </button>
+<div class="bx-menu-toolbar-padding pt-16">
+    <div class="bx-cover-gap overflow-hidden">
+        <div class="bx-cover-wrapper<bx_if:empty_cover_class> bx-cover-empty</bx_if:empty_cover_class> relative" <bx_if:bg>style="background-image:url(__image_url__)"</bx_if:bg>>
+            <div class="bx-cover-gradient bx-def-page-width relative mx-auto"></div>
+            <div class="relative mx-auto py-16 text-center">
+                <div>
+                    <div class="text-4xl  sm:text-5xl xl:text-6xl tracking-tight  font-bold text-gray-800 dark:text-white ">
+                        <span class="block pb-1 relative"><bx_text:_bx_artificer_txt_splash_welcome_l1 /></span>
+                        <span class="block pb-1  bg-clip-text text-transparent bg-gradient-to-r from-green-500 to-blue-500"><bx_text:_bx_artificer_txt_splash_welcome_l2 /></span>
+                    </div>
+                    <p class="p-8  font-light text-gray-700 dark:text-gray-300 text-base  sm:text-lg xl:text-xl">
+                        <span class="block"><bx_text:_bx_artificer_txt_splash_welcome_l3 /></span>
+                    </p>
+                    <div class=" w-full flex justify-center items-center">
+                        <button type="button" onclick="document.location='__link_join__'"  class="bx-btn bx-btn-primary">
+                            <bx_text:_bx_artificer_txt_splash_welcome_a1 />
+                        </button>
+                        <button type="button"  onclick="document.location='__link_login__'" class="bx-btn ml-3">
+                            <svg class="-ml-1 mr-2 h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                              <path fill-rule="evenodd" d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z" clip-rule="evenodd"></path>
+                            </svg>
+                            <bx_text:_bx_artificer_txt_splash_welcome_a2 />
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>

+ 3 - 2
modules/boonex/artificer/data/template/system/css/common.css

@@ -11,7 +11,6 @@ import url(../../../../../../../template/css/common.css);
     height: 0px;
     font-size:1px;
 }
-
 .bx-clearfix:before,
 .bx-clearfix:after {
     content:"";
@@ -20,7 +19,9 @@ import url(../../../../../../../template/css/common.css);
 .bx-clearfix:after {
     clear:both;
 }
-
+.bx-main.bx-pt-application .bx-menu-toolbar-padding {
+    padding-top: 0;
+}
 .bx-main-content .bx-main-column .bx-def-page-width {
     width: 100%;
 }

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

@@ -4,6 +4,23 @@ import url(../../../../../../../template/css/general.css);
 
 
 /*--- Toolbar ---*/
+.bx-toolbar-anim {
+    -webkit-transition: all .25s ease-in-out;
+    -moz-transition: all .25s ease-in-out;
+    -o-transition: all .25s ease-in-out;
+    transition: all .25s ease-in-out
+}
+.bx-toolbar-reset {
+    -webkit-transform: translateY(0);
+    -ms-transform: translateY(0);
+    transform: translateY(0)
+}
+.bx-toolbar-up {
+    -webkit-transform: translateY(-100%);
+    -ms-transform: translateY(-100%);
+    transform: translateY(-100%)
+}
+
 .bx-toolbar-item.bx-ti-search .bx-tis-button-hidden {
     display: none;
 }

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

@@ -130,6 +130,7 @@ div.bx-popup-menu-main.sys-add-content ul {
 }
 
 /*--- Profile Stats/Followings Menu ---*/
+.bx-db-content .bx-profile-stats .bx-profile-avatar-cnt,
 .bx-db-content .bx-profile-stats .bx-menu-profile-stats,
 .bx-db-content.bx-content-padding-block .bx-menu-profile-stats,
 .bx-db-content.bx-content-padding-block .bx-menu-profile-followings {

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

@@ -1,15 +1,15 @@
 <ul class="bx-menu-profile-stats bx-menu-ver bx-menu-object-__object__ space-y-2">
     <bx_repeat:menu_items>
         <li class="bx-menu-item-__name__ __class_add__ rounded-md">
-            <div class="bx-menu-item-cnt bx-stl-mil group justify-between">
-                <a class="flex items-center truncate" href="__link__" onclick="__onclick__"__attrs__>
+            <div class="bx-menu-item-cnt bx-stl-mil group">
+                <a class="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>
                     <span class="bx-menu-item-title bx-stl-mit" sidebar-toggle-item>__title__</span>
                 </a>
                 <bx_if:addon>
-                    <div class="bx-menu-addon bx-stl-mia group-hover:text-gray-800 dark:group-hover:text-gray-100" sidebar-toggle-item>
+                    <div class="bx-menu-addon bx-stl-mia flex-none group-hover:text-gray-800 dark:group-hover:text-gray-100" sidebar-toggle-item>
                         <div class="bx-menu-addon-cnt">__addon__</div>
                     </div>
                 </bx_if:addon>

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

@@ -1,12 +1,12 @@
-<div class="bx-profile-avatar group text-gray-600 dark:text-gray-300">
+<div class="bx-profile-avatar text-gray-600 dark:text-gray-300">
     <div class="bx-profile-avatar-cnt relative flex items-center">
         <div class="bx-pa-img absolute">__profile_unit__</div>
         <div class="bx-pa-info w-full" sidebar-toggle-item>
             <div class="bx-pa-info-cnt flex flex-col justify-center h-10 pl-12 pr-4 box-border">
-                <div class="bx-pai-line text-gray-600 dark:text-gray-300 text-sm group-hover:text-gray-800 dark:group-hover:text-white font-semibold truncate">
+                <div class="bx-pai-line text-gray-600 dark:text-gray-300 hover:text-gray-800 dark:hover:text-white text-sm font-semibold truncate">
                     <a href="__profile_url__" title="__profile_title_attr__">__profile_title__</a>
                 </div>
-                <div class="bx-pai-line text-green-600 dark:text-green-400 text-xs truncate uppercase tracking-wider font-normal">
+                <div class="bx-pai-line text-green-600 dark:text-green-400 text-xs font-normal truncate uppercase tracking-wider">
                     <!--<bx_include_auto:menu_icon.html />--><span>__profile_acl_title__</span>
                 </div>
             </div>

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

@@ -1,7 +1,7 @@
 <div class="bx-profile-stats bx-def-border-radius-block">
     <div class="bx-profile-stats-cnt bx-def-padding">
         <div class="bx-ps-user">
-            <div class="bx-profile-avatar-cnt flex items-center cursor-pointer" onclick="window.location.href='__profile_url__'">
+            <div class="bx-profile-avatar-cnt bx-stl-mil-hover group flex items-center px-3 py-1.5 rounded-md cursor-pointer" onclick="window.location.href='__profile_url__'">
                 <div class="bx-pa-img absolute">__profile_unit__</div>
                 <div class="bx-pa-info w-full">
                     <div class="bx-pa-info-cnt flex flex-col justify-center h-10 pl-12 box-border">
@@ -14,8 +14,8 @@
                 <!--<div class="bx-pa-actions">
                     <div class="bx-pa-action flex items-center justify-center h-5 w-5 ml-2"><i class="sys-icon arrows-alt-v flex-shrink-0 text-gray-400 group-hover:text-gray-500"></i></div>
                 </div>-->    
-            </div>   
-	        <div class="bx-ps-menu pt-2 md:pt-3 lg:pt-4">__menu__</div>
+            </div>
+            <div class="bx-ps-menu mt-5 pt-3">__menu__</div>
         </div>
     </div>
 </div>

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

@@ -19,4 +19,4 @@ DELETE FROM `sys_alerts_handlers` WHERE `id` = @iHandler;
 
 
 -- injections
-DELETE FROM `sys_injections` WHERE `name` = @sName;
+DELETE FROM `sys_injections` WHERE `name` LIKE 'bx_artificer_%';

+ 1 - 1
modules/boonex/tasks/updates/13.0.0_13.0.1/install/installer.php

@@ -15,7 +15,7 @@ class BxTasksUpdater extends BxDolStudioUpdater
     {
         if($sOperation == 'install') {
             if(!$this->oDb->isFieldExists('bx_tasks_tasks', 'cf'))
-                $this->oDb->query("ALTER TABLE `bx_tasks_tasks` ADD `cf` int(11) NOT NULL default '1' AFTER `featured`");
+                $this->oDb->query("ALTER TABLE `bx_tasks_tasks` ADD `cf` int(11) NOT NULL default '1' AFTER `expired`");
 
             if(!$this->oDb->isFieldExists('bx_tasks_cmts', 'cmt_cf'))
                 $this->oDb->query("ALTER TABLE `bx_tasks_cmts` ADD `cmt_cf` int(11) NOT NULL default '1' AFTER `cmt_pinned`");

+ 5 - 0
plugins_public/tailwind/css/tailwind.css

@@ -899,6 +899,11 @@
         @apply w-48 h-48;
     }
 
+    .bx-artificer .bx-base-text-unit-title a,
+    .bx-artificer .bx-tl-title a {
+        @apply hover:underline hover:text-blue-700 dark:hover:text-blue-600;
+    }
+
     .bx-artificer .bx-base-pofile-unit-online {
         @apply absolute w-2.5 h-2.5 right-0.5 bottom-0.5 ring-1 ring-inset ring-white dark:ring-gray-800 bg-green-500 rounded-full;
     }

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


+ 1 - 1
template/_sub_header.html

@@ -3,7 +3,7 @@
 <div class="bx-main <bx_injection:injection_main_class />">
     <bx_injection:top />
 
-    <div id="bx-toolbar" class="bx-header bx-def-z-index-nav bg-white dark:bg-gray-800 shadow-sm">
+    <div id="bx-toolbar" class="bx-header bx-def-z-index-nav fixed w-full bg-white/95 dark:bg-gray-800/95 backdrop-blur shadow-sm">
         <div class="bx-header-cnt bx-def-page-width mx-auto px-3 md:px-4 lg:px-6 box-border">
             <div class="bx-toolbar-content-wrapper">
                 <div id="bx-toolbar-content" class="bx-toolbar-content relative flex items-center justify-start h-16">

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