Merge pull request #112 from magento-webdev/PR-1

[WebDev+MPI+FearlessKiwis] Bugfixes
magento · Nov 4, 2015 · 2fc9834 · 2fc9834
2 parents d82e753 + bf49cb3
commit 2fc9834
Show file tree

Hide file tree

Showing 22 changed files with 130 additions and 39 deletions.
diff --git a/...code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml b/...code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
@@ -19,10 +19,12 @@
     <?php if ($_element->getLegend()): ?>
         <legend class="admin__legend legend">
             <span><?php /* @escapeNotVerified */ echo $_element->getLegend() ?></span>
+            <?php echo $block->getHintHtml() ?>
         </legend><br/>
         <?php /* @escapeNotVerified */ echo $_element->getHeaderBar() ?>
-    <?php endif; ?>
+    <?php else: ?>
         <?php echo $block->getHintHtml() ?>
+    <?php endif; ?>
         <div class="tree-store-scope">
             <?php if ($_element->getComment()): ?>
             <p class="comment"><?php echo $block->escapeHtml($_element->getComment()) ?></p>

diff --git a/...uct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml b/...uct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
@@ -18,7 +18,7 @@
         <div class="attribute-entity" data-bind="attr:{'data-attribute-title':label}">
             <div class="attribute-entity-top">
                 <div class="attribute-entity-title-block">
-                    <span class="attribute-draggable"
+                    <span class="draggable-handle"
                           data-role="draggable"
                           title="<?= $block->escapeHtml(__('Sort Variations')) ?>">
                     </span>

diff --git a/...uct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml b/...uct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
@@ -15,13 +15,10 @@
     <h2 class="steps-wizard-title"><?= /* @escapeNotVerified */  __('Step 1: Select Attributes') ?></h2>
     <div class="selected-attributes" data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName()?>'">
         <?= /* @escapeNotVerified */  __('Selected Attributes:') ?>
-        <div data-bind="text: selectedAttributes() || '--'"></div>
+        <span data-bind="text: selectedAttributes() || '--'"></span>
     </div>
-    <?= $block->getChildHtml(); ?>
 </div>
