Selaa lähdekoodia

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

AntonLV 4 vuotta sitten
vanhempi
sitoutus
59ba751bce

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

@@ -76,6 +76,9 @@
 .bx-sidebar.bx-sidebar-account .bx-sb-profile .bx-base-pofile-unit {
 .bx-sidebar.bx-sidebar-account .bx-sb-profile .bx-base-pofile-unit {
     margin: 0;
     margin: 0;
 }
 }
+.bx-sidebar .bx-sb-theme-switcher .sys-icon{
+    font-size: 24px;
+}
 .bx-sidebar.bx-sidebar-account .bx-sb-menu .bx-menu-item-addon.bx-def-unit-alert {
 .bx-sidebar.bx-sidebar-account .bx-sb-menu .bx-menu-item-addon.bx-def-unit-alert {
     top: auto;
     top: auto;
     right: 0.5rem;
     right: 0.5rem;

+ 1 - 1
modules/boonex/artificer/data/template/system/sidebar_account.html

@@ -12,7 +12,7 @@
         </div>
         </div>
         <div class="bx-sb-profile flex-shrink-0 px-4 pb-4 flex justify-between items-center">__active_profile__
         <div class="bx-sb-profile flex-shrink-0 px-4 pb-4 flex justify-between items-center">__active_profile__
             <div class="bx-sb-theme-switcher">
             <div class="bx-sb-theme-switcher">
-                <a href="javascript:" onclick="bx_artificer_set_color_scheme()"><i class="sys-icon moon" style="font-size: 24px"></i></a>
+                <a href="javascript:" onclick="bx_artificer_set_color_scheme()"><i class="sys-icon"></i></a>
             </div>
             </div>
         </div>
         </div>
         <hr class="bx-def-hr" />
         <hr class="bx-def-hr" />

+ 0 - 13
modules/boonex/artificer/js/utils.js

@@ -1,16 +1,5 @@
 //for custom JS
 //for custom JS
 $(document).ready(function() {
 $(document).ready(function() {
-    /*if ($.cookie('prefers-color-scheme') == ''){
-        if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
-            $('html').addClass('dark')
-        }
-    }     
-    else{
-        console.log($.cookie('prefers-color-scheme'));
-        if ($.cookie('prefers-color-scheme') == 'dark'){
-            $('html').addClass('dark')
-        }
-    }*/
     if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
     if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
         $('html').addClass('dark')
         $('html').addClass('dark')
         $('.bx-sb-theme-switcher .sys-icon').addClass('moon');
         $('.bx-sb-theme-switcher .sys-icon').addClass('moon');
@@ -24,11 +13,9 @@ function bx_artificer_set_color_scheme(){
     v = 'moon'
     v = 'moon'
     if($('.bx-sb-theme-switcher .sys-icon').hasClass('moon')){
     if($('.bx-sb-theme-switcher .sys-icon').hasClass('moon')){
         v = 'sun';
         v = 'sun';
-        console.log(1)
         $('.bx-sb-theme-switcher .sys-icon').addClass('sun').removeClass('moon')
         $('.bx-sb-theme-switcher .sys-icon').addClass('sun').removeClass('moon')
     }
     }
     else{
     else{
-         console.log(2)
         $('.bx-sb-theme-switcher .sys-icon').addClass('moon').removeClass('sun')
         $('.bx-sb-theme-switcher .sys-icon').addClass('moon').removeClass('sun')
     }
     }
     
     

+ 1 - 1
template/scripts/BxBaseServices.php

@@ -82,7 +82,7 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
                 if(!empty($sPageUrl) && strncmp($sPageUrl, BX_DOL_URL_STUDIO, strlen(BX_DOL_URL_STUDIO)) == 0)
                 if(!empty($sPageUrl) && strncmp($sPageUrl, BX_DOL_URL_STUDIO, strlen(BX_DOL_URL_STUDIO)) == 0)
                     break;
                     break;
 
 
-                $sResult = '{dir_plugins_public}tailwind/css/|tailwind.min.css';
+                $sResult = '{dir_plugins_public}tailwind/css/|tailwind_class.min.css';
                 break;
                 break;
         }
         }