Merge remote-tracking branch 'origin/MAGETWO-35520' into PR

Author: Natalia Momotenko

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less

@@ -24,8 +24,8 @@
 
 //
 
-.page-main-actions,
-.page-actions.fixed {
+.page-main-actions:not(._hidden),
+.page-actions._fixed {
     .extend__clearfix();
     background: @page-main-actions__background-color;
     border-bottom: 1px solid @page-main-actions__border-color;
@@ -35,6 +35,11 @@
 
 .page-main-actions {
     margin: 0 0 @indent__l;
+    &._hidden {
+        .store-switcher {
+            display: none;
+        }
+    }
 }
 
 //
@@ -44,21 +49,23 @@
 .page-actions {
     @_page-action__indent: 1.3rem;
     float: right;
-    &.fixed {
-        left: @page-wrapper__indent-left;
-        position: fixed;
-        right: 0;
-        top: 0;
-        z-index: @page-actions__fixed__z-index;
-        .page-actions-inner {
-            &:before {
-                .text-overflow-ellipsis();
-                color: @page-title__color;
-                content: attr(data-title);
-                float: left;
-                font-size: @page-title__font-size;
-                margin-top: .3rem;
-                max-width: 50%;
+    .page-main-actions & {
+        &._fixed {
+            left: @page-wrapper__indent-left;
+            position: fixed;
+            right: 0;
+            top: 0;
+            z-index: @page-actions__fixed__z-index;
+            .page-actions-inner {
+                &:before {
+                    .text-overflow-ellipsis();
+                    color: @page-title__color;
+                    content: attr(data-title);
+                    float: left;
+                    font-size: @page-title__font-size;
+                    margin-top: .3rem;
+                    max-width: 50%;
+                }
             }
         }
     }

lib/web/mage/backend/floating-header.js

@@ -14,8 +14,10 @@ define([
             placeholderAttrs: {
                 'class': 'page-actions-placeholder'
             },
-            fixedClass: 'fixed',
-            title: '.page-title-wrapper .page-title'
+            fixedClass: '_fixed',
+            hiddenClass: '_hidden',
+            title: '.page-title-wrapper .page-title',
+            pageMainActions: '.page-main-actions'
         },
 
         /**
@@ -44,7 +46,9 @@ define([
         _setVars: function() {
             this._placeholder = this.element.before($('<div/>', this.options.placeholderAttrs)).prev();
             this._offsetTop = this._placeholder.offset().top;
-            this._height = this.element.outerHeight(true);
+            this._height = this.element
+                .parents(this.options.pageMainActions)
+                .outerHeight();
         },
 
         /**
@@ -65,8 +69,19 @@ define([
          */
         _handlePageScroll: function() {
             var isActive = ($(window).scrollTop() > this._offsetTop);
-            this.element
-                [isActive ? 'addClass': 'removeClass'](this.options.fixedClass);
+
+            if (isActive) {
+                this.element
+                    .addClass(this.options.fixedClass)
+                    .parents(this.options.pageMainActions)
+                    .addClass(this.options.hiddenClass);
+            } else {
+                this.element
+                    .removeClass(this.options.fixedClass)
+                    .parents(this.options.pageMainActions)
+                    .removeClass(this.options.hiddenClass);
+            }
+
             this._placeholder.height(isActive ? this._height: '');
         },