Merge pull request #211 from magento-webdev/PR-4

[WebDev] Bugfixes
magento · Nov 27, 2015 · 044de2d · 044de2d
2 parents 1feb9f4 + 395d85f
commit 044de2d
Show file tree

Hide file tree

Showing 11 changed files with 127 additions and 43 deletions.
diff --git a/...code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml b/...code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
@@ -10,7 +10,7 @@
 <?php
 /* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
 $element = $block->getElement();
-$note = $element->getNote() ? '<div class="note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
+$note = $element->getNote() ? '<div class="note admin__field-note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
 $elementBeforeLabel = $element->getExtType() == 'checkbox admin__control-checkbox' || $element->getExtType() == 'radio admin__control-radio';
 $addOn = ($element->getBeforeElementHtml() || $element->getAfterElementHtml()) && !$element->getNoWrapAsAddon();
 $fieldId = ($element->getHtmlContainerId()) ? ' id="' . $element->getHtmlContainerId() . '"' : '';

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
@@ -44,7 +44,8 @@
     <div class="mass-select-wrap">
         <select
             id="<?php echo $block->getHtmlId() ?>-mass-select"
-            class="action-select-multiselect"
+            class="action-select-multiselect _disabled"
+            disabled="disabled"
             data-menu="grid-mass-select">
             <optgroup label="<?php /* @escapeNotVerified */ echo __('Mass Actions')?>">
                 <option disabled selected></option>
@@ -68,10 +69,14 @@
     </div>
 
 <script>
