Merge pull request #459 from magento-webdev/PR

[WD] Bugfixes
magento · Jul 13, 2015 · 5eb3c9a · 5eb3c9a
2 parents 57d42ab + 1375aaa
commit 5eb3c9a
Show file tree

Hide file tree

Showing 5 changed files with 491 additions and 462 deletions.
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php
@@ -63,7 +63,7 @@ protected function _prepareLayout()
                     'Magento\Backend\Block\Widget\Button',
                     [
                         'label' => __('Refund'),
-                        'class' => 'save submit-button refund',
+                        'class' => 'save submit-button refund primary',
                         'onclick' => 'disableElements(\'submit-button\');submitCreditMemo()'
                     ]
                 );
@@ -73,7 +73,7 @@ protected function _prepareLayout()
                 'Magento\Backend\Block\Widget\Button',
                 [
                     'label' => __('Refund Offline'),
-                    'class' => 'save submit-button',
+                    'class' => 'save submit-button primary',
                     'onclick' => 'disableElements(\'submit-button\');submitCreditMemoOffline()'
                 ]
             );

diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_total.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_total.less
@@ -31,4 +31,9 @@
     .action-default {
         &:extend(.abs-action-l all);
     }
+    .primary {
+        + .primary {
+            margin-left: @indent__s; 
+        }
+    }
 }
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/setup.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/setup.less
@@ -12,17 +12,17 @@
 //  ---------------------------------------------
 
 //  Global lib
-@import '/lib/web/css/source/lib/_lib.less';
+//@import '/lib/web/css/source/lib/_lib.less'; ToDo UI: deploy link to module
 
 //  Inherit Backend lib (sources)
-@import '../../../../../web/css/source/_variables.less';
-@import '../../../../../web/css/source/_utilities.less';
-@import '../../../../../web/css/source/_extends.less';
-@import '../../../../../web/css/source/_reset.less';
-@import '../../../../../web/css/source/_typography.less';
-@import '../../../../../web/css/source/_lists.less';
-@import '../../../../../web/css/source/_structure.less';
-@import '../../../../../web/css/source/_grid.less';
+@import '../../../../css/source/_variables.less';
+@import '../../../../css/source/_utilities.less';
+@import '../../../../css/source/_extends.less';
+@import '../../../../css/source/_reset.less';
+@import '../../../../css/source/_typography.less';
+@import '../../../../css/source/_lists.less';
+@import '../../../../css/source/_structure.less';
+@import '../../../../css/source/_grid.less';
 
 //  Setup lib (sources)
 @import 'lib/_variables.less';
@@ -48,20 +48,20 @@
 //  ---------------------------------------------
 
 //  Inherit Lib components
-@import '/lib/web/css/source/components/_modals.less';
+//@import '/lib/web/css/source/components/_modals.less'; ToDo UI: deploy link to module
 
 //  Inherit Backend components
-@import '../../../../../web/css/source/_actions.less';
-@import '../../../../../web/css/source/components/_messages.less';
-@import '../../../../../web/css/source/components/_modals_extend.less';
+@import '../../../../css/source/_actions.less';
+@import '../../../../css/source/components/_messages.less';
+@import '../../../../css/source/components/_modals_extend.less';
 
-@import '../../../../../Magento_Backend/web/css/source/module/_header.less';
-@import '../../../../../Magento_Backend/web/css/source/module/_menu.less';
+//@import '../../../../../Magento_Backend/web/css/source/module/_header.less'; ToDo UI: deploy link to module
+//@import '../../../../../Magento_Backend/web/css/source/module/_menu.less'; ToDo UI: deploy link to module
 
-@import '../../../../../Magento_Ui/web/css/source/module/_data-grid.less';
-@import (reference) '../../../../../web/css/source/forms/_extends.less';
-@import '../../../../../web/css/source/forms/_controls.less';
-@import '../../../../../web/css/source/forms/_fields.less';
+//@import '../../../../../Magento_Ui/web/css/source/module/_data-grid.less'; ToDo UI: deploy link to module
+@import (reference) '../../../../css/source/forms/_extends.less';
+@import '../../../../css/source/forms/_controls.less';
+@import '../../../../css/source/forms/_fields.less';
 
 //  Setup components
 @import 'components/_messages.less';
@@ -101,4 +101,4 @@
 //  Media queries collector
 //  ---------------------------------------------
 
-@import '../../../../../web/css/source/_responsive.less';
+@import '../../../../css/source/_responsive.less';