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

Ticket #3399 - Notifications, Lang\Templ switchers.

AntonLV 5 лет назад
Родитель
Сommit
2fdc6fd103

+ 11 - 0
modules/boonex/artificer/data/template/bx_notifications/css/view.css

@@ -0,0 +1,11 @@
+/*--
+import url(../../../../../notifications/template/css/view.css);
+--*/
+
+/*--- Preview Popup Style ---*/
+#bx_notifications_preview .bx-popup-close-wrapper {
+    position: absolute;
+    top: 0;
+    right: 0;
+    padding: 1rem;
+}

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

@@ -1,2 +1 @@
-/* CSS Document */
-
+/* CSS Document */

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

@@ -29,7 +29,7 @@
     function bx_sidebar_toggle(sType) {
         var oSidebar = $('.bx-sidebar.bx-sidebar-' + sType);
         var bShow = !oSidebar.hasClass('bx-sidebar-active') ? true : false;
-console.log(sType);
+
         oSidebar.toggleClass('bx-sidebar-active', bShow);
     }
 

+ 7 - 0
modules/boonex/artificer/data/template/system/css/common.css

@@ -203,6 +203,13 @@ import url(../../../../../../../template/css/common.css);
 .bx-popup-menu .bx-popup-close-wrapper {
     display: none;
 }
+.bx-popup-menu .bx-popup-content {
+    width: 14rem;
+}
 .bx-popup-menu .bx-popup-content-indent {
     padding: 0px !important;
 }
+.bx-popup-menu ul {
+    margin-top: 0.5rem;
+    margin-bottom: 0.5rem;
+}

+ 2 - 5
modules/boonex/artificer/data/template/system/css/menu-sidebar.css

@@ -1,6 +1,7 @@
 .bx-sidebar {
     position: fixed;
     top: 0;
+    left: 0;
     width: 100%;
     height: 100%;
     opacity: 0;
@@ -17,8 +18,6 @@
     transition: transform 0.5s 0s, opacity 0.3s 0s;
 }
 .bx-sidebar.bx-sidebar-site {
-    left: 0;
-    
     -webkit-transform: translateX(-100%);
     -moz-transform: translateX(-100%);
     -ms-transform: translateX(-100%);
@@ -26,8 +25,6 @@
     transform: translateX(-100%);
 }
 .bx-sidebar.bx-sidebar-account {
-    left: 0;
-    
     -webkit-transform: translateX(100%);
     -moz-transform: translateX(100%);
     -ms-transform: translateX(100%);
@@ -62,4 +59,4 @@
 /*--- Account Sidebar ---*/
 .bx-sb-profile .bx-base-pofile-unit {
     margin: 0;
-}
+}

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

@@ -1,4 +1,4 @@
-<ul id="__html_id__" class="bx-menu-main<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-nowrap py-2">
+<ul id="__html_id__" class="bx-menu-main<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-nowrap">
     <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ __class_add__ rounded-md">
         <a href="__link__" onclick="__onclick__" class="group flex items-center px-4 py-2 text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:text-gray-100 dark:hover:bg-gray-700 hover:text-gray-900 text-sm font-normal"__attrs__>
             <div class="bx-menu-floating-blocks-icon flex items-center justify-center text-gray-500 group-hover:text-gray-600 dark:group-hover:text-gray-300 mr-2 h-5 w-5">

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

@@ -1,6 +1,6 @@
 <ul id="bx-menu-inter-__id__" class="bx-menu-inter-vert bx-menu-object-__object__">
     <bx_repeat:menu_items>
-        <li id="__name__-act" class="bx-menu-inter-act __class_wrp_act__ group flex items-center bg-gray-100 dark:bg-gray-900 text-gray-900 dark:text-white text-sm font-normal shadow-sm">
+        <li id="__name__-act" class="bx-menu-inter-act __class_wrp_act__ group flex items-center bg-gray-50 dark:bg-gray-800 text-gray-900 dark:text-white text-sm font-normal shadow-sm">
             <div class="__class__ px-4 py-2" title="__title_attr__">__title__</div>
         </li>
         <li id="__name__-pas" class="bx-menu-inter-pas __class_wrp_pas__ group flex items-center text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:text-gray-100 dark:hover:bg-gray-700 hover:text-gray-900 text-sm font-normal">

+ 2 - 4
modules/boonex/artificer/data/template/system/menu_main_popup.html

@@ -1,7 +1,5 @@
 <div id="__id__" class="__class__ bx-popup-wrapper bx-popup-trans-wrapper box-border bx-def-z-index-nav" style="__style__">
-    <div class="bx-popup-gap mx-4 my-px md:m-px">
-        <div class="bx-popup bx-popup-trans relative ring-1 ring-gray-200 dark:ring-gray-700 bg-white dark:bg-gray-800 rounded-md shadow">
-            <div class="bx-popup-content md:w-56 box-border overflow-hidden">__content__</div>
-        </div>
+    <div class="bx-popup bx-popup-trans relative ring-1 ring-gray-200 dark:ring-gray-700 bg-white dark:bg-gray-800 rounded-md shadow">
+        <div class="bx-popup-content box-border overflow-hidden">__content__</div>
     </div>
 </div>

+ 2 - 2
modules/boonex/artificer/data/template/system/menu_vertical.html

@@ -1,6 +1,6 @@
 <ul class="bx-menu-ver bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
