Skip to content

Commit 6f82fd2

Browse files
author
Oleg Zinoviev
committed
MAGETWO-32302: Create New Order
- CR updates
1 parent 40b2525 commit 6f82fd2

File tree

3 files changed

+71
-71
lines changed

3 files changed

+71
-71
lines changed

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

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
// Variables
88
// ---------------------------------------------
99

10-
@page-order-sidebar__font-size: 1.5rem;
11-
@page-order-sidebar__font-size-xs: 1.1rem;
12-
@page-order-sidebar__color: @color-very-dark-gray;
13-
@page-order-sidebar__margin: 2.4rem;
14-
@page-order-sidebar__padding: @indent__base;
15-
@page-order-sidebar__margin-small: .5rem;
16-
@page-order-sidebar__margin-m: 1rem;
17-
@page-order-sidebar__margin-reqular: 1.7rem;
18-
@page-order-sidebar__border-color: @border__color;
10+
@order-create-sidebar__font-size: 1.5rem;
11+
@order-create-sidebar__font-size-xs: 1.1rem;
12+
@order-create-sidebar__color: @color-very-dark-gray;
13+
@order-create-sidebar__margin: 2.4rem;
14+
@order-create-sidebar__padding: @indent__base;
15+
@order-create-sidebar__margin-small: .5rem;
16+
@order-create-sidebar__margin-m: 1rem;
17+
@order-create-sidebar__margin-reqular: 1.7rem;
18+
@order-create-sidebar__border-color: @border__color;
1919

20-
@page-order-sidebar-scroll__height: 24rem;
20+
@order-create-sidebar-scroll__height: 24rem;
2121

2222
//
2323

@@ -27,60 +27,60 @@
2727

