Merge remote-tracking branch 'mpipub/MAGETWO-57227' into MPI-PR

Author: rliukshyn

app/code/Magento/Paypal/etc/adminhtml/system.xml

@@ -28,12 +28,12 @@
             <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Other PayPal Payment Solutions:</label>
                 <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
             </group>
             <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Other Payment Methods:</label>
                 <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
             </group>
         </section>
         <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">

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

@@ -16,7 +16,7 @@
 .payflow-settings-notice ul.options-list {list-style:disc;padding:0 2em;}
 .paypal-express-section .heading {display: inline-block; background: url("images/pp-logo-200px.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
 .paypal-express-section .button-container {display: inline-block; float: right;}
-.paypal-express-section .config-alt {background: url("images/pp-alt.png") no-repeat; height: 26px; margin: 0.5rem 0 0; width: 158px;}
+.paypal-express-section .config-alt {background: url("images/pp-alt.png") no-repeat; height: 26px; margin: .5rem 0 0; width: 158px;}
 .paypal-express-section .link-more {margin-left: 5px;}
 .paypal-other-section .heading {display: inline-block;}
 .paypal-other-section .button-container {display: inline-block; float: right; margin: 1rem 0 0 !important;}
@@ -27,7 +27,9 @@
 .paypal-top-section.active > .entry-edit-head.admin__collapsible-block {border-bottom: 1px solid #ccc;}
 .paypal-top-section > .admin__collapsible-block > a {font-size: 1.4rem; font-weight: normal; text-transform: uppercase;}
 .paypal-recommended-header > .admin__collapsible-block > a::before {content: "" !important;}
-.paypal-other-header > .admin__collapsible-block > a.open::before {content: "\25B2" !important;}
-.paypal-other-header > .admin__collapsible-block > a::before {color: #000; content: "\25BC" !important; font-size: 1rem; top: 2.2rem;}
+.paypal-other-header > .admin__collapsible-block > a::before {content: '' !important; width: 0; height: 0; border-color: transparent; border-top-color: #000; border-style: solid; border-width: .8rem .5rem 0 .5rem; margin-top:1px; transition: all .2s linear;}
+.paypal-other-header > .admin__collapsible-block > a.open::before {border-color: transparent; border-bottom-color: #000; border-width: 0 .5rem .8rem .5rem;}
 .paypal-other-header > .admin__collapsible-block > a {color: #007bdb !important; text-align: right;}
-.payments-other-header > .admin__collapsible-block > a::before {content: "" !important;}
+.payments-other-header > .admin__collapsible-block > a {display: inline-block;}
+.payments-other-header > .admin__collapsible-block > a::before {content: '' !important; width: 0; height: 0; border-color: transparent; border-top-color: #000; border-style: solid; border-width: .8rem .5rem 0 .5rem; margin-top:1px; transition: all .2s linear;}
+.payments-other-header > .admin__collapsible-block > a.open::before {border-color: transparent; border-bottom-color: #000; border-width: 0 .5rem .8rem .5rem;}

dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml

@@ -28,12 +28,12 @@
             <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Other PayPal Payment Solutions:</label>
                 <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
             </group>
             <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Other Payment Methods:</label>
                 <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
             </group>
         </section>
         <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">

dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml

@@ -28,12 +28,12 @@
             <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Other PayPal Payment Solutions:</label>
                 <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
             </group>
             <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Other Payment Methods:</label>
                 <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
+                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
             </group>
         </section>
         <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">