-    require(['jquery'], function($){
+    require(['jquery', 'domReady!'], function($){
         'use strict';
-        $('#<?php echo $block->getHtmlId() ?>-mass-select').change(function () {
+        $('#<?php echo $block->getHtmlId() ?>-mass-select')
+            .removeClass('_disabled')
+            .prop('disabled', false)
+            .change(function () {
             var massAction = $('option:selected', this).val();
+            this.blur();
             switch (massAction) {
                 <?php if ($block->getUseSelectAll()):?>
                 case 'selectAll':
@@ -88,7 +93,6 @@
                     return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectVisible();
                     break;
             }
-            this.blur();
         });
     });
     <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>

diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
@@ -17,7 +17,7 @@
         ); ?>
     </p>
     <h3 class="page-sub-sub-title"><?php /* @escapeNotVerified */ echo __('Featured Platinum Partners'); ?></h3>
-    <div data-role="partners-block">
+    <div data-role="partners-block" class="partners-block">
         <div data-role="spinner" class="admin__data-grid-loading-mask" data-bind="visible: loading">
             <div class="spinner">
                 <span></span><span></span><span></span><span></span>

diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
@@ -11,28 +11,26 @@
 $partners = $block->getPartners();
 ?>
 <?php if ($partners) : ?>
-    <div class="row row-gutter">
-        <?php foreach ($block->getPartners() as $partner) : ?>
-            <div class="col-m-4">
-                <img
-                    class="partner-image"
-                    src="<?php echo $block->escapeHtml($partner['img']);?>"
-                    alt="<?php echo $block->escapeHtml($partner['title']);?>"/>
-                <h3 class="partner-title"><?php echo $block->escapeHtml($partner['title']);?></h3>
-                <p class="partner-description">
-                    <?php echo $block->escapeHtml($partner['description']);?>
-                    <br />
-                    <a href="<?php echo $block->escapeHtml($partner['url_page']);?>" target="_blank">
-                        <?php /* @escapeNotVerified */ echo __('Read More'); ?>
-                    </a>
-                    <br />
-                    <a href="<?php echo $block->escapeHtml($partner['url_partner_page']);?>" target="_blank">
-                        <?php /* @escapeNotVerified */ echo __('Partner Page'); ?>
-                    </a>
-                </p>
-            </div>
-        <?php endforeach; ?>
-    </div>
+    <?php foreach ($block->getPartners() as $partner) : ?>
+        <div class="partner">
+            <img
+                class="partner-image"
+                src="<?php echo $block->escapeHtml($partner['img']);?>"
+                alt="<?php echo $block->escapeHtml($partner['title']);?>"/>
+            <h3 class="partner-title"><?php echo $block->escapeHtml($partner['title']);?></h3>
+            <p class="partner-description">
+                <?php echo $block->escapeHtml($partner['description']);?>
+                <br />
+                <a href="<?php echo $block->escapeHtml($partner['url_page']);?>" target="_blank">
+                    <?php /* @escapeNotVerified */ echo __('Read More'); ?>
+                </a>
+                <br />
+                <a href="<?php echo $block->escapeHtml($partner['url_partner_page']);?>" target="_blank">
+                    <?php /* @escapeNotVerified */ echo __('Partner Page'); ?>
+                </a>
+            </p>
+        </div>
+    <?php endforeach; ?>
 <?php else : ?>
     <p>
         <?php /* @escapeNotVerified */ echo __('No partners were found'); ?>

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
@@ -75,7 +75,12 @@ protected function _prepareForm()
             $fieldset->addField(
                 'order_statuses',
                 'multiselect',
-                ['name' => 'order_statuses', 'values' => $values, 'display' => 'none'],
+                [
+                    'name' => 'order_statuses',
+                    'label' => '',
+                    'values' => $values,
+                    'display' => 'none'
+                ],
                 'show_order_statuses'
             );
 

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
@@ -81,7 +81,12 @@ protected function _prepareForm()
             $fieldset->addField(
                 'rules_list',
                 'multiselect',
-                ['name' => 'rules_list', 'values' => $rulesListOptions, 'display' => 'none'],
+                [
+                    'name' => 'rules_list',
+                    'label' => '',
+                    'values' => $rulesListOptions,
+                    'display' => 'none'
+                ],
                 'price_rule_type'
             );
 

diff --git a/app/design/adminhtml/Magento/backend/Magento_Marketplace/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Marketplace/web/css/source/_module.less
@@ -10,6 +10,28 @@
 .page-partners {
     border-top: 1px solid @page-main-actions__border-color;
     padding-top: 2.5rem;
+
+    .partners-block {
+        .lib-vendor-prefix-display(flex);
+        .lib-vendor-prefix-flex-direction(row);
+        .lib-vendor-prefix-flex-wrap(wrap);
+
+        .ie9 & {
+            word-spacing: -.45rem;
+        }
+    }
+
+    .partner {
+        margin-bottom: @indent__xl;
+        padding: 0 @indent__m;
+        width: 100% / 3;
+
+        .ie9 & {
+            display: inline-block;
+            vertical-align: top;
+            word-spacing: normal;
+        }
+    }
 }
 
 .partners-description,

diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
@@ -39,9 +39,9 @@
 .admin__data-grid-loading-mask {
     background: rgba(255, 255, 255, .5);
     bottom: 0;
-    left: -@page-content__padding-horizontal;
+    left: 0;
     position: absolute;
-    right: -@page-content__padding-horizontal;
+    right: 0;
     top: 0;
     z-index: @data-grid-overlay__z-index;
 

diff --git a/app/design/frontend/Magento/blank/Magento_CatalogEvent/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_CatalogEvent/web/css/source/_module.less
@@ -18,8 +18,8 @@
 .block-category-event {
     .lib-css(background, @catalog-event-background-color);
     .lib-css(color, @catalog-event-color);
-    text-align: center;
     padding: @indent__s 0 15px;
+    text-align: center;
 
     &.block:last-child {
         margin-bottom: @indent__s;
@@ -36,6 +36,7 @@
 
     .ticker {
         .lib-list-reset-styles();
+
         li {
             display: none;
             margin: 0 15px;
@@ -47,31 +48,41 @@
         }
 
         .label {
+            .lib-font-size(10);
             display: block;
             text-transform: lowercase;
-            .lib-font-size(10);
         }
     }
 
     .dates {
+        display: table;
+        margin: 0 auto;
+
         .start,
         .end {
-            display: block;
+            display: table-cell;
+            vertical-align: top;
         }
 
         .date {
-            .lib-font-size(50);
+            .lib-font-size(18);
         }
 
         .time {
             display: block;
         }
 
         .start {
+            padding-right: @indent__xl;
+            position: relative;
+
             &:after {
+                .lib-font-size(18);
                 content: "\2013";
-                .lib-font-size(50);
                 display: block;
+                position: absolute;
+                right: 15px;
+                top: 0;
             }
         }
     }
@@ -114,19 +125,16 @@
         }
 
         .dates {
-            .start,
-            .end {
-                display: inline-block;
+            .date {
+                .lib-font-size(50);
             }
 
             .start {
                 padding-right: 50px;
-                position: relative;
 
                 &:after {
-                    position: absolute;
+                    .lib-font-size(50);
                     right: 10px;
-                    top: 0;
                 }
             }
         }

diff --git a/app/design/frontend/Magento/luma/Magento_AdvancedSearch/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_AdvancedSearch/web/css/source/_module.less
@@ -0,0 +1,41 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Advanced Search
+//  _____________________________________________
+
+// This part of code fixes the gap between page title and error message
+// In Luma on Mobile screens we have top padding on '.column' to give room for absolutely positioned toolbar controls.
+// If Advanced Search returns no results, controls do not appear, and visual gap appears.
+// We compensate it with negative top margin applied to '.message.error' on Mobile screens.
+
+//
+// Common
+// _____________________________________________
+
+& when (@media-common = true) {
+    .catalogsearch-advanced-result {
+        .message {
+            &.error {
+                margin-top: -60px;
+            }
+        }
+    }
+}
+
+//
+// Desktop
+// _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
+    .catalogsearch-advanced-result {
+        .message {
+            &.error {
+                margin-top: 0;
+            }
+        }
+    }
+}
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
@@ -819,6 +819,7 @@ body.catalog-product-compare-index {
 
             .action.delete {
                 &:extend(.abs-remove-button-for-blocks all);
+                margin-right: .6rem;
             }
         }
     }