-
-
-
+<?= $block->getChildHtml(); ?>
 <script type="text/x-magento-init">
     {
         "*": {

diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml
@@ -27,7 +27,7 @@
                 <block class="Magento\Framework\View\Element\Text\ListText" name="paypal.additional.actions"/>
                 <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="express/review/details.phtml">
                     <block class="Magento\Framework\View\Element\RendererList" name="checkout.onepage.review.item.renderers" as="renderer.list"/>
-                    <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="checkout/onepage/review/totals.phtml"/>
+                    <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="Magento_Paypal::checkout/onepage/review/totals.phtml"/>
                 </block>
                 <block class="Magento\CheckoutAgreements\Block\Agreements" name="paypal.express.review.details.agreements" as="agreements" template="Magento_CheckoutAgreements::additional_agreements.phtml"/>
             </block>

diff --git a/app/code/Magento/Tax/Pricing/Render/Adjustment.php b/app/code/Magento/Tax/Pricing/Render/Adjustment.php
@@ -54,7 +54,7 @@ protected function apply()
             $this->amountRender->setDisplayValue(
                 $this->amountRender->getAmount()->getValue($this->getAdjustmentCode())
             );
-            if ($this->taxHelper->priceIncludesTax()) {
+            if ($this->taxHelper->priceIncludesTax() && $this->amountRender->getPriceType() == 'finalPrice') {
                 // for dynamic calculations of prices with any options, use the base price amount
                 $this->amountRender->setPriceType('basePrice');
             }

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/toolbar.html b/app/code/Magento/Ui/view/base/web/templates/grid/toolbar.html
@@ -15,10 +15,15 @@
         <!-- /ko -->
     </div>
     <div class="admin__data-grid-header-row row row-gutter">
+        <!-- ko if: hasChild('listing_massaction') -->
         <div class="col-xs-2" data-bind="scope: requestChild('listing_massaction')">
             <!-- ko template: getTemplate() --><!-- /ko -->
         </div>
-        <div class="col-xs-10">
+        <!-- /ko -->
+        <div data-bind="css: {
+                'col-xs-10': hasChild('listing_massaction'),
+                'col-xs-12': !hasChild('listing_massaction')
+                }">
             <div class="row">
                 <div class="col-xs-3" data-bind="scope: requestChild('listing_paging')">
                     <!-- ko template: totalTmpl --><!-- /ko -->

diff --git a/app/design/adminhtml/Magento/backend/Magento_Banner/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Banner/web/css/source/_module.less
@@ -0,0 +1,24 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+input[type="checkbox"].banner-content-checkbox {
+    position: absolute;
+    top: .8rem;
+
+    + .addafter {
+        line-height: 3.2rem;
+        padding-left: 2.6rem;
+    }
+}
+
+.tree-store-scope {
+    .field {
+        .banner-content-checkbox {
+            + .addafter {
+                padding: 0 0 0 2.6rem;
+            }
+        }
+    }
+}
diff --git a/...to/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_attribute-values.less b/...to/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_attribute-values.less
@@ -73,16 +73,13 @@
     }
 
     .attribute-entity-top {
+        .lib-vendor-prefix-display();
         margin: 0 0 @indent__s;
         &:extend(.abs-clearfix all);
     }
 
-    .attribute-entity-title-block {
-        float: left;
-    }
-
     .attribute-entity-title {
-        display: inline-block;
+        display: inline;
         font-size: @steps-wizard-attribute-entity-title__font-size;
     }
 
@@ -92,7 +89,8 @@
     }
 
     .attribute-entity-actions {
-        float: right;
+        margin-left: auto;
+        white-space: nowrap;
     }
 
     .draggable-handle {

diff --git a/...o/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_select-attributes.less b/...o/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_select-attributes.less
@@ -9,14 +9,15 @@
 
 .steps-wizard {
     .select-attributes-block {
+        &:extend(.abs-clearfix all);
         margin: 0 0 @indent__base;
     }
     .select-attributes-actions {
-        &:extend(.abs-clearfix all);
+        float:right;
+        margin-bottom: @indent__s;
         .action-default {
             &:extend(.abs-action-secondary all);
             &:extend(.abs-action-l all);
-            float: right;
         }
     }
 }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
@@ -48,6 +48,7 @@
         #mix-grid .width(9,12);
         margin-left: 0;
     }
+
     .order-sidebar {
         #mix-grid .column(3,12);
         margin-left: 0;
@@ -72,6 +73,21 @@
     }
 }
 
+//
+//  Tablets
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__l) {
+    .order-details {
+        .order-search-items {
+            .action-configure {
+                display: block;
+                float: none;
+            }
+        }
+    }
+}
+
 .order-view {
     > .ui-tabs-panel {
         border: 0;

diff --git a/...n/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less b/...n/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less
@@ -11,14 +11,19 @@
     .admin__fieldset {
         &:extend(.abs-clearfix all);
     }
+
     .admin__field {
         margin-bottom: 0;
     }
+
     .field-group_id {
         float: left;
     }
+
     .field-email {
-        margin-top: 0;
+        display: inline-block;
+        margin: 0;
         overflow: hidden;
+        width: 50%;
     }
 }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less
@@ -125,26 +125,44 @@
             .extend__visually-hidden();
         }
     }
+
     .create-order-sidebar-block {
         .sidebar-title-block {
             margin: 0 0 @order-create-sidebar__margin;
         }
+
         .auto-scroll {
             margin: 0 -@order-create-sidebar__padding @order-create-sidebar__margin__s;
             max-height: @order-create-sidebar-scroll__height;
             overflow: auto;
             position: relative;
+
+            //  Force a scroll bar to appear on IOS devices
+            &::-webkit-scrollbar {
+                -webkit-appearance: none;
+                height: 4px;
+            }
+
+            &::-webkit-scrollbar-thumb {
+                -webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
+                background-color: rgba(0,0,0,.5);
+                border-radius: 4px;
+            }
+
             + .action-default {
                 margin-top: @order-create-sidebar__margin__reqular;
             }
+
             .no-items {
                 padding-left: @order-create-sidebar__padding;
             }
         }
+
         .admin__field-option {
             padding-top: 0;
         }
     }
