AntonLV 7 лет назад
Родитель
Сommit
5b93d912b0

+ 17 - 13
modules/boonex/decorous/data/template/system/menu_account_popup.html

@@ -1,16 +1,20 @@
 <div id="bx-sliding-menu-account" class="bx-sliding-menu-main bx-sliding-menu-fullheight bx-def-z-index-nav bx-def-color-bg-block bx-def-border-bottom bx-def-box-sizing bx-search-site" style="display:none; opacity:1;">
-	<div class="bx-sliding-menu-main-cnt">
+    <div class="bx-sliding-menu-main-cnt">
         <a class="bx-sliding-menu-close bx-def-margin-sec-top bx-def-margin-right bx-def-font-h2" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
-	
+
         <div class="bx-menu-account-popup bx-menu-object-__object__">
-		     <div class="bx-menu-account-popup-profile bx-def-padding-sec-bottom bx-clearfix">__active_profile__</div>
-		     <hr class="bx-def-hr" />
-		     <div class="bx-menu-account-popup-menu">__menu_notifications__</div>     
-		 </div>
-		 <hr class="bx-def-hr" />
-		 <div class="bx-menu-account-popup-profile-switcher bx-def-box-sizing">__profile_switcher__</div>
-		 <bx_if:multiple_profiles_mode>
-		     <div class="bx-menu-account-popup-profile-switcher-link"><a href="__url_switch_profile__"><bx_text:_sys_txt_my_profiles /></div>
-		 </bx_if:multiple_profiles_mode>
-	</div>
-</div>
+            <div class="bx-menu-account-popup-profile bx-def-padding-sec-bottom bx-clearfix">__active_profile__</div>
+            <hr class="bx-def-hr" />
+            <div class="bx-menu-account-popup-menu">__menu_notifications__</div>     
+        </div>
+        <div class="bx-menu-account-popup-profile-switcher bx-def-box-sizing">__profile_switcher__</div>
+        <bx_if:multiple_profiles_mode>
+            <hr class="bx-def-hr" />
+            <div class="bx-menu-account-popup-profile-switcher-link bx-def-padding">
+                <a href="__url_switch_profile__">
+                    <i class="sys-icon plus"></i><span class="bx-def-padding-sec-left"><bx_text:_sys_txt_my_profiles /></span>
+                </a>
+            </div>
+        </bx_if:multiple_profiles_mode>
+    </div>
+</div>

+ 10 - 4
modules/boonex/lucid/data/template/system/css/menu.css

@@ -557,15 +557,21 @@ ul.bx-menu-toolbar li a .bx-menu-item-addon {
 	line-height: 1.5rem;
 }
 .bx-popup .bx-menu-ver li a div {
-	padding-left: 1.25rem;
-	white-space: nowrap;
+    padding-left: 1.0rem;
+    padding-right: 1.0rem;
+    white-space: nowrap;
 }
-.bx-popup .bx-menu-ver li a span,
-.bx-popup .bx-menu-custom-ver li a span {
+.bx-popup .bx-menu-ver li a > span,
+.bx-popup .bx-menu-ver li a div > span,
+.bx-popup .bx-menu-custom-ver li a > span {
 	margin-left: 0.625rem;
 	white-space: nowrap;
 	vertical-align: middle;
 }
+.bx-popup .bx-menu-ver.bx-menu-object-sys_switch_language_popup li a div > span {
+    margin-left: 0;
+}
+
 .bx-menu-floating-blocks-wide.bx-menu-object-sys_account_notifications li .bx-menu-item-addon {
 	top: 0.375rem;
 }

+ 5 - 2
modules/boonex/lucid/data/template/system/menu_account_popup.html

@@ -7,11 +7,14 @@
 		     <hr class="bx-def-hr" />
 		     <div class="bx-menu-account-popup-menu">__menu_notifications__</div>     
 		 </div>
-		 <hr class="bx-def-hr" />
 		 <div class="bx-menu-account-popup-profile-switcher bx-def-box-sizing">__profile_switcher__</div>
 		 <bx_if:multiple_profiles_mode>
                     <hr class="bx-def-hr" />
-                    <div class="bx-menu-account-popup-profile-switcher-link"><a href="__url_switch_profile__"><bx_text:_sys_txt_my_profiles /></a></div>
+                    <div class="bx-menu-account-popup-profile-switcher-link bx-def-padding">
+                        <a href="__url_switch_profile__">
+                            <i class="sys-icon plus"></i><span class="bx-def-padding-sec-left"><bx_text:_sys_txt_my_profiles /></span>
+                        </a>
+                    </div>
 		 </bx_if:multiple_profiles_mode>
 	</div>
 </div>

+ 1 - 1
modules/boonex/notifications/template/event.html

@@ -1,6 +1,6 @@
 <div id="__html_id__" class="__style_prefix__-event bx-def-margin-sec-top-auto bx-def-round-corners bx-def-box bx-def-color-bg-box bx-def-color-bg-box-hover__class__">
     <a class="__style_prefix__-event-link bx-def-font-color" href="__link__">
-	    <div class="__style_prefix__-event-gap bx-def-padding-sec">
+	    <div class="__style_prefix__-event-gap bx-def-padding">
 	    	<div class="__style_prefix__-event-cnt">
 		       	<div class="__style_prefix__-owner-avatar bx-def-thumb-size">__author_unit__</div>
 				<div class="__style_prefix__-body bx-def-thumb-size-min-height bx-def-thumb-size-left-indent">

+ 1 - 1
modules/boonex/protean/data/template/system/css/general.css

@@ -5,7 +5,7 @@
     padding: 0;
 }
 
