Merge remote-tracking branch 'origin/master'

modules/boonex/artificer/data/template/bx_timeline/css/view.css

@@ -172,21 +172,22 @@ div.bx-tl-view div.bx-tl-item-videos.bx-tl-iv-single div.bx-tl-item-video video
 }
 
 /*+++ Item Attachment +++*/
-div.bx-tl-view-timeline div.bx-tl-item-attachment,
-div.bx-tl-view-outline div.bx-tl-item-attachment,
-div.bx-tl-view-item div.bx-tl-item-attachment,
-div.bx-tl-view-search div.bx-tl-item-attachment {
+div.bx-tl-view div.bx-tl-item-attachments {
     position: relative;
-    display: -webkit-flex;
-    display: flex;
+    white-space: nowrap;
+    overflow-x: auto;
+}
+div.bx-tl-view div.bx-tl-item-attachments div.bx-tl-item-attachment {
+    position: relative;
+    display: -webkit-inline-flex;
+    display: inline-flex;
     -webkit-justify-content: center;
     justify-content: center;  
 
     width: 100%;
+    vertical-align: middle;
 }
-div.bx-tl-view-timeline div.bx-tl-item-attachments.bx-tl-ia-gallery div.bx-tl-item-attachment img,
-div.bx-tl-view-item div.bx-tl-item-attachments.bx-tl-ia-gallery div.bx-tl-item-attachment img,
-div.bx-tl-view-search div.bx-tl-item-attachments.bx-tl-ia-gallery div.bx-tl-item-attachment img {
+div.bx-tl-view div.bx-tl-item-attachments div.bx-tl-item-attachment img {
     position: relative;
     display: block;
     max-width: 100%;
@@ -218,12 +219,6 @@ div.bx-tl-item-attachment .bx-tl-iv-duration {
     background-color: rgba(255, 255, 255, 0.8);
 }
 
-/*+++ Files +++*/
-div.bx-tl-view-timeline div.bx-tl-item-attachments.bx-tl-iaf-gallery div.bx-tl-item-attachment,
-div.bx-tl-view-item div.bx-tl-item-attachments.bx-tl-iaf-gallery div.bx-tl-item-attachment,
-div.bx-tl-view-search div.bx-tl-item-attachments.bx-tl-iaf-gallery div.bx-tl-item-attachment {
-    width: auto;
-}
 
 /*+++ Showcase Layout +++*/
 div.bx-tl-item-attachments.bx-tl-ia-showcase {

modules/boonex/artificer/data/template/bx_timeline/type_post.html

@@ -15,6 +15,13 @@
         </bx_repeat:items>
     </div>
 </bx_if:show_videos>
+<bx_if:show_files>
+    <div class="__style_prefix__-item-files __style_prefix__-if-main __style_prefix__-if-__display__ mx-1 mb-3 lg:mb-4 rounded">
+        <bx_repeat:items>
+            <div class="__style_prefix__-item-file rounded">__item__</div>
+        </bx_repeat:items>
+    </div>
+</bx_if:show_files>
 <div class="__style_prefix__-item-text group px-3 lg:px-4 pt-0">
     <bx_if:show_title>
         <div class="__style_prefix__-title text-lg lg:text-xl font-semibold text-gray-700 group-hover:text-gray-900 dark:text-gray-300 dark:group-hover:text-white mb-1 lg:mb-2 ">__title__</div>
@@ -38,7 +45,7 @@
     </div>
 </bx_if:show_links>
 <bx_if:show_attachments_files>
-    <div class="__style_prefix__-item-attachments __style_prefix__-iaf-__display__ __style_prefix__-iaf-i__count__ flex justify-start px-3 lg:px-4 mt-3 lg:mt-4 space-x-2">
+    <div class="__style_prefix__-item-attachments __style_prefix__-iaf-__display__ __style_prefix__-iaf-i__count__ mx-1 mb-3 lg:mb-4">
         <bx_repeat:items>
             <div class="__style_prefix__-item-attachment__class__">__item__</div>
         </bx_repeat:items>

modules/boonex/artificer/data/template/system/comment_counter.html

@@ -2,8 +2,8 @@
     <a class="group flex items-center p-1 pl-2 border-none rounded-full text-gray-500 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-600" href="__href__"<bx_if:show_onclick> onclick="__onclick__"</bx_if:show_onclick>>
         <bx_repeat:profiles>__icon__</bx_repeat:profiles>
         <bx_if:show_icon>
-            <div class="sys-action-counter-icon __sp__-counter-icon bx-def-icon-size flex items-center justify-center h-6 w-6 mr-2 ring-1 ring-white dark:ring-gray-700 h-6 w-6 bg-gray-200 dark:bg-gray-700 rounded-full">__icon__</div>
+            <div class="sys-action-counter-icon __sp__-counter-icon bx-def-icon-size flex items-center justify-center z-10 h-6 w-6 ring-1 ring-white dark:ring-gray-700 h-6 w-6 bg-gray-200 dark:bg-gray-700 rounded-full">__icon__</div>
         </bx_if:show_icon>
-    __content__
+        <div class="ml-2 first:ml-0">__content__</div>
     </a>
 </div>

modules/boonex/artificer/data/template/system/css/cmts.css

@@ -63,4 +63,9 @@ span.cmt-reply-to a .bx-def-icon-size {
     height: 1.0rem;
     line-height: 0.875rem;
     font-size: 0.6rem;
+}
+
+/*--- Comment Element Styles ---*/
+.cmt-counter .bx-base-pofile-unit-online {
+    display: none;
 }

modules/boonex/artificer/data/template/system/css/page_layouts.css

@@ -11,4 +11,18 @@ import url(../../../../../../../template/css/page_layouts.css);
     margin-top: 0;
     margin-bottom: 0;
     border-style: dashed;
+}
+
+/* menu visibility */
+.bx-layout-column-thin .bx-def-thin-col-hide{
+    display: none;
+}
+.bx-layout-column-half .bx-def-half-col-hide{
+    display: none;
+}
+.bx-layout-column-wide .bx-def-wide-col-hide{
+    display: none;
+}
+.bx-layout-column-full .bx-def-full-col-hide{
+    display: none;
 }

modules/boonex/timeline/js/view.js

@@ -48,7 +48,7 @@ function BxTimelineView(oOptions) {
         window.glBxTimelineVapPlayers = [];
 
     //--- Use Scroll for Attachments.
-    this._bScrollForFiles = false;
+    this._bScrollForFiles = true;
 
     //--- Get currently active 'view'.
     this.initView();

modules/boonex/timeline/template/css/view.css

@@ -792,18 +792,12 @@ div.bx-tl-view div.bx-tl-item-videos.bx-tl-iv-single div.bx-tl-item-video video
 }
 
 /*+++ Item Attachment +++*/
-div.bx-tl-view-timeline div.bx-tl-item-attachments,
-div.bx-tl-view-outline div.bx-tl-item-attachments,
-div.bx-tl-view-item div.bx-tl-item-attachments,
-div.bx-tl-view-search div.bx-tl-item-attachments {
+div.bx-tl-view div.bx-tl-item-attachments {
     position: relative;
     white-space: nowrap;
     overflow-x: auto;
 }
-div.bx-tl-view-timeline div.bx-tl-item-attachment,
-div.bx-tl-view-outline div.bx-tl-item-attachment,
-div.bx-tl-view-item div.bx-tl-item-attachment,
-div.bx-tl-view-search div.bx-tl-item-attachment {
+div.bx-tl-view div.bx-tl-item-attachments div.bx-tl-item-attachment {
     position: relative;
     display: -webkit-inline-flex;
     display: inline-flex;
@@ -813,9 +807,7 @@ div.bx-tl-view-search div.bx-tl-item-attachment {
     width: 100%;
     vertical-align: middle;
 }
-div.bx-tl-view-timeline div.bx-tl-item-attachments.bx-tl-ia-gallery div.bx-tl-item-attachment img,
-div.bx-tl-view-item div.bx-tl-item-attachments.bx-tl-ia-gallery div.bx-tl-item-attachment img,
-div.bx-tl-view-search div.bx-tl-item-attachments.bx-tl-ia-gallery div.bx-tl-item-attachment img {
+div.bx-tl-view div.bx-tl-item-attachments div.bx-tl-item-attachment img {
     position: relative;
     display: block;
     max-width: 100%;
@@ -847,14 +839,6 @@ div.bx-tl-item-attachment .bx-tl-iv-duration {
     background-color: rgba(255, 255, 255, 0.8);
 }
 
-/*+++ Files +++*/
-div.bx-tl-view-timeline div.bx-tl-item-attachments.bx-tl-iaf-gallery div.bx-tl-item-attachment,
-div.bx-tl-view-item div.bx-tl-item-attachments.bx-tl-iaf-gallery div.bx-tl-item-attachment,
-div.bx-tl-view-search div.bx-tl-item-attachments.bx-tl-iaf-gallery div.bx-tl-item-attachment {
-    display: inline-block;
-    width: auto;
-}
-
 
 /*+++ Showcase Layout +++*/
 div.bx-tl-item-attachments.bx-tl-ia-showcase {

modules/boonex/timeline/template/type_post.html

@@ -16,9 +16,9 @@
     </div>
 </bx_if:show_videos>
 <bx_if:show_files>
-    <div class="__style_prefix__-item-images __style_prefix__-ii-main __style_prefix__-ii-__display__ bx-def-margin-top">
+    <div class="__style_prefix__-item-files __style_prefix__-if-main __style_prefix__-if-__display__ bx-def-margin-top">
         <bx_repeat:items>
-            <div class="__style_prefix__-item-image">__item__</div>
+            <div class="__style_prefix__-item-file">__item__</div>
         </bx_repeat:items>
     </div>
 </bx_if:show_files>

plugins_public/tailwind/css/tailwind.css

@@ -326,7 +326,7 @@
 
     /* Common elements: Blocks, Boxes, etc. */
     .bx-artificer .bx-def-color-bg-block {
-        @apply bg-gray-50 dark:bg-gray-900;
+        @apply bg-white dark:bg-gray-900;
     }
     .bx-artificer .bx-def-color-bg-box {
         @apply bg-white dark:bg-gray-800;

template/comment_counter.html

@@ -1 +1,9 @@
-<div id="__id__" class="__class__"><a class="bx-def-valign-center" href="__href__"<bx_if:show_onclick> onclick="__onclick__"</bx_if:show_onclick>><bx_repeat:profiles>__icon__</bx_repeat:profiles><bx_if:show_icon><div class="sys-action-counter-icon __sp__-counter-icon bx-def-icon-size bx-def-margin-sec-right bx-def-align-center"><i class="__sp__-counter-icon sys-icon comment"></i></div></bx_if:show_icon>__content__</a></div>
+<div id="__id__" class="__class__">
+    <a class="bx-def-valign-center" href="__href__"<bx_if:show_onclick> onclick="__onclick__"</bx_if:show_onclick>>
+        <bx_repeat:profiles>__icon__</bx_repeat:profiles>
+        <bx_if:show_icon>
+            <div class="sys-action-counter-icon __style_prefix__-counter-icon bx-def-icon-size bx-def-align-center"><i class="__style_prefix__-counter-icon sys-icon comment"></i></div>
+        </bx_if:show_icon>
+        <div class="bx-def-margin-sec-left-auto">__content__</div>
+    </a>
+</div>

template/css/cmts.css

@@ -428,8 +428,6 @@ span.cmt span.cmt-counter-holder {
     box-sizing: border-box;
     z-index: 2;
 
-    margin-right: 0.5rem;
-
     background-color: rgba(232, 232, 232, 1.0);
     border: 1px solid #ffffff;
     border-radius: 1rem;

template/css/page_layouts.css

@@ -98,3 +98,17 @@
     width:66%;
 }
 
+
+/* menu visibility */
+.bx-layout-column-thin .bx-def-thin-col-hide{
+    display: none;
+}
+.bx-layout-column-half .bx-def-half-col-hide{
+    display: none;
+}
+.bx-layout-column-wide .bx-def-wide-col-hide{
+    display: none;
+}
+.bx-layout-column-full .bx-def-full-col-hide{
+    display: none;
+}

template/scripts/BxBaseCmts.php

@@ -778,9 +778,10 @@ class BxBaseCmts extends BxDolCmts
             'content' => $this->_getCounterLabel($iCount, $aParams),
             'bx_repeat:profiles' => $aTmplVarsProfiles,
             'bx_if:show_icon' => array(
-                'condition' => $bShowEmpty && (!isset($aParams['show_icon']) || $aParams['show_icon']),
+                'condition' => ($bShowEmpty || !empty($aTmplVarsProfiles)) && (!isset($aParams['show_icon']) || $aParams['show_icon']),
                 'content' => array(
-                    'icon' => isset($aParams['custom_icon']) && $aParams['custom_icon'] != '' ? $aParams['custom_icon'] : BxTemplFunctions::getInstanceWithTemplate($this->_oTemplate)->getFontIconAsHtml('comment', $this->_sStylePrefix . '-counter-icon sys-icon')
+                    'style_prefix' => $this->_sStylePrefix,
+                    'icon' => !empty($aParams['custom_icon']) ? $aParams['custom_icon'] : BxTemplFunctions::getInstanceWithTemplate($this->_oTemplate)->getFontIconAsHtml('comment', $this->_sStylePrefix . '-counter-icon sys-icon')
                 )
             )
         ));