Merge pull request #1026 from magento-engcom/develop-prs

Public Pull Requests

#9234
#6452
#5325

Author: Oleksii Korshenko

app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less

@@ -16,7 +16,7 @@
 
 @modal-popup-title__font-size: 26px;
 @modal-popup-title-mobile__font-size: @font-size__base;
-@modal-popup-breakpoint-screen__m: @screen__m + 1;
+@modal-popup-breakpoint-screen__m: @screen__m;
 
 @modal-slide__first__indent-left: 44px;
 @modal-slide-mobile__background-color: @color-gray-light01;

app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less

@@ -16,7 +16,7 @@
 
 @modal-popup-title__font-size: 26px;
 @modal-popup-title-mobile__font-size: @font-size__base;
-@modal-popup-breakpoint-screen__m: @screen__m + 1;
+@modal-popup-breakpoint-screen__m: @screen__m;
 
 @modal-slide__first__indent-left: 44px;
 @modal-slide-mobile__background-color: @color-gray-light01;

lib/web/css/source/components/_modals.less

@@ -248,7 +248,7 @@
 //  _____________________________________________
 
 //  Mobile transform to modal-slide
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = (@screen__m + 1)) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .lib-modal-slide();

pub/.htaccess

@@ -2,7 +2,7 @@
 ## Optional override of deployment mode. We recommend you use the
 ## command bin/magento deploy:mode:set to switch modes instead
 
-    # Options are default, production, or developer
+# Options are default, production, or developer
 #   SetEnv MAGE_MODE default
 
 ############################################

setup/view/magento/setup/readiness-check/progress.phtml

@@ -392,7 +392,7 @@
 
                 <div class="readiness-check-side">
                     <p class="side-title">Need Help?</p>
-                    <a href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html" target="_blank">PHP Extension Help</a>
+                    <a href="http://devdocs.magento.com/guides/v2.0/install-gde/system-requirements.html" target="_blank">PHP Extension Help</a>
                 </div>
 
                 <span class="readiness-check-icon icon-failed-round"></span>