Skip to content

Commit 52594a9

Browse files
committed
MAGETWO-57744: Configure button for Paypal solutions is shifted after changing window width
1 parent 3bcc1c9 commit 52594a9

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

app/code/Magento/Braintree/view/adminhtml/web/styles.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
.braintree-section .heading {display: inline-block; background: url("images/braintree_logo.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
7-
.braintree-section .button-container {display: inline-block; float: right;}
6+
.braintree-section .heading {background: url("images/braintree_logo.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
7+
.braintree-section .button-container {float: right;}
88
.braintree-section .config-alt {background: url("images/braintree_allinone.png") no-repeat scroll 0 0 / 100% auto; height: 28px; margin: 0.5rem 0 0; width: 230px;}

app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,10 @@ protected function _isPaymentEnabled($element)
7878
*/
7979
protected function _getHeaderTitleHtml($element)
8080
{
81-
$html = '<div class="config-heading" ><div class="heading"><strong>' . $element->getLegend();
81+
$html = '<div class="config-heading" >';
8282

8383
$groupConfig = $element->getGroup();
8484

85-
$html .= '</strong>';
86-
87-
if ($element->getComment()) {
88-
$html .= '<span class="heading-intro">' . $element->getComment() . '</span>';
89-
}
90-
$html .= '<div class="config-alt"></div>';
91-
$html .= '</div>';
92-
9385
$disabledAttributeString = $this->_isPaymentEnabled($element) ? '' : ' disabled="disabled"';
9486
$disabledClassString = $this->_isPaymentEnabled($element) ? '' : ' disabled';
9587
$htmlId = $element->getHtmlId();
@@ -122,6 +114,13 @@ protected function _getHeaderTitleHtml($element)
122114
) . '</a>';
123115
}
124116

117+
$html .= '</div>';
118+
$html .= '<div class="heading"><strong>' . $element->getLegend() . '</strong>';
119+
120+
if ($element->getComment()) {
121+
$html .= '<span class="heading-intro">' . $element->getComment() . '</span>';
122+
}
123+
$html .= '<div class="config-alt"></div>';
125124
$html .= '</div></div>';
126125

127126
return $html;

app/code/Magento/Paypal/view/adminhtml/web/styles.css

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
.payflow-settings-notice { border:1px solid #d1d0ce;padding:0 10px;margin: 0;}
1515
.payflow-settings-notice .important-label {color:#f00;}
1616
.payflow-settings-notice ul.options-list {list-style:disc;padding:0 2em;}
17-
.paypal-express-section .heading {display: inline-block; background: url("images/pp-logo-200px.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
18-
.paypal-express-section .button-container {display: inline-block; float: right;}
17+
.paypal-express-section .heading {background: url("images/pp-logo-200px.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
18+
.paypal-express-section .button-container {float: right;}
1919
.paypal-express-section .config-alt {background: url("images/pp-alt.png") no-repeat; height: 26px; margin: 0.5rem 0 0; width: 158px;}
2020
.paypal-express-section .link-more {margin-left: 5px;}
21-
.paypal-other-section .heading {display: inline-block;}
22-
.paypal-other-section .button-container {display: inline-block; float: right; margin: 1rem 0 0 !important;}
21+
.paypal-other-section .button-container {float: right; margin: 1rem 0 0 !important;}
2322
.paypal-other-section > .entry-edit-head > a::before {left: auto !important; right: 1.3rem !important;}
2423
.paypal-all-in-one-section > .entry-edit-head {background: url("images/AM_mc_vs_dc_ae.jpg") no-repeat scroll 0 50% / 18rem auto; padding-left: 18rem;}
2524
.paypal-gateways-section > .entry-edit-head {background: url("images/pp-payflow-mark.png") no-repeat scroll 0 50% / 18rem auto; padding-left: 18rem;}

0 commit comments

Comments
 (0)