Skip to content

Commit 9a242f8

Browse files
committed
Merge branch 'MAGETWO-44674' of github.corp.magento.com:magento-webdev/magento2ce into MAGETWO-44603
2 parents ae70cca + 3b3f3a2 commit 9a242f8

File tree

11 files changed

+690
-0
lines changed

11 files changed

+690
-0
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
.add-by-sku-wrapper {
7+
.accordion & {
8+
margin: 0 0 @indent__base;
9+
}
10+
.add-sku-csv {
11+
.admin__field-label {
12+
&:before {
13+
display: none;
14+
}
15+
}
16+
}
17+
}
18+
19+
.order-search-items {
20+
.col-in_products {
21+
text-align: center;
22+
}
23+
}
24+
25+
.order-discounts {
26+
.action-secondary {
27+
+ .action-secondary {
28+
margin-right: @indent__s;
29+
}
30+
}
31+
}
32+
33+
.order-errors {
34+
.admin__fieldset-wrapper {
35+
.title {
36+
&:extend(.message all);
37+
&:extend(.message-notice all);
38+
display: block;
39+
margin: 0 0 @indent__base;
40+
}
41+
}
42+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
.permissions-custom-options {
7+
.admin__control-table {
8+
margin: 0 0 @indent__base;
9+
}
10+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
.field-refund-store-credit {
7+
.admin__control-text {
8+
margin-left: @indent__s;
9+
width: 8rem;
10+
}
11+
}
12+
13+
.order-creditmemo-tables {
14+
&:extend(.abs-order-tables all);
15+
&:extend(.abs-order-tbody-border all);
16+
}

0 commit comments

Comments
 (0)