-        <li class="bx-menu-item __name__ __class_add__ group flex items-center px-4 py-2 text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:text-gray-100 dark:hover:bg-gray-700 hover:text-gray-900 text-sm font-normal rounded-md">
+        <li class="bx-menu-item __name__ __class_add__ group flex items-center px-4 py-2 text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:text-gray-100 dark:hover:bg-gray-700 hover:text-gray-900 text-sm font-normal">
             <a class="__name__" href="__link__" onclick="__onclick__"__attrs__>
                 <bx_if:icon><i class="sys-icon __icon__ mr-3 h-5 w-5"></i></bx_if:icon>
                 <bx_if:image><img class="mr-3 h-5 w-5" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
@@ -15,4 +15,4 @@
         // add default class to active menu items
         $('.bx-menu-ver > li.bx-menu-tab-active').not('.bx-def-color-bg-active').addClass('bx-def-color-bg-active');
     });
-</script>
+</script>

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

@@ -4,7 +4,7 @@
             <div class="bx-popup-header flex items-center justify-between p-3 md:p-4 lg:p-6">
                 <h2 id="__id___title">__title__</h2>
                 <div class="bx-popup-close-wrapper bx-def-media-desktop-hide bx-def-media-tablet-hide relative">
-                    <a href="javascript:void(0);" class="bx-popup-element-close inline-block w-6 h-6 text-base text-center"><i class="sys-icon times text-gray-800 dark:text-gray-100"></i></a>
+                    <a href="javascript:void(0);" class="bx-popup-element-close flex items-center justify-center w-6 h-6 text-base"><i class="sys-icon times text-gray-800 dark:text-gray-100"></i></a>
                 </div>
             </div>
             <div class="bx-popup-content px-4 pb-4">__content__</div>

+ 4 - 4
modules/boonex/artificer/data/template/system/popup_loading.html

@@ -1,4 +1,4 @@
-<div class="bx-popup-content-indent bx-def-padding">
-	<div class="bx-popup-content-wrapped"></div>
-	<div class="bx-popup-loading-wrapped"></div>
-</div>
+<div class="bx-popup-content-indent p-4">
+    <div class="bx-popup-content-wrapped"></div>
+    <div class="bx-popup-loading-wrapped"></div>
+</div>

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

@@ -2,7 +2,7 @@
     <div class="bx-popup-gap mx-4 my-px md:m-px">
         <div class="bx-popup bx-popup-trans relative ring-1 ring-gray-200 dark:ring-gray-700 bg-white dark:bg-gray-800 rounded-md shadow">
             <div class="bx-popup-close-wrapper bx-def-media-desktop-hide bx-def-media-tablet-hide relative pt-2 px-2 text-right">
-                <a href="javascript:void(0);" class="bx-popup-element-close inline-block w-6 h-6 text-base text-center"><i class="sys-icon times text-gray-800 dark:text-gray-100"></i></a>
+                <a href="javascript:void(0);" class="bx-popup-element-close flex items-center justify-center w-6 h-6 text-base"><i class="sys-icon times text-gray-800 dark:text-gray-100"></i></a>
             </div>
             <div class="bx-popup-content overflow-hidden">__content__</div>
             <!-- Footer is needed for Safari in iOS -->

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

@@ -1,4 +1,4 @@
-<span class="__style_prefix__-counter-label flex items-center text-sm font-normal p-1">
+<span class="__style_prefix__-counter-label flex items-center text-sm font-normal">
     <bx_if:show_icon>
         <span class="sys-action-counter-icon __style_prefix__-counter-icon relative flex items-center justify-center ring-1 ring-white dark:ring-gray-800 h-6 w-6 bg-gray-300 group-hover:bg-gray-500 rounded-full">__name__</span>
     </bx_if:show_icon>

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

@@ -1,4 +1,4 @@
-<span class="sys-action-counter-label __style_prefix__-counter-label flex items-center text-sm font-normal p-1">
+<span class="sys-action-counter-label __style_prefix__-counter-label flex items-center text-sm font-normal">
     <bx_if:show_icon>
         <span class="sys-action-counter-icon __style_prefix__-counter-icon relative flex items-center justify-center ring-1 ring-white dark:ring-gray-800 h-6 w-6 bg-gray-300 group-hover:bg-gray-500 rounded-full">
             __name__

+ 4 - 5
modules/boonex/artificer/template/css/tailwind.css

@@ -118,19 +118,18 @@
         @apply bg-white dark:ring-gray-800 dark:bg-gray-900 text-gray-900 dark:text-white ring-1 ring-gray-200 shadow;
     }
 
-
     /* Vertical menu in Popup */
     .bx-popup .bx-menu-ver > li:hover {
-        @apply group hover:text-gray-900 dark:hover:text-gray-100;
+        @apply hover:text-gray-900 dark:hover:text-gray-100;
     }
 
     .bx-popup .bx-menu-ver > li.bx-def-color-bg-active {
-        @apply group bg-white ring-1 ring-gray-200 dark:ring-gray-700 dark:bg-gray-900 text-gray-900 dark:text-white shadow;
+        @apply bg-gray-50 dark:bg-gray-800 text-gray-900 dark:text-white;
     }
-    
+
     /* Main menu */
     .bx-toolbar-item.bx-ti-menu .bx-menu-main .bx-menu-item.bx-menu-tab-active {
-        @apply opacity-100 bg-gray-50 dark:bg-gray-700 ring-1 ring-gray-200 dark:ring-gray-600 text-gray-900 dark:text-white shadow;
+        @apply opacity-100 ring-1 ring-gray-200 dark:ring-gray-600 bg-gray-50 dark:bg-gray-800 text-gray-900 dark:text-white shadow;
     }
 
     /* Main menu: Mobile */

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


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