Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-35665

Author: Roman Ganin

Gruntfile.js

@@ -66,14 +66,6 @@ module.exports = function (grunt) {
             'less:luma',
             'less:backend'
         ],
-        /**
-         * Styles for backend theme
-         */
-        backend: [
-            'less:backend',
-            'replace:escapeCalc',
-            'less:override'
-        ],
         /**
          * Documentation
          */

app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

@@ -12,7 +12,7 @@
  * @see \Magento\AdminNotification\Block\Window
  */
 ?>
-<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification admin__scope">
+<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
     <div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
         <div class="popup-inner">
             <div class="popup-header">

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml

@@ -10,7 +10,7 @@
 <?php /** @var $block \Magento\AdminNotification\Block\System\Messages */ ?>
 
 <?php $lastCritical = $block->getLastCritical();?>
-<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?> admin__scope">
+<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?>">
     <div class="message-system-inner">
         <?php if ($lastCritical): ?>
             <ul class="message-system-list">

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

@@ -9,7 +9,7 @@
 ?>
 <?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
 
-<div id="system_messages_list" class="admin__scope" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
+<div id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
     <ul class="message-system-list">
         <?php foreach ($block->getUnreadMessages() as $message): ?>
             <li class="message message-warning <?php echo $block->getItemClass($message);?>">

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

@@ -20,9 +20,7 @@ define([
         },
 
         open: function (severity) {
-            var superMethod = $.proxy(this._super, this),
-                listTemplate,
-                fullTemplate;
+            var superMethod = $.proxy(this._super, this);
 
             $.ajax({
                 url: this.options.ajaxUrl,
@@ -38,12 +36,12 @@ define([
                 });
 
                 tmpl = $(tmpl);
-                listTemplate = $('<ul class="message-system-list"></ul>').append(tmpl);
-                fullTemplate = $('<div class="admin__scope"></div>').append(listTemplate);
 
-                this.element
-                    .html(fullTemplate)
-                    .trigger('contentUpdated');
+                this.element.html(
+                    $('<ul />', {
+                        'class': 'message-system-list'
+                    }).append(tmpl)
+                ).trigger('contentUpdated');
 
                 superMethod();
             }, this));

app/code/Magento/Backend/Block/Menu.php

@@ -191,7 +191,7 @@ protected function _renderItemCssClass($menuItem, $level)
         $output = ($this->_isItemActive(
             $menuItem,
             $level
-        ) ? '_active' : '') .
+        ) ? '_current _active' : '') .
             ' ' .
             ($menuItem->hasChildren() ? 'parent' : '') .
             ' ' .

app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php

@@ -100,7 +100,6 @@ protected function _prepareForm()
                 'label' => __('Date From'),
                 'title' => __('Date From'),
                 'name' => 'date_from',
-                'image' => $this->getViewFileUrl('images/grid-cal.png'),
                 'date_format' => $dateFormat
                 //'required' => true
             ]
@@ -112,7 +111,6 @@ protected function _prepareForm()
                 'label' => __('Date To'),
                 'title' => __('Date To'),
                 'name' => 'date_to',
-                'image' => $this->getViewFileUrl('images/grid-cal.png'),
                 'date_format' => $dateFormat
                 //'required' => true
             ]

app/code/Magento/Backend/Block/Widget/Form.php

@@ -226,7 +226,6 @@ protected function _applyTypeSpecificConfig($inputType, $element, \Magento\Eav\M
                 $element->setCanBeEmpty(true);
                 break;
             case 'date':
-                $element->setImage($this->getViewFileUrl('images/grid-cal.png'));
                 $element->setDateFormat($this->_localeDate->getDateFormatWithLongYear());
                 break;
             case 'multiline':

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

@@ -95,10 +95,6 @@ public function getHtml()
                     dateFormat: "' .
             $format .
             '",
-                    buttonImage: "' .
-            $this->getViewFileUrl(
-                'images/grid-cal.png'
-            ) . '",
                         buttonText: "' . $this->escapeHtml(__('Date selector')) .
             '",
                     from: {

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

@@ -129,7 +129,6 @@ public function getHtml()
                         dateFormat: "' . $format . '",
                         timeFormat: "' . $timeFormat . '",
                         showsTime: ' . ($this->getColumn()->getFilterTime() ? 'true' : 'false') . ',
-                        buttonImage: "' . $this->getViewFileUrl('images/grid-cal.png') . '",
                         buttonText: "' . $this->escapeHtml(__('Date selector')) . '",
                         from: {
                             id: "' . $htmlId . '_from"