Merge pull request #309 from magento-webdev/PR

Tulika,Eugene(etulika) · Tulika,Eugene(etulika) · commit c6b58c4b66e5 · 2015-05-18T23:02:38.000-05:00
[UI] Bugfix
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml
@@ -7,7 +7,7 @@
 <div class="actions">
     <button
         <?php $block->getUiId(); ?>
-        class="action-login action-primary"
+        class="action-login action-primary">
         <span><?php echo __('Sign in')?></span>
     </button>
 </div>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/product/product.css b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/product/product.css
@@ -58,9 +58,9 @@
 
 #configurable-attributes-container .field-pricing-value .pricing-value {
     width: 100%;
-    padding: 4px;
+    padding: 4px 10px;
     border-right: none;
-    border-radius: 4px 0 0 4px;
+    border-radius: 1px 0 0 1px;
 }
 
 /* "Generate Variations" button */
diff --git a/app/code/Magento/Shipping/view/frontend/templates/items.phtml b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
@@ -25,7 +25,7 @@
     <a href="<?php echo $block->getPrintShipmentUrl($_shipment) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?php echo __('Print Shipment') ?></span
+        <span><?php echo __('Print Shipment') ?></span>
     </a>
     <a href="#"
        data-mage-init='{"popupWindow": {"windowURL":"<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_shipment) ?>","windowName":"trackshipment","width":800,"height":600,"top":0,"left":0,"resizable":1,"scrollbars":1}}'
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less b/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%;
+                }
             }
         }
     }
diff --git a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module.less
@@ -16,11 +16,16 @@
     );
 
     .action.toggle {
-        padding: 1px 8px;
-        border: 1px solid #ada89e;
         background: #fff;
-        border-radius: 0 2px 2px 0;
+        border-radius: 0 1px 1px 0;
+        border: 1px solid #ada89e;
         height: 33px;
+        padding: 4px 5px;
+
+        > span {
+            display: inline-block;
+            padding-top: 3px;
+        }
 
         &:after {
             width: 14px;
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -906,6 +906,11 @@ input.no-display,
         }
     }
 
+    //  Fix for jquery.jstree.js (checkboxes in admin__scope-old only)
+    .jstree .jstree-real-checkbox {
+        display: none;
+    }
+
     input[type="radio"]  {
         border-radius: 8px;
         &:checked {
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -204,13 +204,9 @@
     .product-reviews-summary .reviews-actions {
         .font-size(@font-size__base);
     }
-    .product-options-wrapper {
-        .field {
-            .note {
-                display: block;
-            }
-        }
-    }
+}
+
+.product-options-wrapper {
     .fieldset-product-options-inner {
         .legend {
             border: none;
@@ -237,10 +233,10 @@
                 }
             }
         }
-        .datetime-picker {
-            + .time-picker {
-                .css(margin-left, @indent__xs);
-            }
+    }
+    .field {
+        .note {
+            display: block;
         }
     }
 }
diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
@@ -1017,7 +1017,14 @@
         position: relative;
     }
     input {
-        margin-right: @indent__s;
-        width: calc(~"100% - (@{icon-calendar__font-size} + @{indent__s})");
+        &:extend(.abs-field-date-input);
     }
 }
+
+//
+//    Form Field Date Input
+//--------------------------------------
+.abs-field-date-input {
+    margin-right: @indent__s;
+    width: calc(~"100% - (@{icon-calendar__font-size} + @{indent__s})");
+}
diff --git a/app/design/frontend/Magento/blank/web/css/source/_forms.less b/app/design/frontend/Magento/blank/web/css/source/_forms.less
@@ -60,9 +60,15 @@ fieldset.field {
     border: 0;
     padding: 0;
 }
+
 .field {
     &.date {
         &:extend(.abs-field-date all);
+        .time-picker {
+            display: inline-block;
+            margin-top: @indent__s;
+            white-space: nowrap;
+        }
     }
 }
 
@@ -137,7 +143,8 @@ select:focus ~ .tooltip .tooltip-content {
         .legend {
             &:extend(.abs-margin-for-forms-desktop all);
         }
-        > .field {
+        > .field,
+        > .fields > .field {
             .form-field-type-revert();
             margin: 0 0 @form-field__vertical-indent__desktop;
         }
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -249,15 +249,9 @@
             margin-top: @form-field__vertical-indent;
         }
     }
-    .product-options-wrapper {
-        .field {
-            .note {
-                display: block;
-                .css(margin-top, @indent__xs);
-            }
-        }
+}
 
-    }
+.product-options-wrapper {
     .fieldset-product-options-inner {
         .legend {
             border: none;
@@ -284,10 +278,11 @@
                 }
             }
         }
-        .datetime-picker {
-            + .time-picker {
-                .css(margin-left, @indent__xs);
-            }
+    }
+    .field {
+        .note {
+            display: block;
+            .css(margin-top, @indent__xs);
         }
     }
 }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1334,7 +1334,14 @@
         &:extend(.abs-add-box-sizing all);
     }
     input {
-        width: calc(~"100% - (@{icon-calendar__font-size} + @{indent__s})");
-        margin-right: @indent__s;
+        &:extend(.abs-field-date-input);
     }
 }
