Skip to content

Commit 66772a0

Browse files
zanileezanilee
committed
MAGETWO-34984: Invert new admin styles scope
- Merge remote-tracking branch 'origin/admin-styles-migration' into UI - Conflicts: - app/design/adminhtml/Magento/backend/web/css/override.less - app/design/adminhtml/Magento/backend/web/css/styles-old.less
2 parents afc9c08 + 7fa9c7b commit 66772a0

File tree

93 files changed

+6333
-6434
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+6333
-6434
lines changed

‎Gruntfile.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ module.exports = function (grunt) {
6060
'less:luma',
6161
'less:backend'
6262
],
63-
/**
64-
* Styles for backend theme
65-
*/
66-
backend: [
67-
'less:backend',
68-
'replace:escapeCalc',
69-
'less:override'
70-
],
7163
/**
7264
* Documentation
7365
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @see \Magento\AdminNotification\Block\Window
1313
*/
1414
?>
15-
<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification admin__scope">
15+
<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
1616
<div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
1717
<div class="popup-inner">
1818
<div class="popup-header">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages */ ?>
1111

1212
<?php $lastCritical = $block->getLastCritical();?>
13-
<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?> admin__scope">
13+
<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?>">
1414
<div class="message-system-inner">
1515
<?php if ($lastCritical): ?>
1616
<ul class="message-system-list">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
?>
1010
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
1111

