Skip to content

Commit 448f03b

Browse files
author
Oleg Zinoviev
committed
MAGETWO-34520: [UI] Updates messaging styles.
- Minor QA updates
1 parent 948df6f commit 448f03b

File tree

5 files changed

+23
-7
lines changed

5 files changed

+23
-7
lines changed

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@
1717
</div>
1818
<div class="fieldset-wrapper-content" id="product-custom-options-content">
1919
<fieldset class="fieldset">
20-
<div class="message message-error" id="dynamic-price-warning" style="display: none;">
21-
<div class="message-inner">
22-
<div class="message-content"><?php echo __('Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.') ?></div>
20+
<div class="admin__scope">
21+
<div class="messages">
22+
<div class="message message-error" id="dynamic-price-warning" style="display: none;">
23+
<div class="message-inner">
24+
<div class="message-content"><?php echo __('Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.') ?></div>
25+
</div>
26+
</div>
2327
</div>
2428
</div>
2529

app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
?>
1010
<div class="admin__scope">
1111
<div class="messages">
12-
<div class="message message-notice">
12+
<div class="message message-notice message-in-rating-edit">
1313
<div><?php echo __('Please specify a rating title for a store, or we\'ll just use the default value.'); ?></div>
1414
</div>
1515
</div>

app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10-
<div class="message message-info">
11-
<div class="message-inner">
12-
<div class="message-content"><?php echo __('Changing address information will not recalculate shipping, tax or other order amount.') ?></div>
10+
<div class="admin__scope">
11+
<div class="message message-notice">
12+
<div class="message-inner">
13+
<div class="message-content"><?php echo __('Changing address information will not recalculate shipping, tax or other order amount.') ?></div>
14+
</div>
1315
</div>
1416
</div>
17+
1518
<fieldset class="fieldset">
1619
<legend class="legend">
1720
<span><?php echo $block->getHeaderText() ?></span>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,6 +1450,10 @@ table.table tbody tr:last-child td {
14501450
left: 1.5rem;
14511451
top: 1.5rem;
14521452
}
1453+
.message-in-rating-edit {
1454+
margin-left: 1.8rem;
1455+
margin-right: 1.8rem;
1456+
}
14531457
.row {
14541458
margin-left: 0;
14551459
margin-right: 0;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,8 @@
117117
top: 1.5rem;
118118
}
119119
}
120+
121+
.message-in-rating-edit {
122+
margin-left: 1.8rem;
123+
margin-right: 1.8rem;
124+
}

0 commit comments

Comments
 (0)