AntonLV 8 лет назад
Родитель
Сommit
ba5b671e9f

+ 4 - 0
inc/js/classes/BxDolMenuMoreAuto.js

@@ -106,6 +106,8 @@ BxDolMenuMoreAuto.prototype._moveToSubmenu = function(oMenu, oItemMore, oItemMor
         var oItem = $(this);
         var iItem = $this._getWidth(oItem);
         if(bRelocateOthers || iWidthTotal + iItem > iParent) {
+            oItem.addClass('bx-def-color-bg-hl-hover');
+
             if(!oSubmenuItemFirst.length)
                 oItemMoreSubmenu.append(oItem.detach());
             else
@@ -139,6 +141,8 @@ BxDolMenuMoreAuto.prototype._moveFromSubmenu = function(oMenu, oItemMore, oItemM
             return;
         }
 
+        oItem.removeClass('bx-def-color-bg-hl-hover');
+
         oItemMore.before(oItem.detach());
         iWidthTotal += iItem;
     });

+ 3 - 0
inc/js/jquery.dolPopup.js

@@ -213,6 +213,8 @@
                 }
 
                 // show popup
+                $('body').addClass('bx-popup-visible');
+
                 $el.css({display: 'block', visibility: 'visible'});
                 if (o.fog) {
                 	var oOnHide = function() {
@@ -315,6 +317,7 @@
             	eval(o.onBeforeHide);
 
             $el.removeClass('bx-popup-active').addClass('bx-popup-inactive');
+            $('body').removeClass('bx-popup-visible');
 
             var onHide = null;
             if(typeof(o.onHide) == 'function')

+ 1 - 1
modules/base/general/classes/BxBaseModGeneralMenuViewActions.php

@@ -41,7 +41,7 @@ class BxBaseModGeneralMenuViewActions extends BxTemplMenuCustom
         $this->_oMenuSocialSharing = null;
 
         $this->_bShowAsButton = true;
-        $this->_bShowTitle = false;
+        $this->_bShowTitle = true;
     }
 
     public function addMarkers ($a)

+ 1 - 1
modules/base/general/template/entry-all-actions.html

@@ -1 +1 @@
-<div class="bx-base-general-entity-actions bx-def-margin-sec-neg">__actions__</div>
+<div class="bx-base-general-entity-actions">__actions__</div>

+ 3 - 3
modules/base/profile/template/cover.html

@@ -3,8 +3,8 @@
         <a class="bx-base-pofile-cover-image bx-def-box-sizing" href="__cover_href__" onclick="$('#__cover_popup_id__').dolPopupImage('__cover_url__', this)" style="background-image:url(__cover_url__)">&nbsp;</a>
         <div class="bx-cover-gradient"></div>
         <div class="bx-base-pofile-cover-info-container bx-def-centered bx-def-box-sizing" onclick="$('#__cover_popup_id__').dolPopupImage('__cover_url__', this)">
-            <div class="bx-base-pofile-cover-info">
-            	<div class="bx-base-pofile-cover-user bx-def-margin-left bx-def-padding-left">
+            <div class="bx-base-pofile-cover-info bx-def-padding-leftright">
+            	<div class="bx-base-pofile-cover-user bx-def-margin-leftright">
                     <div class="bx-def-unit-image">
                         <a class="bx-def-unit-image bx-def-padding-sec-bottom" href="__picture_href__" onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();">
                             <bx_if:show_ava_image>
@@ -17,7 +17,7 @@
                     </div>
                     <h1 class="bx-def-unit-info">__title__</h1>
                 </div>
-                <div class="bx-base-pofile-cover-actions bx-def-margin-right bx-def-padding-right" onclick="event.stopPropagation();">__action_menu__</div>
+                <div class="bx-base-pofile-cover-actions bx-def-margin-right" onclick="event.stopPropagation();">__action_menu__</div>
             </div>
         </div>
     </div>

+ 6 - 4
modules/base/profile/template/css/main.css

@@ -229,9 +229,9 @@ a.bx-base-pofile-cover-image:hover,
 .bx-base-pofile-cover-actions {
     position: relative;
 
-    -webkit-flex: 1 1 auto; 
-    -ms-flex:  1 1 auto; 
-    flex: 1 1 auto;
+    -webkit-flex: 1 2 auto; 
+    -ms-flex:  1 2 auto; 
+    flex: 1 2 auto;
 
     display: -webkit-flex;
     display: flex;
@@ -239,12 +239,14 @@ a.bx-base-pofile-cover-image:hover,
     align-items: center;
 
     height: 4rem;
+    min-width: 3rem;
     max-width: 50%;
 }
 
 .bx-base-pofile-cover-actions div.bx-base-general-entity-actions {
-    position: relative;
+    position: absolute;
     width: 100%;
+    left: 0;
 }
 
 .bx-base-pofile-cover-actions ul.bx-menu-hor.bx-menu-more-auto {

+ 4 - 0
template/css/media-phone.css

@@ -69,6 +69,10 @@ html.bx-media-phone {
 /* common.css */
 
 /* make popup fullscreen */
+.bx-media-phone body.bx-popup-visible {
+    height: 100vh;
+    overflow: hidden;
+}
 
 .bx-media-phone .bx-popup-responsive.bx-popup-trans-wrapper:not(.bx-popup-image-wrapper),
 .bx-media-phone .bx-popup-responsive:not(.bx-popup-image-wrapper) .bx-popup-trans,

+ 26 - 2
template/css/menu.css

@@ -606,8 +606,8 @@ ul.bx-menu-btns-hor li:last-child .bx-btn {
     position: relative;
     display: block;
 
-    margin: 8px;
-    margin: 0.5rem;
+    padding: 8px;
+    padding: 0.5rem;
 }
 .bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto > span {
     display: block;
@@ -624,7 +624,31 @@ ul.bx-menu-btns-hor li:last-child .bx-btn {
 .bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto {
     display: none;
 }
+.bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-submenu-more-auto .bx-menu-item .bx-btn {
+    position: relative;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-align-items: center;
+    align-items: center;
+
+    height: auto;
+    line-height: auto;
 
+    margin: 0;
+    padding: 0;
+
+    background-color: transparent;
+    border-width: 0;
+    border-radius: 0;
+
+    box-shadow: none;
+    text-shadow: none;
+}
+.bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-submenu-more-auto .bx-menu-item a,
+.bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-submenu-more-auto .bx-menu-item .bx-btn,
+.bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-submenu-more-auto .bx-menu-item .bx-btn .sys-icon {
+    color: inherit;
+}
 
 
 /*--- Vertical (Vertical Custom) Menus (in Popup) ---*/

+ 1 - 1
template/menu_custom_item_more_popup.html

@@ -1,3 +1,3 @@
 <div class="bx-def-padding">
-    <ul class="bx-menu-custom bx-menu-hor bx-menu-submenu-more-auto bx-clearfix">__content__</ul>
+    <ul class="bx-menu-custom bx-menu-ver bx-menu-submenu-more-auto bx-clearfix">__content__</ul>
 </div>