Skip to content

Commit 38b7172

Browse files
author
Oleg Zinoviev
committed
MAGETWO-34520: [UI] Updates messaging styles.
- QA updates
1 parent 67b05e2 commit 38b7172

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
?>
1010
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
11-
<div id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
11+
12+
<div id="system_messages_list" class="admin__scope" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
1213
<ul class="message-system-list">
1314
<?php foreach ($block->getUnreadMessages() as $message): ?>
1415
<li class="message message-warning <?php echo $block->getItemClass($message);?>">
@@ -17,6 +18,7 @@
1718
<?php endforeach;?>
1819
</ul>
1920
</div>
21+
2022
<script>
2123
require([
2224
"jquery",

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

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

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

2527
$.ajax({
2628
url: this.options.ajaxUrl,
@@ -36,12 +38,12 @@ define([
3638
});
3739

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

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

4648
superMethod();
4749
}, this));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1432,7 +1432,7 @@ table.table tbody tr:last-child td {
14321432
content: '\e632';
14331433
font-size: 1.5rem;
14341434
left: 2.2rem;
1435-
margin-top: -0.9rem;
1435+
margin-top: -1rem;
14361436
}
14371437
.message-success:before {
14381438
color: #79a22e;

app/design/adminhtml/Magento/backend/web/css/source/_messages.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
content: @alert-icon__error__content;
9898
font-size: @alert-icon__error__font-size;
9999
left: 2.2rem;
100-
margin-top: -.9rem;
100+
margin-top: -1rem;
101101
}
102102
}
103103

app/design/adminhtml/Magento/backend/web/css/styles-old.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,7 @@ fieldset.field [class^='fields-group-'] .field .control {
795795
> input[type="checkbox"],
796796
> input[type="radio"] {
797797
width: 16px;
798+
padding: 0;
798799
}
799800
}
800801

@@ -4937,6 +4938,7 @@ table.items-to-invoice tbody tr:hover td {
49374938
.control > [name="product[url_key_create_redirect]"] + .label,
49384939
.control > [name="general[url_key_create_redirect]"] + .label {
49394940
width: auto;
4941+
padding-top: 8px;
49404942
}
49414943

49424944
/*

setup/pub/styles/setup.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)