Merge branch 'master' of https://github.com/unaio/una

inc/classes/BxDolTemplate.php

@@ -3315,7 +3315,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
         header( 'Content-type: text/html; charset=utf-8' );
         header( 'X-Frame-Options: sameorigin' );
         if (BX_PAGE_EMBED == $oTemplate->getPageNameIndex())
-            header('Content-Security-Policy: frame-ancestors ' . getParam('sys_csp_frame_ancestors')) ;
+            header('Content-Security-Policy: frame-ancestors ' . getParam('sys_csp_frame_ancestors'));
 
         echo $oTemplate->parsePageByName('page_' . $oTemplate->getPageNameIndex() . '.html', $oTemplate->getPageContent());
     }

inc/js/classes/BxDolMenuMoreAuto.js

@@ -121,10 +121,10 @@ BxDolMenuMoreAuto.prototype._moveToSubmenu = function(oMenu, oItemMore, oItemMor
             oItem.addClass('bx-def-color-bg-hl-hover');
             oItem.find('a').each(function() {
                 if($(this).hasClass('bx-btn'))
-                    $(this).removeClass('bx-btn').addClass('!bx-btn');
+                    $(this).removeClass('bx-btn').addClass('bx-nobtn');
 
                 if($(this).hasClass('bx-btn-height'))
-                    $(this).removeClass('bx-btn-height').addClass('!bx-btn-height');
+                    $(this).removeClass('bx-btn-height').addClass('bx-nobtn-height');
             });
 
             if(!oSubmenuItemFirst.length)
@@ -163,11 +163,11 @@ BxDolMenuMoreAuto.prototype._moveFromSubmenu = function(oMenu, oItemMore, oItemM
 
         oItem.removeClass('bx-def-color-bg-hl-hover');
         oItem.find('a').each(function() {
-            if($(this).hasClass('!bx-btn'))
-                $(this).removeClass('!bx-btn').addClass('bx-btn');
+            if($(this).hasClass('bx-nobtn'))
+                $(this).removeClass('bx-nobtn').addClass('bx-btn');
 
-            if($(this).hasClass('!bx-btn-height'))
-                $(this).removeClass('!bx-btn-height').addClass('bx-btn-height');
+            if($(this).hasClass('bx-nobtn-height'))
+                $(this).removeClass('bx-nobtn-height').addClass('bx-btn-height');
         });
 
         oItemMore.before(oItem.detach());

inc/js/embed.js

@@ -1,4 +0,0 @@
-
-$(document).ready(function() {
-    $(window.frameElement, window.parent.document).height($('.bx-embed').height() + 2);
-});

modules/boonex/decorous/data/template/system/css/common.css

@@ -31,7 +31,6 @@
 }
 .bx-btn .sys-icon {
     font-size: 0.875rem !important;
-    line-height: 1.9rem !important;
 }
 
 @keyframes loadingCircle{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}[bx-click-animating='true']{position:relative}html{--bx-wave-shadow-color:#1890ff}

modules/boonex/decorous/data/template/system/css/default.less

@@ -836,6 +836,9 @@
         font-size: @bx-font-size-button;
         font-weight: @bx-font-weight-button;
         color: @bx-font-color-button;
+        
+        padding-top: 0px;
+        padding-bottom: 0px;
     }
     .bx-btn-height {
         height: @bx-height-button;

modules/boonex/lucid/data/template/system/css/common.css

@@ -6,13 +6,6 @@
     border-bottom: 1px solid transparent;
 }
 
-/* --- Buttons --- */
-.bx-btn i,
-.bx-btn u {
-    display: inline-block;
-    vertical-align: top !important;
-}
-
 /* --- Popup boxes --- */
 .bx-popup {    
 	-moz-box-shadow: none;

modules/boonex/lucid/data/template/system/css/default.less

@@ -890,6 +890,9 @@
         font-size: @bx-font-size-button;
         font-weight: @bx-font-weight-button;
         color: @bx-font-color-button;
+        
+        padding-top: 0px;
+        padding-bottom: 0px;
     }
     .bx-btn.bx-btn-primary {
         .box-sizing(@base-input-box-sizing);

modules/boonex/ocean/data/template/system/css/menu.css

@@ -52,4 +52,8 @@ ul.bx-menu-toolbar li a .sys-icon-a {
 .bx-menu-main-submenu.bx-menu-more-auto .bx-menu-submenu-more-auto .bx-menu-item .bx-btn,
 .bx-menu-custom.bx-menu-custom-hor.bx-menu-more-auto .bx-menu-submenu-more-auto .bx-menu-item .bx-btn {
     color: #29789c;
+}
+
+.bx-menu-main-submenu.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto a, .bx-menu-custom.bx-menu-custom-hor.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto a {
+    padding: 0.5rem;
 }

modules/boonex/protean/data/template/system/css/common.css

@@ -5,12 +5,6 @@ a {
     transition: color .1s ease;
 }
 
-/* --- Buttons --- */
-.bx-btn i,
-.bx-btn u {
-    vertical-align: top !important;
-}
-
 /* --- Loading indicator --- */
 .bx-loading-ajax-btn {
     margin-left: 10px;

modules/boonex/protean/data/template/system/css/default.less

@@ -796,6 +796,9 @@
         font-size: @bx-font-size-button;
         font-weight: @bx-font-weight-button;
         color: @bx-font-color-button;
+        
+        padding-top: 0px;
+        padding-bottom: 0px;
     }
     .bx-btn.bx-btn-primary {
         .box-sizing(@base-input-box-sizing);
@@ -1050,7 +1053,7 @@
         .box-sizing(@base-input-box-sizing);
 
         height: @bx-height-button-small;
-        line-height: (@bx-height-button-small - 0.125 * @bx-border-width-button-small);
+        line-height: (@bx-height-button-small - 0.125 * @bx-border-width-button-small - 0.5rem);
 
         .background-color (@bx-color-button-small);
 

modules/boonex/videos/template/unit_gallery_embed.html

@@ -1,11 +1,10 @@
-<div class="__class__ bx-base-text-unit bx-base-text-unit-gallery bx-def-gal-unit-size bx-def-padding-sec bx-def-margin-sec-bottom">
-    <div class="bx-base-text-unit-cnt bx-def-box bx-def-round-corners bx-def-color-bg-box bx-def-box-sizing">
+
         <bx_if:thumb>
-            <a href="__content_url__" title="__summary_attr__">
+           
                 <div class="bx-def-round-corners bx-def-font-middle" >
                     __entry_video__
                 </div>
-            </a>
+
         </bx_if:thumb>
         <bx_if:no_thumb>
             <div class="bx-def-gal-img-column">
@@ -15,6 +14,4 @@
                 </div>
             </div>
         </bx_if:no_thumb>
-        
-    </div>
-</div>  
+       

plugins_public/tailwind/css/tailwind.css

@@ -349,57 +349,57 @@
     }
 
     /* Common elements: Buttons */
-    .bx-btn {
+    .bx-artificer .bx-btn {
         @apply relative inline-flex justify-center items-center px-4 py-2 border border-gray-300 dark:border-gray-700 text-sm font-medium text-gray-700 dark:text-gray-300 dark:hover:text-white hover:text-gray-800 whitespace-nowrap 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 rounded-md shadow-sm hover:shadow-md cursor-pointer;
     }
 
-    .bx-btn i, 
-    .bx-btn u {
+    .bx-artificer .bx-btn i, 
+    .bx-artificer .bx-btn u {
         @apply inline-block align-middle;
     }
 
-    .bx-btn i, 
-    .bx-btn img {
+    .bx-artificer .bx-btn i, 
+    .bx-artificer .bx-btn img {
         @apply w-5 h-5 leading-5 text-gray-600 dark:text-gray-300;
     }
 
-    .bx-btn:hover i, 
-    .bx-btn:hover img {
+    .bx-artificer .bx-btn:hover i, 
+    .bx-artificer .bx-btn:hover img {
         @apply text-gray-800 dark:text-gray-100;
     }
 
-    .bx-btn i {
+    .bx-artificer .bx-btn i {
         @apply text-center;
     }
 
-    .bx-btn u {
+    .bx-artificer .bx-btn u {
         @apply ml-2 first:ml-0 no-underline;
     }
 
-    .bx-btn.bx-btn-primary {
+    .bx-artificer .bx-btn.bx-btn-primary {
         @apply border-transparent text-white hover:text-white dark:hover:text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500;
     }
 
-    .bx-btn.bx-btn-primary i, 
-    .bx-btn.bx-btn-primary img {
+    .bx-artificer .bx-btn.bx-btn-primary i, 
+    .bx-artificer .bx-btn.bx-btn-primary img {
         @apply text-gray-300;
     }
     
-    .bx-btn.bx-btn-primary:hover i, 
-    .bx-btn.bx-btn-primary:hover img {
+    .bx-artificer .bx-btn.bx-btn-primary:hover i, 
+    .bx-artificer .bx-btn.bx-btn-primary:hover img {
         @apply text-gray-100;
     }
     
-    .bx-btn.bx-btn-disabled {
+    .bx-artificer .bx-btn.bx-btn-disabled {
         @apply bg-gray-50 dark:bg-gray-700 hover:bg-gray-50 dark:hover:bg-gray-700 text-gray-400 hover:text-gray-400 dark:hover:text-gray-400 focus:ring-0 focus:ring-offset-0 shadow-none cursor-default !important;
     }
 
-    .bx-btn.bx-btn-small {
+    .bx-artificer .bx-btn.bx-btn-small {
         @apply py-1 text-xs;
     }
 
-    .bx-btn.bx-btn-small i, 
-    .bx-btn.bx-btn-small img {
+    .bx-artificer .bx-btn.bx-btn-small i, 
+    .bx-artificer .bx-btn.bx-btn-small img {
         @apply w-4 h-4 leading-4;
     }
 

studio/template/css/common.less

@@ -115,12 +115,14 @@ a:hover > .sys-icon-a i {
     font-size: 1.075rem;
     font-weight: 400;
     color: rgba(251, 252, 253, 1.0);
+    border-width: 0px;
 }
 .bx-btn:hover,
 .bx-btn:active,
 .bx-btn.bx-btn-primary:hover,
 .bx-btn.bx-btn-primary:active {
     .background-color(rgba(68, 134, 244, 0.8));
+    color: rgba(251, 252, 253, 1.0);
 }
 .bx-btn .sys-icon {
     color: rgba(255, 255, 255, 0.9);

template/_header_js.html

@@ -8,7 +8,7 @@
 
     (function(w) {
         var dpr = (w.devicePixelRatio === undefined ? 1 : Math.round(w.devicePixelRatio));
-        if ($.cookie('devicePixelRatio') == dpr || dpr < 2 || (typeof(bIgnorePixelRatio) != "undefined" && bIgnorePixelRatio) || !navigator.cookieEnabled || '#dpr' === window.location.hash || localStorage.getItem("dpr"))
+        if ($.cookie('devicePixelRatio') == dpr || dpr < 2 || (typeof(bIgnorePixelRatio) != "undefined" && bIgnorePixelRatio) || !navigator.cookieEnabled || '#dpr' === window.location.hash || localStorage.getItem("dpr"))        
             return;
         $.cookie('devicePixelRatio', dpr, {expires: 365, path: '/'});
         if (!window.location.hash.length)

template/css/common.css

@@ -758,10 +758,6 @@ svg .gray .outer .p2 {
     background-color: #79bd9a;
     text-decoration:none;
 }
-.bx-btn{
-	padding-top:0px;
-	padding-bottom:0px;    
-}
 A.bx-btn{
     display: inline-block
 }
@@ -773,6 +769,9 @@ A.bx-btn{
     background-size:1.2em 1.2em;
     background-position:center center;
 }
+.bx-btn .bx-def-valign-center{
+    height: 100%;
+}
 .bx-btn u {
     margin-left: 10px;
     text-decoration: none;

template/css/editor.less

@@ -1,20 +1,3 @@
-@import 'default.less';
-
-body, td, pre {
-    .bx-def-font;
-}
-
-h1 {
-	.bx-def-font-h1;
-}
-
-h2 {
-	.bx-def-font-h2;
-}
-
-h3 {
-	.bx-def-font-h3;
-}
 
 blockquote {
     /* NOTE: copied from common.css */

template/css/embed.css

@@ -3,7 +3,7 @@ body,
     background-color: transparent !important;
 }
 .bx-embed{
-    width:calc(100% - 2px);
+    width:100%;
 }
 .bx-embed .bx-base-pofile-unit-with-cover{
     display: block;

template/css/forms.css

@@ -286,7 +286,6 @@
 
 .bx-form-input-wrapper-file .bx-btn {
 	float: none;
-	display: inline-block;
 }
 .bx-form-input-file {
 	position: fixed;

template/css/grid.css

@@ -64,7 +64,6 @@
     text-align: right;
 }
 .bx-grid-header-controls-independent .bx-btn {
-    display: inline-block;
     float: none;
     white-space: nowrap;
 }

template/scripts/BxBaseServices.php

@@ -78,9 +78,9 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
                 /**
                  * Note. For now Tailwind isn't needed in Studio.
                  */
-                list($sPageUrl, $sPageParams) = bx_get_base_url_inline();
-                if(!empty($sPageUrl) && strncmp($sPageUrl, BX_DOL_URL_STUDIO, strlen(BX_DOL_URL_STUDIO)) == 0)
-                    break;
+                //list($sPageUrl, $sPageParams) = bx_get_base_url_inline();
+               // if(!empty($sPageUrl) && strncmp($sPageUrl, BX_DOL_URL_STUDIO, strlen(BX_DOL_URL_STUDIO)) == 0)
+                //    break;
 
                 $sResult = '{dir_plugins_public}tailwind/css/|tailwind.min.css';
                 break;