+
+//
+//    Form Field Date Input
+//--------------------------------------
+.abs-field-date-input {
+    margin-right: @indent__s;
+    width: calc(~"100% - (@{icon-calendar__font-size} + @{indent__s})");
+}
diff --git a/dev/tests/js/jasmine/assets/apply/templates/node.html b/dev/tests/js/jasmine/assets/apply/templates/node.html
@@ -5,6 +5,6 @@
  */
 -->
 <div id="<%= containerId %>">
-    <div id="<%= nodeId %>">
+    <div id="<%= nodeId %>"
         <%= dataAttr %>='<%= JSON.stringify(nodeData) %>'></div>
 </div>
diff --git a/lib/web/mage/backend/floating-header.js b/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: '');
         },
 

Original file line number	Diff line number	Diff line change
`@@ -906,6 +906,11 @@ input.no-display,`
`906`	`906`	`}`
`907`	`907`	`}`
`908`	`908`
	`909`	`+ // Fix for jquery.jstree.js (checkboxes in admin__scope-old only)`
	`910`	`+ .jstree .jstree-real-checkbox {`
	`911`	`+ display: none;`
	`912`	`+ }`
	`913`	`+`
`909`	`914`	`input[type="radio"] {`
`910`	`915`	`border-radius: 8px;`
`911`	`916`	`&:checked {`
Original file line number	Diff line number	Diff line change
`@@ -204,13 +204,9 @@`
`204`	`204`	`.product-reviews-summary .reviews-actions {`
`205`	`205`	`.font-size(@font-size__base);`
`206`	`206`	`}`
`207`		`- .product-options-wrapper {`
`208`		`- .field {`
`209`		`- .note {`
`210`		`- display: block;`
`211`		`- }`
`212`		`- }`
`213`		`- }`
	`207`	`+}`
	`208`	`+`
	`209`	`+.product-options-wrapper {`
`214`	`210`	`.fieldset-product-options-inner {`
`215`	`211`	`.legend {`
`216`	`212`	`border: none;`
`@@ -237,10 +233,10 @@`
`237`	`233`	`}`
`238`	`234`	`}`
`239`	`235`	`}`
`240`		`- .datetime-picker {`
`241`		`- + .time-picker {`
`242`		`- .css(margin-left, @indent__xs);`
`243`		`- }`
	`236`	`+ }`
	`237`	`+ .field {`
	`238`	`+ .note {`
	`239`	`+ display: block;`
`244`	`240`	`}`
`245`	`241`	`}`
`246`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1017,7 +1017,14 @@`
`1017`	`1017`	`position: relative;`
`1018`	`1018`	`}`
`1019`	`1019`	`input {`
`1020`		`- margin-right: @indent__s;`
`1021`		`- width: calc(~"100% - (@{icon-calendar__font-size} + @{indent__s})");`
	`1020`	`+ &:extend(.abs-field-date-input);`
`1022`	`1021`	`}`
`1023`	`1022`	`}`
	`1023`	`+`
	`1024`	`+//`
	`1025`	`+// Form Field Date Input`
	`1026`	`+//--------------------------------------`
	`1027`	`+.abs-field-date-input {`
	`1028`	`+ margin-right: @indent__s;`
	`1029`	`+ width: calc(~"100% - (@{icon-calendar__font-size} + @{indent__s})");`
	`1030`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,15 @@ fieldset.field {`
`60`	`60`	`border: 0;`
`61`	`61`	`padding: 0;`
`62`	`62`	`}`
	`63`	`+`
`63`	`64`	`.field {`
`64`	`65`	`&.date {`
`65`	`66`	`&:extend(.abs-field-date all);`
	`67`	`+ .time-picker {`
	`68`	`+ display: inline-block;`
	`69`	`+ margin-top: @indent__s;`
	`70`	`+ white-space: nowrap;`
	`71`	`+ }`
`66`	`72`	`}`
`67`	`73`	`}`
`68`	`74`
`@@ -137,7 +143,8 @@ select:focus ~ .tooltip .tooltip-content {`
`137`	`143`	`.legend {`
`138`	`144`	`&:extend(.abs-margin-for-forms-desktop all);`
`139`	`145`	`}`
`140`		`- > .field {`
	`146`	`+ > .field,`
	`147`	`+ > .fields > .field {`
`141`	`148`	`.form-field-type-revert();`
`142`	`149`	`margin: 0 0 @form-field__vertical-indent__desktop;`
`143`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,15 +249,9 @@`
`249`	`249`	`margin-top: @form-field__vertical-indent;`
`250`	`250`	`}`
`251`	`251`	`}`
`252`		`- .product-options-wrapper {`
`253`		`- .field {`
`254`		`- .note {`
`255`		`- display: block;`
`256`		`- .css(margin-top, @indent__xs);`
`257`		`- }`
`258`		`- }`
	`252`	`+}`
`259`	`253`
`260`		`- }`
	`254`	`+.product-options-wrapper {`
`261`	`255`	`.fieldset-product-options-inner {`
`262`	`256`	`.legend {`
`263`	`257`	`border: none;`
`@@ -284,10 +278,11 @@`
`284`	`278`	`}`
`285`	`279`	`}`
`286`	`280`	`}`
`287`		`- .datetime-picker {`
`288`		`- + .time-picker {`
`289`		`- .css(margin-left, @indent__xs);`
`290`		`- }`
	`281`	`+ }`
	`282`	`+ .field {`
	`283`	`+ .note {`
	`284`	`+ display: block;`
	`285`	`+ .css(margin-top, @indent__xs);`
`291`	`286`	`}`
`292`	`287`	`}`
`293`	`288`	`}`