Merge remote-tracking branch 'ui/develop' into develop

Author: Olexii Korshenko

app/code/Magento/Captcha/view/frontend/templates/default.phtml

@@ -15,6 +15,7 @@
                  data-captcha="<?php echo $this->getFormId()?>"
                  id="captcha-container-<?php echo $this->getFormId()?>"
                  data-mage-init='{"captcha":{"url": "<?php echo $this->getRefreshUrl()?>",
+                                            "imageLoader": "<?php echo $this->getViewFileUrl('images/loader-2.gif') ?>",
                                              "type": "<?php echo $this->getFormId() ?>"}}'>
                 <div class="control captcha-image">
                     <img alt="<?php echo __('Please type the letters below')?>" class="captcha-img" height="<?php echo $this->getImgHeight() ?>" src="<?php echo $captcha->getImgSrc() ?>"/>

app/code/Magento/Captcha/view/frontend/web/captcha.js

@@ -12,7 +12,8 @@ define([
         options: {
             refreshClass: 'refreshing',
             reloadSelector: '.captcha-reload',
-            imageSelector: '.captcha-img'
+            imageSelector: '.captcha-img',
+            imageLoader: ''
         },
 
         /**
@@ -28,8 +29,13 @@ define([
          * @param e - Event
          */
         refresh: function(e) {
-            var reloadImage = $(e.currentTarget);
-            reloadImage.addClass(this.options.refreshClass);
+            var imageLoader = this.options.imageLoader;
+
+            if (imageLoader) {
+                this.element.find(this.options.imageSelector).attr('src', imageLoader);
+            }
+            this.element.addClass(this.options.refreshClass);
+
             $.ajax({
                 url: this.options.url,
                 type: 'post',
@@ -45,7 +51,7 @@ define([
                     }
                 },
                 complete: function() {
-                    reloadImage.removeClass(this.options.refreshClass);
+                    this.element.removeClass(this.options.refreshClass);
                 }
             });
         }

app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml

@@ -105,7 +105,7 @@ require([
                             $customsValueValidation = '';
                         }
                         ?>
-                        <td <?php echo $customsValueDisplay ?>>
+                        <td class="col-custom" <?php echo $customsValueDisplay ?>>
                             <input type="text" class="customs-value input-text <?php echo $customsValueValidation ?>" name="package_customs_value" />
                             <span class="customs-value-currency">[<?php echo $this->getCustomValueCurrencyCode(); ?>]</span>
                         </td>

app/design/adminhtml/Magento/backend/web/css/pages.less

@@ -1745,7 +1745,8 @@ table.items-to-invoice tbody tr:hover td {
 .packaging-window .col-width,
 .packaging-window .col-height,
 .packaging-window .col-length,
-.packaging-window .data-table .col-total-weight input[type="text"] {
+.packaging-window .data-table .col-total-weight input[type="text"],
+.packaging-window .data-table .col-custom input[type="text"] {
     width: 60px;
 }
 
@@ -1759,7 +1760,8 @@ table.items-to-invoice tbody tr:hover td {
 }
 
 .packaging-window .data-table .col-actions,
-.packaging-window .col-total-weight {
+.packaging-window .col-total-weight,
+.packaging-window .data-table .col-custom {
     white-space: nowrap;
 }