diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php index 8d65153d7ba20..a370cbea13c2b 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php @@ -1336,7 +1336,6 @@ public function testSaveExistingWithMediaGalleryEntries() $expectedResult = [ [ - 'value_id' => 5, 'value_id' => 5, "label" => "new_label_text", 'file' => 'filename1', diff --git a/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php b/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php index a43b33b5a8cdf..c4760bd9d28c3 100644 --- a/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php +++ b/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php @@ -174,7 +174,7 @@ private function buildFooter(array $footer) * correct HTML format. * * @param string $content - * @returns string + * @return string */ private function formatContentWithLinks($content) { diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js index 680b6a2b1e54e..7537107560cb4 100644 --- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js +++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js @@ -721,6 +721,8 @@ define([ * @param {Number} page - current page */ changePage: function (page) { + this.clear(); + if (page === 1 && !this.recordData().length) { return false; } @@ -762,7 +764,6 @@ define([ * Change page to next */ nextPage: function () { - this.clear(); this.currentPage(this.currentPage() + 1); }, @@ -770,7 +771,6 @@ define([ * Change page to previous */ previousPage: function () { - this.clear(); this.currentPage(this.currentPage() - 1); }, diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less index b5742b86cf9f1..94f34cd0cf1e1 100644 --- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less @@ -62,17 +62,16 @@ // Common // _____________________________________________ -& when (@media-common = true) { - body { +.page-wrapper { + .ie9 & { .lib-css(background-color, @page__background-color); + min-height: 0; } +} - // ToDo UI: move it directly to .page-wrapper (now it doesn't appear in mediaquery cuz of size of css) - .page-wrapper { - .ie9 & { - .lib-css(background-color, @page__background-color); - min-height: 0; - } +& when (@media-common = true) { + body { + .lib-css(background-color, @page__background-color); } //