12-
<div id="system_messages_list" class="admin__scope" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
12+
<div id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
1313
<ul class="message-system-list">
1414
<?php foreach ($block->getUnreadMessages() as $message): ?>
1515
<li class="message message-warning <?php echo $block->getItemClass($message);?>">

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ define([
2020
},
2121

2222
open: function (severity) {
23-
var superMethod = $.proxy(this._super, this),
24-
listTemplate,
25-
fullTemplate;
23+
var superMethod = $.proxy(this._super, this);
2624

2725
$.ajax({
2826
url: this.options.ajaxUrl,
@@ -38,12 +36,12 @@ define([
3836
});
3937

4038
tmpl = $(tmpl);
41-
listTemplate = $('<ul class="message-system-list"></ul>').append(tmpl);
42-
fullTemplate = $('<div class="admin__scope"></div>').append(listTemplate);
4339

44-
this.element
45-
.html(fullTemplate)
46-
.trigger('contentUpdated');
40+
this.element.html(
41+
$('<ul />', {
42+
'class': 'message-system-list'
43+
}).append(tmpl)
44+
).trigger('contentUpdated');
4745

4846
superMethod();
4947
}, this));

‎app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727

2828
<main class="page-content" id="anchor-content">
2929
<?php echo $block->getChildHtml('main-top'); ?>
30-
<div class="admin__scope">
31-
<div class="messages" id="messages" data-container-for="messages">
32-
<?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
33-
</div>
30+
<div class="messages" id="messages" data-container-for="messages">
31+
<?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
3432
</div>
3533
<?php echo $block->getChildHtml('page_main_actions'); ?>
3634
<?php if ($block->getChildHtml('left')): ?>

‎app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $numColumns = sizeof($block->getColumns());
1414
<?php if ($block->getCollection()): ?>
1515
<div class="dashboard-item-content">
1616
<?php if ($block->getCollection()->getSize()>0): ?>
17-
<table class="dashboard-data" id="<?php echo $block->getId() ?>_table">
17+
<table class="table dashboard-data" id="<?php echo $block->getId() ?>_table">
1818
<?php
1919
/* This part is commented to remove all <col> tags from the code. */
2020
/* foreach ($block->getColumns() as $_column): ?>

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,13 @@ if ($isField) {
6161
<?php endif; ?>
6262
<?php endif; ?>
6363

64-
<?php if ($element->getComment() && !$isField): ?>
65-
<div class="comment"><?php echo $block->escapeHtml($element->getComment()) ?></div>
66-
<?php endif; ?>
64+
65+
<div class="messages">
66+
<?php if ($element->getComment() && !$isField): ?>
67+
<div class="message message-notice"><?php echo $block->escapeHtml($element->getComment()) ?></div>
68+
<?php endif; ?>
69+
</div>
70+
6771

6872
<?php echo($isField) ? '<div class="control">' : ''; ?>
6973

‎app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,57 @@
99
/** @var $block \Magento\Backend\Block\Widget\Tabs */
1010
?>
1111
<?php if (!empty($tabs)): ?>
12-
<div id="<?php echo $block->getId() ?>">
12+
13+
<div class="admin__page-nav" data-role="container" id="<?php echo $block->getId() ?>">
1314
<?php if ($block->getTitle()): ?>
14-
<h3 <?php echo $block->getUiId('title') ?>><?php echo $block->getTitle() ?></h3>
15+
<div class="admin__page-nav-title" data-role="title" <?php echo $block->getUiId('title') ?>>
16+
<strong><?php echo $block->getTitle() ?></strong>
17+
<span data-role="title-messages" class="admin__page-nav-title-messages"></span>
18+
</div>
1519
<?php endif ?>
16-
<ul <?php echo $block->getUiId('tab', $block->getId()) ?> class="<?php echo $block->getIsHoriz() ? 'tabs-horiz' : 'tabs' ?>">
20+
<ul <?php echo $block->getUiId('tab', $block->getId()) ?> class="<?php echo $block->getIsHoriz() ? 'tabs-horiz' : 'tabs admin__page-nav-items' ?>">
1721
<?php foreach ($tabs as $_tab): ?>
18-
<?php if (!$block->canShowTab($_tab)): continue; endif; ?>
19-
<?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
20-
<?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
21-
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
22-
<li <?php if ($block->getTabIsHidden($_tab)): ?> style="display:none"<?php endif; ?><?php echo $block->getUiId('tab', 'item', $_tab->getId()) ?>>
23-
<a href="<?php echo $_tabHref ?>" id="<?php echo $block->getTabId($_tab) ?>" name="<?php echo $block->getTabId($_tab, false) ?>" title="<?php echo $block->getTabTitle($_tab) ?>" class="<?php echo $_tabClass;?>" data-tab-type="<?php echo $_tabType;?>" <?php echo $block->getUiId('tab', 'link', $_tab->getId()) ?>>
24-
<span>
25-
<span class="changed" title="<?php echo __('The information in this tab has been changed.') ?>"></span>
26-
<span class="error" title="<?php echo __('This tab contains invalid data. Please solve the problem before saving.') ?>"></span>
27-
<span class="loader" title="<?php echo __('Loading...') ?>"></span>
28-
<?php echo $block->getTabLabel($_tab); ?>
29-
</span>
30-
</a>
31-
<div id="<?php echo $block->getTabId($_tab) ?>_content" style="display:none;"<?php echo $block->getUiId('tab', 'content', $_tab->getId()) ?>><?php echo $block->getTabContent($_tab) ?></div>
32-
</li>
22+
23+
<?php if (!$block->canShowTab($_tab)): continue; endif; ?>
24+
<?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
25+
<?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
26+
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
27+
28+
<li class="admin__page-nav-item" <?php if ($block->getTabIsHidden($_tab)): ?> style="display:none"<?php endif; ?><?php echo $block->getUiId('tab', 'item', $_tab->getId()) ?>>
29+
<a href="<?php echo $_tabHref ?>" id="<?php echo $block->getTabId($_tab) ?>" name="<?php echo $block->getTabId($_tab, false) ?>" title="<?php echo $block->getTabTitle($_tab) ?>"
30+
class="admin__page-nav-link <?php echo $_tabClass;?>"
31+
data-tab-type="<?php echo $_tabType;?>"
32+
<?php echo $block->getUiId('tab', 'link', $_tab->getId()) ?>>
33+
34+
<span><?php echo $block->getTabLabel($_tab); ?></span>
35+
36+
<span class="admin__page-nav-item-messages" data-role="item-messages">
37+
<span class="admin__page-nav-item-message _changed">
38+
<span class="admin__page-nav-item-message-icon"></span>
39+
<span class="admin__page-nav-item-message-tooltip">
40+
<?php echo __('Changes have been made to this section that have not been saved.'); ?>
41+
</span>
42+
</span>
43+
<span class="admin__page-nav-item-message _error">
44+
<span class="admin__page-nav-item-message-icon"></span>
45+
<span class="admin__page-nav-item-message-tooltip">
46+
<?php echo __('This tab contains invalid data. Please solve the problem before saving.'); ?>
47+
</span>
48+
</span>
49+
<span class="admin__page-nav-item-message-loader">
50+
<span class="spinner">
51+
<span></span><span></span><span></span><span></span>
52+
<span></span><span></span><span></span><span></span>
53+
</span>
54+
</span>
55+
</span>
56+
</a>
57+
<div id="<?php echo $block->getTabId($_tab) ?>_content" style="display:none;"<?php echo $block->getUiId('tab', 'content', $_tab->getId()) ?>><?php echo $block->getTabContent($_tab) ?></div>
58+
</li>
3359
<?php endforeach; ?>
3460
</ul>
3561
</div>
62+
3663
<script>
3764
require(['jquery',"mage/backend/tabs"], function($){
3865
$(function() {

‎app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
?>
1010
<!-- TODO: refactor form styles and js -->
11-
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="rollback-warning" style="display: none;">
11+
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="rollback-warning" style="display: none;">
1212
<div class="popup">
1313
<div class="popup-inner">
1414
<div class="popup-header">
@@ -31,7 +31,7 @@
3131
</div>
3232
</div>
3333

34-
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="backup-warning" style="display: none;">
34+
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="backup-warning" style="display: none;">
3535
<div class="popup">
3636
<div class="popup-inner">
3737
<div class="popup-header">
@@ -53,7 +53,7 @@
5353
</div>
5454
</div>
5555

56-
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="backup-options" style="display: none;">
56+
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="backup-options" style="display: none;">
5757
<div class="popup">
5858
<div class="popup-inner">
5959
<div class="popup-header">
@@ -103,7 +103,7 @@
103103
</div>
104104
</div>
105105

106-
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="rollback-request-password" style="display: none;">
106+
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="rollback-request-password" style="display: none;">
107107
<div class="popup popup-notice">
108108
<div class="popup-inner">
109109
<div class="popup-header">

0 commit comments

Comments
 (0)