diff --git a/Gruntfile.js b/Gruntfile.js index 52e8da6cb725d..9d070f2029d83 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -9,7 +9,9 @@ module.exports = function (grunt) { // Required plugins // _____________________________________________ - var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt); + + var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt), + svgo = require('imagemin-svgo'); require('./dev/tools/grunt/tasks/mage-minify')(grunt); @@ -21,8 +23,6 @@ module.exports = function (grunt) { pattern: ['grunt-*', '!grunt-template-jasmine-requirejs'] }); - var svgo = require('imagemin-svgo'); - // Configuration // _____________________________________________ @@ -318,7 +318,8 @@ module.exports = function (grunt) { cssmin: { options: { - report: 'gzip' + report: 'gzip', + keepSpecialComments: 0 }, setup: { files: { @@ -342,6 +343,20 @@ module.exports = function (grunt) { } }, + // Concatenation + // --------------------------------------------- + + concat: { + options: { + stripBanners: true, + banner: '/**\n * Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n' + }, + setup: { + src: '<%= path.css.setup %>/setup.css', + dest: '<%= path.css.setup %>/setup.css' + } + }, + // Watches files for changes and runs tasks based on the changed files // --------------------------------------------- @@ -545,7 +560,8 @@ module.exports = function (grunt) { grunt.task.run([ 'less:' + component, 'autoprefixer:' + component, - 'cssmin:' + component + 'cssmin:' + component, + 'concat:' + component ]); } if (component == undefined) { diff --git a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php index 8ecf07022340e..4d47f0a1a862b 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php +++ b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php @@ -110,7 +110,6 @@ protected function _prepareColumns() 'items', [ 'header' => __('Items'), - 'align' => 'right', 'type' => 'number', 'sortable' => false, 'index' => 'items_count' @@ -122,8 +121,7 @@ protected function _prepareColumns() $this->addColumn( 'total', [ - 'header' => __('Grand Total'), - 'align' => 'right', + 'header' => __('Total'), 'sortable' => false, 'type' => 'currency', 'currency_code' => $baseCurrencyCode, diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php index c29cceaf1f1e6..d734e7657ffad 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Sales.php +++ b/app/code/Magento/Backend/Block/Dashboard/Sales.php @@ -71,6 +71,6 @@ protected function _prepareLayout() $sales = $collection->getFirstItem(); $this->addTotal(__('Lifetime Sales'), $sales->getLifetime()); - $this->addTotal(__('Average Orders'), $sales->getAverage()); + $this->addTotal(__('Average Order'), $sales->getAverage()); } } diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php index 69a835e1ca043..bfba9ada27e4a 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php +++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php @@ -91,11 +91,12 @@ protected function _prepareColumns() 'orders_avg_amount', [ 'header' => __('Average'), - 'align' => 'right', 'sortable' => false, 'type' => 'currency', 'currency_code' => $baseCurrencyCode, - 'index' => 'orders_avg_amount' + 'index' => 'orders_avg_amount', + 'header_css_class' => 'col-avg', + 'column_css_class' => 'col-avg' ] ); @@ -103,11 +104,12 @@ protected function _prepareColumns() 'orders_sum_amount', [ 'header' => __('Total'), - 'align' => 'right', 'sortable' => false, 'type' => 'currency', 'currency_code' => $baseCurrencyCode, - 'index' => 'orders_sum_amount' + 'index' => 'orders_sum_amount', + 'header_css_class' => 'col-total', + 'column_css_class' => 'col-total' ] ); diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php index ce7b2ac229701..f1f4623d41e99 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php +++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php @@ -89,12 +89,13 @@ protected function _prepareColumns() 'orders_avg_amount', [ 'header' => __('Average'), - 'align' => 'right', 'sortable' => false, 'type' => 'currency', 'currency_code' => $baseCurrencyCode, 'index' => 'orders_avg_amount', - 'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency' + 'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency', + 'header_css_class' => 'col-avg', + 'column_css_class' => 'col-avg' ] ); @@ -102,12 +103,13 @@ protected function _prepareColumns() 'orders_sum_amount', [ 'header' => __('Total'), - 'align' => 'right', 'sortable' => false, 'type' => 'currency', 'currency_code' => $baseCurrencyCode, 'index' => 'orders_sum_amount', - 'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency' + 'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency', + 'header_css_class' => 'col-total', + 'column_css_class' => 'col-total' ] ); diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php index a211d5d26b87d..6046b66a0b0ba 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php +++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php @@ -85,13 +85,20 @@ protected function _prepareCollection() */ protected function _prepareColumns() { - $this->addColumn('name', ['header' => __('Product'), 'sortable' => false, 'index' => 'product_name']); + $this->addColumn( + 'name', [ + 'header' => __('Product'), + 'sortable' => false, + 'index' => 'product_name', + 'header_css_class' => 'col-product', + 'column_css_class' => 'col-product' + ] + ); $this->addColumn( 'price', [ 'header' => __('Price'), - 'width' => '120px', 'type' => 'currency', 'currency_code' => (string)$this->_storeManager->getStore( (int)$this->getParam('store') @@ -104,12 +111,12 @@ protected function _prepareColumns() $this->addColumn( 'ordered_qty', [ - 'header' => __('Order Quantity'), - 'width' => '120px', - 'align' => 'right', + 'header' => __('Quantity'), 'sortable' => false, 'index' => 'qty_ordered', - 'type' => 'number' + 'type' => 'number', + 'header_css_class' => 'col-qty', + 'column_css_class' => 'col-qty' ] ); diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php index 42c7cbb9115f9..bfd3740114ffb 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php +++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php @@ -81,7 +81,6 @@ protected function _prepareColumns() 'price', [ 'header' => __('Price'), - 'width' => '120px', 'type' => 'currency', 'currency_code' => (string)$this->_storeManager->getStore( (int)$this->getParam('store') @@ -95,10 +94,10 @@ protected function _prepareColumns() 'views', [ 'header' => __('Views'), - 'width' => '120px', - 'align' => 'right', 'sortable' => false, - 'index' => 'views' + 'index' => 'views', + 'header_css_class' => 'col-views', + 'column_css_class' => 'col-views' ] ); diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml index 356a5566f1197..9e03fffabbccf 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml @@ -9,15 +9,21 @@ ?>
- - + +
+ +
getCount()): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml index c89b0dbf6ced8..9cb41edab8598 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ ?> -
-

