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

Ticket #3399 - Covers, Action buttons, Fixes.

AntonLV 5 лет назад
Родитель
Сommit
4d09e5fd9e

+ 2 - 2
modules/boonex/artificer/data/template/mod_general/css/main.css

@@ -87,12 +87,12 @@ div.bx-badge.bx-badge-compact img{
 }
 
 /* more menu */
+.bx-menu-submenu-more-auto .sys-action-do-icon,
 .bx-menu-submenu-more-auto .bx-vote-do-icon,
 .bx-menu-submenu-more-auto .bx-favorite-do-icon,
 .bx-menu-submenu-more-auto .bx-feature-do-icon,
 .bx-menu-submenu-more-auto .bx-report-do-icon,
-.bx-menu-submenu-more-auto .bx-score-do-icon
-{
+.bx-menu-submenu-more-auto .bx-score-do-icon {
     height: 1.25rem;
     width: 1.25rem;
     align-items: center;

+ 20 - 8
modules/boonex/artificer/data/template/mod_profile/css/main.css

@@ -79,7 +79,6 @@
 
 /*--- Unit ---*/
 .bx-base-pofile-unit-with-cover.bx-bp-uc-empty .bx-base-pofile-unit-cover {
-    background-color: rgba(223, 219, 229, 0.5);
     background-repeat: repeat;
     background-size: auto;
 }
@@ -118,7 +117,6 @@ p.bx-base-pofile-unit-thumb.bx-def-ava-big-size {
 /*--- Profile Cover ---*/
 .bx-base-pofile-cover-image.bx-bpci-holder img.bx-base-pofile-cover-image {
     background-size: auto;
-    background-color: rgba(223, 219, 229, 0.5);
 }
 .bx-base-profile-cover-meta .bx-menu-custom.bx-menu-custom-hor {
     -webkit-align-items: center;
@@ -145,6 +143,25 @@ p.bx-base-pofile-unit-thumb.bx-def-ava-big-size {
     position: absolute;
     width: 100%;
 }
+.bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor > li > .bx-base-general-entity-action > a,
+.bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor li.bx-menu-item-more-auto .bx-popup .bx-menu-custom-ver .bx-menu-item > .bx-base-general-entity-action > a,
+.bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor > li .sys-action-element-holder a {
+    padding: 0.5rem 1.0rem;
+}
+.bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor > li .sys-action-element-holder a {
+    display: block;
+}
+.bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor li.bx-menu-item-more-auto .bx-popup .bx-menu-custom-ver .bx-menu-item {
+    border-color: transparent;
+    border-radius: 0;
+    box-shadow: none;
+}
+.bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor li.bx-menu-item-more-auto .bx-popup .bx-menu-custom-ver .bx-menu-item,
+.bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor li.bx-menu-item-more-auto .bx-popup .bx-menu-custom-ver .bx-menu-item .bx-base-general-entity-action,
+.bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor li.bx-menu-item-more-auto .bx-popup .bx-menu-custom-ver .bx-menu-item .sys-action,
+.bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor li.bx-menu-item-more-auto .bx-popup .bx-menu-custom-ver .bx-menu-item .sys-action-element-holder {
+    width: 100%;
+}
 .bx-media-desktop .bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor > .bx-menu-item-more-auto > .bx-base-general-entity-action > a > .bx-mi-text,
 .bx-media-tablet .bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor > .bx-menu-item-more-auto > .bx-base-general-entity-action > a > .bx-mi-text {
     display: none;
@@ -164,12 +181,7 @@ p.bx-base-pofile-unit-thumb.bx-def-ava-big-size {
     margin: 0;
     padding: 0;
 }
-.bx-base-pofile-cover-actions div.bx-base-general-entity-actions .bx-menu-custom-hor li.bx-menu-item-more-auto .bx-popup .bx-menu-custom .bx-menu-item {
-    width: 100%;
-    border-color: transparent;
-    border-radius: 0;
-    box-shadow: none;
-}
+
 /* Cover block */
 .bx-base-profile-cover-block-wrapper .bx-base-pofile-cover-actions div.bx-base-general-entity-actions{
     position: relative;

+ 1 - 1
modules/boonex/artificer/data/template/mod_profile/menu_custom_actions.html

@@ -1,6 +1,6 @@
 <ul id="__html_id__" class="bx-menu-custom bx-menu-custom-hor bx-menu-hor-inline<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex justify-center lg:justify-end items-stretch space-y-0 space-x-3">
     <bx_repeat:menu_items>
-        <li class="bx-menu-item bx-menu-item-__name____class__ group inline-flex items-center px-4 py-2 first:ml-0 border border-gray-300 dark:border-gray-700 shadow-sm hover:shadow-md text-sm font-medium rounded-md text-gray-700 dark:text-gray-300 dark:hover:text-white hover:text-gray-800 bg-white dark:bg-gray-800 dark:hover:bg-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">__item__</li>
+        <li class="bx-menu-item bx-menu-item-__name____class__ group inline-flex items-center first:ml-0 border border-gray-300 dark:border-gray-700 shadow-sm hover:shadow-md text-sm font-medium rounded-md text-gray-700 dark:text-gray-300 dark:hover:text-white hover:text-gray-800 bg-white dark:bg-gray-800 dark:hover:bg-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">__item__</li>
     </bx_repeat:menu_items>
 </ul>
 __js_code__

+ 1 - 1
modules/boonex/artificer/data/template/mod_profile/menu_custom_item_actions.html

@@ -1,4 +1,4 @@
 <span class="__class_wrp__ truncate">
-    <a class="__class_link__ flex flex-row sm:items-center" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__><span class="bx-mi-icon flex items-center justify-center h-5 w-5"><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img class="h-5 w-5" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image></span><bx_if:title><span class="bx-mi-text ml-2 first:ml-0 whitespace-nowrap truncate">__title__</span></bx_if:title></a>
+    <a class="__class_link__ flex flex-row flex-nowrap sm:items-center" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__><span class="bx-mi-icon flex items-center justify-center h-5 w-5"><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img class="h-5 w-5" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image></span><bx_if:title><span class="bx-mi-text ml-2 first:ml-0 whitespace-nowrap truncate">__title__</span></bx_if:title></a>
     <bx_if:addon>__addon__</bx_if:addon>
 </span>

+ 1 - 1
modules/boonex/artificer/data/template/mod_profile/unit.html

@@ -12,7 +12,7 @@
             <div class="bx-base-pofile-unit-online"></div>
         </bx_if:show_online>
     </div>
-    <div class="bx-def-unit-info bx-def-__size__-size-min-height bx-def-__size__-size-max-height flex items-center ml-4">
+    <div class="bx-def-unit-info bx-def-__size__-size-min-height bx-def-__size__-size-max-height flex items-center max-w-32 ml-4">
         <div class="bx-def-unit-info-cnt box-border overflow-hidden">
             <div class="bx-def-unit-line truncate">
                 <a class="bx-def-unit-info-title" href="__content_url__" onclick="__content_click__">__title__</a>

+ 16 - 0
modules/boonex/artificer/data/template/system/comment_attachments.html

@@ -0,0 +1,16 @@
+<div class="flex">
+    <bx_repeat:attached>
+        <div class="__style_prefix__-attached-preview w-24 h-24 m-1">
+            <bx_if:show_image>
+                <a href="javascript:void(0)" onclick="__js_object__.showImage(this, '__file__'); return false;" title="<bx_text_attribute:_cmt_view_attached_image />">
+                    <img class="w-24 h-24 rounded" src="<bx_image_url:spacer.gif />" style="background-image:url(__preview__)" />
+                </a>
+            </bx_if:show_image>
+            <bx_if:show_file>
+                <a href="__file__" title="<bx_text_attribute:_cmt_download_attached_file />">
+                    <img class="w-24 h-24 rounded" src="<bx_image_url:spacer.gif />" style="background-image:url(__preview__)" />
+                </a>
+            </bx_if:show_file>
+        </div>
+    </bx_repeat:attached>
+</div>

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

@@ -474,12 +474,29 @@
     .bx-artificer .bx-informer-msg-error {
         @apply bg-red-50 text-red-700;
     }
+    .bx-artificer .bx-form-row-view-value {
+        @apply truncate;
+    }
 
     /* Common elements: Comments */
     .bx-artificer .cmt .bx-base-general-unit-meta-username {
         @apply text-gray-700 dark:text-gray-200 hover:text-gray-900 dark:hover:text-white;
     }
 
+    /* Common elements: Units */
+    .bx-artificer .bx-def-icon-size {
+        @apply h-8 w-8;
+    }
+    .bx-artificer .bx-def-thumb-size {
+        @apply h-10 w-10;
+    }
+    .bx-artificer .bx-def-ava-size {
+        @apply h-24 w-24;
+    }
+    .bx-artificer .bx-def-ava-big-size {
+        @apply w-48 h-48;
+    }
+
     /* Modules: Timeline */
     .bx-artificer .bx-menu-custom-hor.bx-menu-object-bx_timeline_menu_view li.bx-menu-tab-active a {
         @apply bg-gray-50 dark:bg-gray-700 ring-1 ring-gray-200 dark:ring-gray-600 text-gray-900 dark:text-white shadow;

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


+ 9 - 0
plugins_public/tailwind/js/tailwind.config.js

@@ -11,6 +11,9 @@ module.exports = {
         './inc/js/*.js',
         './inc/js/classes/*.js',
 
+        './modules/base/**/js/*.js',
+        './modules/base/**/template/*.html',
+
         // Artificer
         './modules/boonex/artificer/js/*.js',
         './modules/boonex/artificer/data/template/**/*.html',
@@ -47,8 +50,11 @@ module.exports = {
         'bx-informer-msg-info', 'bx-informer-msg-alert', 'bx-informer-msg-error',
         'bx-def-unit-alert', 'bx-def-unit-alert-small', 'bx-def-unit-alert-middle',
         'bx-def-label',
+        'bx-def-icon-size', 'bx-def-thumb-size', 'bx-def-ava-size', 'bx-def-ava-big-size',
 
         'bx-base-general-unit-meta-username',
+
+        'bx-base-pofile-unit-with-cover', 'bx-bp-uc-empty'
     ]
   },
   darkMode: 'media', // false or 'media' or 'class'
@@ -68,6 +74,9 @@ module.exports = {
             6: '1.5rem',
             88: '22rem'
         },
+        maxWidth: {
+            32: '8rem',
+        },
         height: {
             112: '28rem',
             128: '32rem',

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