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

modules/base/general/template/css/main.css

@@ -263,9 +263,6 @@ div.bx-base-general-comments div.bx-base-general-comments-counter-holder {
     margin-left: -1rem;
 }
 
-.bx-badge-icon{
-    color:inherit;
-}
 
 #bx-popup-ajax-wrapper-sys_set_badges li span{
     display: flex;

modules/boonex/artificer/data/template/mod_general/css/main.css

@@ -73,9 +73,6 @@
     width: 0.625rem;
     margin-left: -1rem;
 }
-.bx-badge-icon{
-    color:inherit;
-}
 
 /* more menu */
 .bx-menu-submenu-more-auto .bx-menu-item:not(.bx-stl-mil-wo-gaps-sm) .sys-action-do-icon,

plugins_public/tailwind/css/tailwind.css

@@ -1238,10 +1238,13 @@
         @apply inline-flex grow-0 space-x-1 w-min
     }
     .bx-badge{
-        @apply inline-flex items-center w-min space-x-1 px-1.5 py-0.5 rounded-full;
+        @apply inline-flex items-center w-max space-x-1 px-1.5 py-0.5 rounded-full;
         @apply text-white text-xs font-medium whitespace-nowrap;
         @apply opacity-90 hover:opacity-100 active:translate-y-0.5
     }
+    .bx-badge img{
+        @apply max-h-4;
+    }
     .sys-icon-image.bx-badge-icon,
     .sys-icon-svg.bx-badge-icon{
         @apply w-4 h-4

studio/template/scripts/BxBaseStudioBadgesGrid.php

@@ -306,7 +306,7 @@ class BxBaseStudioBadgesGrid extends BxDolStudioBadgesGrid
     {
         $aForm = array(
             'form_attrs' => array(
-                'id' => 'adm-form-search-form-edit',
+                'id' => 'adm-form-bages-form-' . $sAction,
                 'action' => BX_DOL_URL_ROOT . 'grid.php?o=' . $this->_sObject . '&module=' . $this->sModule . '&a=' . $sAction,
                 'method' => BX_DOL_STUDIO_METHOD_DEFAULT
             ),

studio/template/scripts/BxBaseStudioFormsCategories.php

@@ -196,7 +196,7 @@ class BxBaseStudioFormsCategories extends BxDolStudioFormsCategories
     {
         $aForm = array(
             'form_attrs' => array(
-                'id' => 'adm-form-search-form-edit',
+                'id' => 'adm-form-cats-form-' . $sAction,
                 'action' => BX_DOL_URL_ROOT . 'grid.php?o=' . $this->_sObject . '&module=' . $this->sModule . '&a=' . $sAction,
                 'method' => BX_DOL_STUDIO_METHOD_DEFAULT
             ),

studio/template/scripts/BxBaseStudioFormsLabels.php

@@ -191,7 +191,7 @@ class BxBaseStudioFormsLabels extends BxDolStudioFormsLabels
     {
         $aForm = array(
             'form_attrs' => array(
-                'id' => 'adm-form-search-form-edit',
+                'id' => 'adm-form-labels-form-' . $sAction,
                 'action' => BX_DOL_URL_ROOT . 'grid.php?o=' . $this->_sObject . '&a=' . $sAction . '&parent=' . $this->_iParent,
                 'method' => BX_DOL_STUDIO_METHOD_DEFAULT
             ),