- here.', $block->getConfigUrl())?> -

+
+ here.', $block->getConfigUrl())?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml index 25a69225494d6..966f1d251a519 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml @@ -12,40 +12,40 @@ $numColumns = sizeof($block->getColumns()); ?> getCollection()): ?> -
- - tags from the code. */ - /* foreach ($block->getColumns() as $_column): ?> - getHtmlProperty() ?> /> - - getHeadersVisibility() || $block->getFilterVisibility()): ?> - +
+ getCollection()->getSize()>0): ?> +
+ tags from the code. */ + /* foreach ($block->getColumns() as $_column): ?> + getHtmlProperty() ?> /> + + getHeadersVisibility() || $block->getFilterVisibility()): ?> + getHeadersVisibility()): ?> - - getColumns() as $_column): ?> - - + + getColumns() as $_column): ?> + + - - - - getCollection()->getSize()>0) && (!$block->getIsCollapsed())): ?> - getCollection() as $_index => $_item): ?> - - getColumns() as $_column): ?> - - - - - getEmptyText()): ?> - - - - - -
getHeaderHtmlProperty() ?>>getHeaderHtml() ?>
getHeaderHtmlProperty() ?>>getHeaderHtml() ?>
getRowField($_item)) != '' ? $_html : ' ') ?>
getEmptyText() ?>
+ + + getIsCollapsed()): ?> + + getCollection() as $_index => $_item): ?> + + getColumns() as $_column): ?> + getRowField($_item)) != '' ? $_html : ' ') ?> + + + + + + + +
getEmptyText() ?>
+
canDisplayContainer()): ?> -
-
-
-
- getChildHtml('diagrams') ?> - getChildBlock('diagrams')->getTabsIds())) : ?> -
- -
- getChildHtml('totals') ?> -
- getChildHtml('grids') ?> -
- getChildHtml('refresh_statistics') ?> -
-
-
- getChildHtml('sales') ?> -
-
-

-
- getChildHtml('lastOrders'); ?> -
-
-
-

-
- getChildHtml('lastSearches'); ?> -
-
-
-

-
- getChildHtml('topSearches'); ?> -
-
-
-
+
+
+
+ getChildHtml('diagrams') ?> + getChildBlock('diagrams')->getTabsIds())) : ?> +
+ +
+ getChildHtml('totals') ?> +
+ getChildHtml('grids') ?> +
+ getChildHtml('refresh_statistics') ?> +
+
+
+ getChildHtml('sales') ?> +
+
+ getChildHtml('lastOrders'); ?> +
+
+
+ getChildHtml('lastSearches'); ?> +
+
+
+ getChildHtml('topSearches'); ?> +
+
+
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml index 6b03e37cfd0df..fe5772aa4b364 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml @@ -10,13 +10,13 @@ getTotals()) > 0): ?> getTotals() as $_total): ?>
-
-

-
- - - - +
+
+ + + + +
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml index 8c57f7355abc4..e549eb962b841 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml @@ -7,12 +7,12 @@ // @codingStandardsIgnoreFile ?> -
getCollection()->getItems()) > 0): ?> - getCollection()->getItems() as $item): ?> - getQueryText() ?>
- +
+ getCollection()->getItems() as $item): ?> + getQueryText() ?>
+ +
-
+
-
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml index c2997d1768a7e..1371e5acb7831 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml @@ -36,7 +36,7 @@ - - +