2828
.order-sidebar {
2929
&:extend(.admin__page-nav);
30-
color: @page-order-sidebar__color;
31-
padding: 3rem @page-order-sidebar__padding;
30+
color: @order-create-sidebar__color;
31+
padding: 3rem @order-create-sidebar__padding;
3232

3333
.order-currency {
3434
float: none;
3535
font-size: @font-size__base;
36-
margin: 0 0 @page-order-sidebar__margin;
36+
margin: 0 0 @order-create-sidebar__margin;
3737
.admin__field-label {
3838
display: block;
3939
text-align: left;
4040
}
4141
}
4242
.customer-activity-title {
43-
border-bottom: 1px solid @page-order-sidebar__border-color;
43+
border-bottom: 1px solid @order-create-sidebar__border-color;
4444
font-size: 1.9rem;
4545
font-weight: @font-weight__bold;
46-
margin: 0 0 @page-order-sidebar__margin;
47-
padding: 0 0 @page-order-sidebar__margin;
46+
margin: 0 0 @order-create-sidebar__margin;
47+
padding: 0 0 @order-create-sidebar__margin;
4848
}
4949
.admin__control-select {
50-
margin: 0 0 @page-order-sidebar__margin-small;
50+
margin: 0 0 @order-create-sidebar__margin-small;
5151
width: 100%;
5252
}
5353
.order-sidebar-block {
54-
border-bottom: 1px solid @page-order-sidebar__border-color;
55-
margin: 0 0 @page-order-sidebar__margin;
56-
padding: 0 0 @page-order-sidebar__margin;
54+
border-bottom: 1px solid @order-create-sidebar__border-color;
55+
margin: 0 0 @order-create-sidebar__margin;
56+
padding: 0 0 @order-create-sidebar__margin;
5757
}
5858
.table-info {
59-
color: @page-order-sidebar__color;
59+
color: @order-create-sidebar__color;
6060
width: 100%;
6161
th,
6262
td {
6363
&:first-child {
64-
padding-left: @page-order-sidebar__padding;
64+
padding-left: @order-create-sidebar__padding;
6565
}
6666
}
6767
.icon {
6868
&:extend(.abs-icon all);
6969
display: inline-block;
70-
font-size: @page-order-sidebar__font-size + 0.1rem;
70+
font-size: @order-create-sidebar__font-size + 0.1rem;
7171
vertical-align: middle;
7272
&:after {
73-
color: @page-order-sidebar__color;
73+
color: @order-create-sidebar__color;
7474
}
7575
&.icon-remove {
7676
margin-left: -3px;
7777
&:after {
78-
content: @page-order-icon-remove__content;
78+
content: @order-create-icon-remove__content;
7979
}
8080
}
8181
&.icon-add {
8282
&:after {
83-
content: @page-order-icon-add__content;
83+
content: @order-create-icon-add__content;
8484
}
8585
}
8686
> span {
@@ -90,23 +90,23 @@
9090
.col-add {
9191
text-align: right;
9292
.icon-add {
93-
margin-right: @page-order-sidebar__margin-m;
93+
margin-right: @order-create-sidebar__margin-m;
9494
}
9595
}
9696
}
9797
.action-refresh {
9898
&:extend(.abs-icon all);
9999
display: table-cell;
100-
font-size: @page-order-icon-refresh__font-size;
101-
padding-right: @page-order-sidebar__margin-m;
100+
font-size: @order-create-icon-refresh__font-size;
101+
padding-right: @order-create-sidebar__margin-m;
102102
vertical-align: middle;
103103
&:after {
104-
color: @page-order-icon-refresh__color;
105-
content: @page-order-icon-refresh__content;
104+
color: @order-create-icon-refresh__color;
105+
content: @order-create-icon-refresh__content;
106106
}
107107
&:hover {
108108
&:after {
109-
color: @page-order-icon-refresh__hover__color;
109+
color: @order-create-icon-refresh__hover__color;
110110
}
111111
text-decoration: none;
112112
}
@@ -116,18 +116,18 @@
116116
}
117117
.create-order-sidebar-block {
118118
.head {
119-
margin: 0 0 @page-order-sidebar__margin;
119+
margin: 0 0 @order-create-sidebar__margin;
120120
}
121121
.auto-scroll {
122-
margin: 0 -@page-order-sidebar__padding @page-order-sidebar__margin-small;
123-
max-height: @page-order-sidebar-scroll__height;
122+
margin: 0 -@order-create-sidebar__padding @order-create-sidebar__margin-small;
123+
max-height: @order-create-sidebar-scroll__height;
124124
overflow: auto;
125125
position: relative;
126126
+ .action-default {
127-
margin-top: @page-order-sidebar__margin-reqular;
127+
margin-top: @order-create-sidebar__margin-reqular;
128128
}
129129
.no-items {
130-
padding-left: @page-order-sidebar__padding;
130+
padding-left: @order-create-sidebar__padding;
131131
}
132132
}
133133
.admin__field-option {
@@ -136,12 +136,12 @@
136136
}
137137
.create-order-sidebar-label {
138138
display: table-cell;
139-
font-size: @page-order-sidebar__font-size;
139+
font-size: @order-create-sidebar__font-size;
140140
font-weight: @font-weight__regular;
141141
margin: 0;
142142
vertical-align: middle;
143143
+ .admin__control-select {
144-
margin-top: @page-order-sidebar__margin-reqular;
144+
margin-top: @order-create-sidebar__margin-reqular;
145145
}
146146
}
147147
.actions {

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// Variables
88
// ---------------------------------------------
99

10-
@page-order-table__border-color: @table-td__border-color;
11-
@page-order-sku__background: @admin__page-nav__background-color;
12-
@page-order-sku__padding: @indent__base;
10+
@order-create-table__border-color: @table-td__border-color;
11+
@order-create-sku__background: @admin__page-nav__background-color;
12+
@order-create-sku__padding: @indent__base;
1313

1414
//
1515

@@ -18,21 +18,21 @@
1818
// ---------------------------------------------
1919

2020
.order-tables {
21-
margin: 0 0 @page-order-sidebar__margin-reqular;
21+
margin: 0 0 @order-create-sidebar__margin-reqular;
2222
width: 100%;
2323
th {
2424
border-top: 0;
2525
font-size: 1.3rem;
2626
}
2727
td {
2828
border-bottom: none;
29-
padding-top: @page-order-sidebar__padding;
29+
padding-top: @order-create-sidebar__padding;
3030
}
3131
tbody {
3232
tr {
3333
&:last-child {
3434
td {
35-
border-bottom: 1px solid @page-order-table__border-color;
35+
border-bottom: 1px solid @order-create-table__border-color;
3636
}
3737
}
3838
&.border {
@@ -54,17 +54,17 @@
5454
}
5555
.price {
5656
display: inline-block;
57-
margin: 0 0 @page-order-sidebar__margin-small;
57+
margin: 0 0 @order-create-sidebar__margin-small;
5858
}
5959
.custom-price-block {
60-
font-size: @page-order-sidebar__font-size-xs;
61-
margin: 0 0 @page-order-sidebar__margin-small;
60+
font-size: @order-create-sidebar__font-size-xs;
61+
margin: 0 0 @order-create-sidebar__margin-small;
6262
+ .admin__control-text {
6363
&:extend(.abs-control-price);
6464
}
6565
}
6666
.discount-price-block {
67-
font-size: @page-order-sidebar__font-size-xs;
67+
font-size: @order-create-sidebar__font-size-xs;
6868
}
6969
.product-configure-block {
7070
margin: 1rem 0 0;
@@ -92,12 +92,12 @@
9292
// ---------------------------------------------
9393

9494
.add-by-sku {
95-
background: @page-order-sku__background;
95+
background: @order-create-sku__background;
9696
clear: both;
97-
padding: @page-order-sku__padding;
97+
padding: @order-create-sku__padding;
9898

9999
.table-info {
100-
color: @page-order-sidebar__color;
100+
color: @order-create-sidebar__color;
101101
}
102102

103103
.admin__field-note {
@@ -119,17 +119,17 @@
119119
&:extend(.abs-action-reset all);
120120
&:extend(.abs-icon all);
121121
display: inline-block;
122-
font-size: @page-order-sidebar__font-size + 0.1rem;
122+
font-size: @order-create-sidebar__font-size + 0.1rem;
123123
margin-left: 1.2rem;
124-
padding-top: @page-order-sidebar__margin-small + 0.2rem;
124+
padding-top: @order-create-sidebar__margin-small + 0.2rem;
125125
vertical-align: middle;
126126
&:after {
127-
color: @page-order-sidebar__color;
128-
content: @page-order-icon-remove__content;
127+
color: @order-create-sidebar__color;
128+
content: @order-create-icon-remove__content;
129129
}
130130
&:hover {
131131
&:after {
132-
color: @page-order-icon-plus__hover__color;
132+
color: @order-create-icon-plus__hover__color;
133133
}
134134
}
135135
> span {

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
// Variables
88
// ---------------------------------------------
99

10-
@page-order-icon-refresh__font-size: 2rem;
11-
@page-order-icon-refresh__color: @color-gray83;
12-
@page-order-icon-refresh__hover__color: darken(@color-gray83, 10%);
10+
@order-create-icon-refresh__font-size: 2rem;
11+
@order-create-icon-refresh__color: @color-gray83;
12+
@order-create-icon-refresh__hover__color: darken(@color-gray83, 10%);
1313

14-
@page-order-icon-add__content: @icon-arrow-right__content;
15-
@page-order-icon-remove__content: @icon-delete__content;
16-
@page-order-icon-refresh__content: @icon-refresh__content;
17-
@page-order-icon-plus__content: @icon-plus__content;
18-
@page-order-icon-plus__hover__color: @color-very-dark-gray-black2;
14+
@order-create-icon-add__content: @icon-arrow-right__content;
15+
@order-create-icon-remove__content: @icon-delete__content;
16+
@order-create-icon-refresh__content: @icon-refresh__content;
17+
@order-create-icon-plus__content: @icon-plus__content;
18+
@order-create-icon-plus__hover__color: @color-very-dark-gray-black2;
1919

2020
//
2121

@@ -97,11 +97,11 @@
9797

9898
&:before {
9999
&:extend(.abs-icon all);
100-
content: @page-order-icon-add__content;
100+
content: @order-create-icon-add__content;
101101
}
102102

103103
&:hover {
104-
color: @page-order-icon-plus__hover__color;
104+
color: @order-create-icon-plus__hover__color;
105105
}
106106
}
107107
p {
@@ -112,15 +112,15 @@
112112
color: @color-brownie;
113113
margin-left: @indent__xs;
114114
&:hover {
115-
color: @page-order-icon-plus__hover__color;
115+
color: @order-create-icon-plus__hover__color;
116116
text-decoration: none;
117117
}
118118
> span {
119119
.extend__visually-hidden();
120120
}
121121
&:before {
122122
&:extend(.abs-icon all);
123-
content: @page-order-icon-remove__content;
123+
content: @order-create-icon-remove__content;
124124
}
125125
}
126126
}
@@ -169,11 +169,11 @@
169169
.admin__fieldset-wrapper-title {
170170
&:extend(.abs-clearfix all);
171171
border-bottom: 1px solid @color-gray80;
172-
margin-bottom: @page-order-sidebar__margin-reqular;
172+
margin-bottom: @order-create-sidebar__margin-reqular;
173173
padding-bottom: @indent__xs;
174174
.actions {
175175
float: right;
176-
margin-bottom: @page-order-sidebar__margin-reqular;
176+
margin-bottom: @order-create-sidebar__margin-reqular;
177177
margin-top: -@indent__xs;
178178
}
179179
.action-secondary {

0 commit comments

Comments
 (0)