-.bx-profile-stats .bx-ps-user-cnt.bx-def-margin-sec-leftright {
+.bx-profile-stats .bx-ps-user-cnt {
     margin: 1.0rem 1.0rem 0 1.0rem;
 }
 

+ 1 - 1
template/css/menu.css

@@ -623,7 +623,7 @@ ul.bx-menu-btns-icon-hor li:last-child .bx-btn {
 }
 
 .bx-menu-account-popup-profile-switcher-link {
-    text-align:center;
+    text-align:left;
 }
 
 .bx-menu-account-popup-profile-switcher-link a:hover,

+ 14 - 10
template/menu_account_popup.html

@@ -1,17 +1,21 @@
 <div id="bx-sliding-menu-account" class="bx-sliding-menu-main bx-sliding-menu-fullheight bx-def-z-index-nav bx-def-color-bg-block bx-def-border-bottom bx-def-box-sizing bx-search-site" style="display:none; opacity:1;">
     <div class="bx-def-page-width bx-def-centered">
         <div class="bx-sliding-menu-main-cnt">
-	        <a class="bx-sliding-menu-close bx-def-margin-sec-top bx-def-margin-right bx-def-font-h1" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
+            <a class="bx-sliding-menu-close bx-def-margin-sec-top bx-def-margin-right bx-def-font-h1" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
 
-	        <div class="bx-menu-account-popup bx-menu-object-__object__ bx-def-padding-top bx-def-padding-leftright">
-	            <div class="bx-menu-account-popup-profile bx-clearfix">__active_profile__</div>
-	            <div class="bx-menu-account-popup-menu bx-def-margin-sec-top">__menu_notifications__</div>
-	        </div>
-            <hr class="bx-def-hr" />
-	        <div class="bx-menu-account-popup-profile-switcher bx-def-box-sizing">__profile_switcher__</div>
-	        <bx_if:multiple_profiles_mode>
-	            <div class="bx-menu-account-popup-profile-switcher-link bx-def-padding"><a href="__url_switch_profile__"><bx_text:_sys_txt_my_profiles /></a></div>
-	        </bx_if:multiple_profiles_mode>
+            <div class="bx-menu-account-popup bx-menu-object-__object__ bx-def-padding-top bx-def-padding-leftright">
+                <div class="bx-menu-account-popup-profile bx-clearfix">__active_profile__</div>
+                <div class="bx-menu-account-popup-menu bx-def-margin-sec-top">__menu_notifications__</div>
+            </div>
+            <div class="bx-menu-account-popup-profile-switcher bx-def-box-sizing">__profile_switcher__</div>
+            <bx_if:multiple_profiles_mode>
+                <hr class="bx-def-hr" />
+                <div class="bx-menu-account-popup-profile-switcher-link bx-def-padding">
+                    <a href="__url_switch_profile__">
+                        <i class="sys-icon plus"></i><span class="bx-def-padding-sec-left"><bx_text:_sys_txt_my_profiles /></span>
+                    </a>
+                </div>
+            </bx_if:multiple_profiles_mode>
         </div>
     </div>
 </div>

+ 1 - 1
template/menu_vertical.html

@@ -2,7 +2,7 @@
     <bx_repeat:menu_items>
         <li class="bx-def-round-corners bx-def-color-bg-hl-hover __class_add__">
             <a href="__link__" target="__target__" onclick="__onclick__">
-                <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-top bx-def-padding-sec-bottom">
+                <div class="bx-def-padding-sec">
                     <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                     <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
                     <span>__title__</span>

+ 9 - 11
template/profile_switch_row.html

@@ -1,13 +1,11 @@
 <bx_repeat:row>
-
-<hr class="bx-def-hr-auto" />
-<div class="sys-profile-switch-row bx-def-padding-leftright bx-def-padding-sec-topbottom">
-    <div class="sys-profile-switch-row-unit">__unit__</div>
-    <div class="sys-profile-switch-row-control">
-        <bx_if:inactive>
-            <a class="bx-btn bx-btn-small" href="__url_switch__">__button_title__</i></a>
-        </bx_if:inactive>
+    <hr class="bx-def-hr" />
+    <div class="sys-profile-switch-row bx-def-padding-leftright bx-def-padding-sec-topbottom">
+        <div class="sys-profile-switch-row-unit">__unit__</div>
+        <div class="sys-profile-switch-row-control">
+            <bx_if:inactive>
+                <a class="bx-btn bx-btn-small" href="__url_switch__">__button_title__</i></a>
+            </bx_if:inactive>
+        </div>
     </div>
-</div>
-
-</bx_repeat:row>
+</bx_repeat:row>