+
     .create-order-sidebar-label {
         display: table-cell;
         font-size: @order-create-sidebar__font-size;

diff --git a/...ckend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less b/...ckend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
@@ -48,7 +48,7 @@
     float: left;
     max-width: 45.5rem;
     position: relative;
-    width: 50%;
+    width: 35%;
     :-ms-input-placeholder {
         font-style: italic;
     }

diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_selects.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_selects.less
@@ -78,6 +78,9 @@
             padding-right: @form-el__padding-side;
             width: 100%;
         }
+        &::-ms-expand {
+            display: none;
+        }
     }
 }
 

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multicheck.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multicheck.less
@@ -75,7 +75,7 @@
         }
     }
     .action-menu {
-        left: -(@data-grid-cell__padding-horizontal + @data-grid-cell__border-width + .1rem);
+        left: -(@data-grid-cell__padding-horizontal + @data-grid-cell__border-width);
         margin-top: 1px;
         right: auto;
         text-align: left;

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
@@ -54,7 +54,7 @@
             font-size: @modal-action-close__font-size;
         }
         &:focus {
-            background: none;
+            background-color: transparent;
         }
     }
 }

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
@@ -74,6 +74,7 @@
     background-position+: ~'calc(100% - @{field-control__height})' 0;
     background-size+: 1px 100%;
 
+    max-width: 100%;
     min-width: 8.5rem;
     padding-bottom: @field-control__padding-bottom - .1rem;
     padding-right: 4.4rem; // Distance between select switch and inner text
@@ -225,11 +226,11 @@ option:empty {
     [class*='admin__control-'][class] {
         .lib-css(appearence,none);
         .lib-vendor-prefix-flex-grow(1);
+        .lib-vendor-prefix-order(1);
         .lib-vendor-prefix-flex-shrink(1);
         box-shadow: none;
         background-color: transparent;
         border-color: transparent;
-        order: 1;
         vertical-align: top;
         & + [class*='admin__control-'] {
             border-left-color: @field-control__border-color;
@@ -287,13 +288,14 @@ option:empty {
         padding: 0;
     }
     &-suffix {
-        order: 3;
+        .lib-vendor-prefix-order(3);
+
         &:last-child {
             padding-right: 1rem;
         }
     }
     &-prefix {
-        order: 0;
+        .lib-vendor-prefix-order(0);
     }
 }
 

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
@@ -373,8 +373,10 @@ label.mage-error {
     *:after {
         box-sizing: border-box;
     }
+
     .admin__data-grid-header-row {
         &:extend(.abs-cleafix);
+
         .action-select-multiselect {
             height: 38px;
             left: -1rem;
@@ -383,9 +385,15 @@ label.mage-error {
             top: -1.2rem;
             width: 52px;
         }
-        > div + div {
+
+        > div {
             margin-left: @temp_gutter;
+
+            &:first-child {
+                margin-left: 0;
+            }
         }
+
         button {
             vertical-align: top;
         }
@@ -445,6 +453,27 @@ label.mage-error {
     }
 }
 
+//
+//  Tablets
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__l) {
+    .admin__data-grid-toolbar {
+        .admin__data-grid-header-row {
+            .admin__filter-actions {
+                float: none;
+                margin-bottom: @indent__base;
+            }
+        }
+
+        .admin__data-grid-header-row {
+            .admin__control-support-text {
+                margin-left: 0;
+            }
+        }
+    }
+}
+
 .admin__grid-control {
     .admin__grid-control {
         display: none;

diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -2181,7 +2181,7 @@
         }
         .field {
             margin: 0 0 5px;
-            input[type="checkbox"] {
+            input[type="checkbox"]:not(.banner-content-checkbox) {
                 margin-right: 8px;
                 position: relative;
                 top: 2px;
@@ -2632,14 +2632,6 @@
         min-width: 20%;
     }
 
-    // Content
-
-    .field-store_0_content_use input[type="checkbox"] {
-        margin-right: 8px;
-        position: relative;
-        top: 2px;
-    }
-
     //
     //  CMS -> Manage Hierarchy
     //  --------------------------------------