Skip to content

Commit 55e0f71

Browse files
author
Oleg Zinoviev
committed
MAGETWO-36622: [UI] Merge grid styles
- CR updates
1 parent 1eb4029 commit 55e0f71

File tree

2 files changed

+2
-7
lines changed
  • app
    • code/Magento/Sales/view/adminhtml/templates/order/create/items
    • design/adminhtml/Magento/backend/web/css/source

2 files changed

+2
-7
lines changed

app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@
3838
</div>
3939
</div>
4040
<?php else: ?>
41-
42-
<div id="order-items_grid">
43-
<div class="admin__table-wrapper">
41+
<div class="admin__table-wrapper" id="order-items_grid">
4442
<?php if (count($_items)>10): ?>
4543
<div class="actions update actions-update">
4644
<?php echo $block->getButtonHtml(__('Update Items and Qty\'s'), 'order.itemsUpdate()', 'action-secondary'); ?>
@@ -212,7 +210,6 @@
212210
order.itemsOnchangeBind()
213211
});
214212
</script>
215-
</div>
216213

217214
<?php if ($block->isGiftMessagesAvailable()) : ?>
218215
<script>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ table {
3939
}
4040

4141
.admin__table-wrapper {
42-
max-width: 100%;
43-
overflow-x: auto;
44-
overflow-y: hidden;
42+
.table-overflow();
4543
}
4644

4745
.admin__table-primary,

0 commit comments

Comments
 (0)