Skip to content

Commit 54ef9bb

Browse files
author
Oleg Zinoviev
committed
MAGETWO-32302: Create New Order
- CR and QA updates
1 parent 30a9999 commit 54ef9bb

File tree

6 files changed

+29
-11
lines changed

6 files changed

+29
-11
lines changed

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ protected function _getCheckboxHtml($value, $checked)
116116
' admin__control-checkbox' .
117117
'"';
118118
$html .= $checked . $this->getDisabled() . '/>';
119-
$html .= '<label class="admin__field-label"></label>';
119+
$html .= '<label></label>';
120+
/* ToDo UI: add class="admin__field-label" after some refactoring _fields.less */
120121
return $html;
121122
}
122123

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected function _construct()
3030
*/
3131
public function getHeaderText()
3232
{
33-
return __('Please select products.');
33+
return __('Please select products');
3434
}
3535

3636
/**

app/code/Magento/Ui/view/base/web/templates/pagination.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<input data-bind="value: current, event: {change: onPageChange}" type="text" class="input-text page" />
2525
<span class="pages-total">
2626
of
27-
<span data-bind="text: pages" style="vertical-align: top;"></span>
27+
<span data-bind="text: pages"></span>
2828
</span>
2929
<span data-bind="css: { disabled: isLast() }, click: next" class="action-next">
3030
<span>Next page</span>

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
@admin__page-nav-item__hover__background-color: darken(@admin__page-nav__background-color, 5%);
2424

2525
@admin__page-nav-link__color: @color-very-dark-gray-black;
26-
@admin__page-nav-link__padding: 2rem 4rem 2rem 1rem;
26+
@admin__page-nav-link__padding: @indent__base 4rem @indent__base 1rem;
2727
@admin__page-nav-link__hover__color: @color-very-dark-gray-black;
2828
@admin__page-nav-link__changed__color: @color-very-dark-gray;
2929

app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
@page-order-sidebar__color: @color-very-dark-gray;
1717
@page-order-sidebar__margin: 2.4rem;
1818
@page-order-sidebar__padding: @indent__base;
19-
@page-order-sidebar__margin-reqular: 1.7rem;
2019
@page-order-sidebar__margin-small: .5rem;
20+
@page-order-sidebar__margin-m: 1rem;
21+
@page-order-sidebar__margin-reqular: 1.7rem;
2122
@page-order-sidebar__border-color: @border__color;
2223

2324
@page-order-icon-refresh__font-size: 2rem;
@@ -31,6 +32,7 @@
3132
@page-order-icon-plus__hover__color: @color-very-dark-gray-black2;
3233

3334
@page-order-table__border-color: @table-td__border-color;
35+
@page-order-sidebar-scroll__height: 24rem;
3436

3537
//
3638

@@ -459,7 +461,7 @@
459461
th,
460462
td {
461463
&:first-child {
462-
padding-left: 0;
464+
padding-left: @page-order-sidebar__padding;
463465
}
464466
}
465467
.icon {
@@ -471,6 +473,7 @@
471473
color: @page-order-sidebar__color;
472474
}
473475
&.icon-remove {
476+
margin-left: -3px;
474477
&:after {
475478
content: @page-order-icon-remove__content;
476479
}
@@ -484,12 +487,18 @@
484487
.extend__visually-hidden();
485488
}
486489
}
490+
.col-add {
491+
text-align: right;
492+
.icon-add {
493+
margin-right: @page-order-sidebar__margin-m;
494+
}
495+
}
487496
}
488497
.action-refresh {
489498
&:extend(.abs-icon all);
490-
display: inline-block;
499+
display: table-cell;
491500
font-size: @page-order-icon-refresh__font-size;
492-
padding-right: @page-order-sidebar__margin-small;
501+
padding-right: @page-order-sidebar__margin-m;
493502
vertical-align: middle;
494503
&:after {
495504
color: @page-order-icon-refresh__color;
@@ -510,20 +519,27 @@
510519
margin: 0 0 @page-order-sidebar__margin;
511520
}
512521
.auto-scroll {
513-
margin: 0 0 @page-order-sidebar__margin-small;
514-
max-height: 17rem;
522+
margin: 0 -@page-order-sidebar__padding @page-order-sidebar__margin-small;
523+
max-height: @page-order-sidebar-scroll__height;
515524
overflow: auto;
516525
position: relative;
526+
+ .action-default {
527+
margin-top: @page-order-sidebar__margin-reqular;
528+
}
529+
.no-items {
530+
padding-left: @page-order-sidebar__padding;
531+
}
517532
}
518533
.admin__field-option {
519534
padding-top: 0;
520535
}
521536
}
522537
.create-order-sidebar-label {
523-
display: inline-block;
538+
display: table-cell;
524539
font-size: @page-order-sidebar__font-size;
525540
font-weight: @font-weight__regular;
526541
margin: 0;
542+
vertical-align: middle;
527543
+ .admin__control-select {
528544
margin-top: @page-order-sidebar__margin-reqular;
529545
}

app/design/adminhtml/Magento/backend/web/css/source/components/_data-grid-temp.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@
277277
}
278278
}
279279

280+
.input-text,
280281
.admin__control-text {
281282
margin: 0 1rem;
282283
min-width: 0;

0 commit comments

Comments
 (0)