Skip to content

Commit 5eb3c9a

Browse files
committed
Merge pull request #459 from magento-webdev/PR
[WD] Bugfixes
2 parents 57d42ab + 1375aaa commit 5eb3c9a

File tree

5 files changed

+491
-462
lines changed

5 files changed

+491
-462
lines changed

app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected function _prepareLayout()
6363
'Magento\Backend\Block\Widget\Button',
6464
[
6565
'label' => __('Refund'),
66-
'class' => 'save submit-button refund',
66+
'class' => 'save submit-button refund primary',
6767
'onclick' => 'disableElements(\'submit-button\');submitCreditMemo()'
6868
]
6969
);
@@ -73,7 +73,7 @@ protected function _prepareLayout()
7373
'Magento\Backend\Block\Widget\Button',
7474
[
7575
'label' => __('Refund Offline'),
76-
'class' => 'save submit-button',
76+
'class' => 'save submit-button primary',
7777
'onclick' => 'disableElements(\'submit-button\');submitCreditMemoOffline()'
7878
]
7979
);

app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_total.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,9 @@
3131
.action-default {
3232
&:extend(.abs-action-l all);
3333
}
34+
.primary {
35+
+ .primary {
36+
margin-left: @indent__s;
37+
}
38+
}
3439
}

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/setup.less

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
// ---------------------------------------------
1313

1414
// Global lib
15-
@import '/lib/web/css/source/lib/_lib.less';
15+
//@import '/lib/web/css/source/lib/_lib.less'; ToDo UI: deploy link to module
1616

1717
// Inherit Backend lib (sources)
18-
@import '../../../../../web/css/source/_variables.less';
19-
@import '../../../../../web/css/source/_utilities.less';
20-
@import '../../../../../web/css/source/_extends.less';
21-
@import '../../../../../web/css/source/_reset.less';
22-
@import '../../../../../web/css/source/_typography.less';
23-
@import '../../../../../web/css/source/_lists.less';
24-
@import '../../../../../web/css/source/_structure.less';
25-
@import '../../../../../web/css/source/_grid.less';
18+
@import '../../../../css/source/_variables.less';
19+
@import '../../../../css/source/_utilities.less';
20+
@import '../../../../css/source/_extends.less';
21+
@import '../../../../css/source/_reset.less';
22+
@import '../../../../css/source/_typography.less';
23+
@import '../../../../css/source/_lists.less';
24+
@import '../../../../css/source/_structure.less';
25+
@import '../../../../css/source/_grid.less';
2626

2727
// Setup lib (sources)
2828
@import 'lib/_variables.less';
@@ -48,20 +48,20 @@
4848
// ---------------------------------------------
4949

5050
// Inherit Lib components
51-
@import '/lib/web/css/source/components/_modals.less';
51+
//@import '/lib/web/css/source/components/_modals.less'; ToDo UI: deploy link to module
5252

5353
// Inherit Backend components
54-
@import '../../../../../web/css/source/_actions.less';
55-
@import '../../../../../web/css/source/components/_messages.less';
56-
@import '../../../../../web/css/source/components/_modals_extend.less';
54+
@import '../../../../css/source/_actions.less';
55+
@import '../../../../css/source/components/_messages.less';
56+
@import '../../../../css/source/components/_modals_extend.less';
5757

58-
@import '../../../../../Magento_Backend/web/css/source/module/_header.less';
59-
@import '../../../../../Magento_Backend/web/css/source/module/_menu.less';
58+
//@import '../../../../../Magento_Backend/web/css/source/module/_header.less'; ToDo UI: deploy link to module
59+
//@import '../../../../../Magento_Backend/web/css/source/module/_menu.less'; ToDo UI: deploy link to module
6060

61-
@import '../../../../../Magento_Ui/web/css/source/module/_data-grid.less';
62-
@import (reference) '../../../../../web/css/source/forms/_extends.less';
63-
@import '../../../../../web/css/source/forms/_controls.less';
64-
@import '../../../../../web/css/source/forms/_fields.less';
61+
//@import '../../../../../Magento_Ui/web/css/source/module/_data-grid.less'; ToDo UI: deploy link to module
62+
@import (reference) '../../../../css/source/forms/_extends.less';
63+
@import '../../../../css/source/forms/_controls.less';
64+
@import '../../../../css/source/forms/_fields.less';
6565

6666
// Setup components
6767
@import 'components/_messages.less';
@@ -101,4 +101,4 @@
101101
// Media queries collector
102102
// ---------------------------------------------
103103

104-
@import '../../../../../web/css/source/_responsive.less';
104+
@import '../../../../css/source/_responsive.less';

0 commit comments

Comments
 (0)