MAGETWO-33669: Contribution of Sprint 23 Work to Mainline

- applying patch from UI team

Author: mazhalai

Gruntfile.js

@@ -35,10 +35,10 @@ module.exports = function (grunt) {
         tmpSource: 'var/view_preprocessed/source/',
         tmp: 'var',
         css: {
-            setup: 'setup/pub/magento/setup/css'
+            setup: 'setup/pub/styles'
         },
         less: {
-            setup: 'setup/module/Magento/Setup/styles'
+            setup: 'setup/view/styles'
         },
         uglify: {
             legacy: 'lib/web/legacy-build.min.js'

setup/pub/styles/setup.css

@@ -15,7 +15,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Magento Setup Tool</title>
     <?php echo $this->headLink()
-        ->appendStylesheet($this->basePath() . '/pub/magento/setup/css/setup.css');
+        ->appendStylesheet($this->basePath() . '/pub/styles/setup.css');
     ?>
     <?php echo $this->headScript()
         ->appendFile('pub/angular/angular.min.js')

setup/view/layout/layout.phtml

@@ -20,7 +20,7 @@
 
 <h2 class="page-title">{{$state.current.header}}</h2>
 
-<form name="customizeStore" role="form">
+<form class="customize-your-store" name="customizeStore" role="form">
 
     <div class="row form-row">
         <div class="col-m-3">

setup/view/magento/setup/customize-your-store.phtml

@@ -5,7 +5,7 @@
 
 //  Paths
 
-@path-to-pub: '../../../../pub/';
+@path-to-pub: '../../pub/';
 
 //
 //  Colors

setup/view/styles/lib/_variables.less

@@ -3,47 +3,58 @@
 //  * See COPYING.txt for license details.
 //  */
 
-.multiSelect {
-  .selected {
-    width: 430px;
-    background-color: #d9edf7;
-    padding: 5px;
-  }
-  .notSelected{
-    width: 430px;
-    padding: 5px;
-  }
-  .form-label {
-    font-size: 1.8rem;
-  }
-}
+.customize-your-store {
 
-.form-legend-expand {
-  margin: 1px;
-}
+    .multiSelect {
+        .selected {
+            width: 430px;
+            background-color: #d9edf7;
+            padding: 5px;
+        }
+        .notSelected {
+            width: 430px;
+            padding: 5px;
+        }
+        .form-label {
+            font-size: 1.8rem;
+        }
+    }
+            width: 430px;
+            padding: 5px;
+        }
+        .form-label {
+            font-size: 1.8rem;
+        }
+    }
 
-.alert-text {
-  margin: 5px;
-  display: block;
-}
+    .form-legend-expand {
+        margin: 1px;
+    }
 
-.alert-info {
-  .form-legend-expand {
-    margin: 5px;
-    font-size: 1.4rem;
-    display: inline;
-  }
-}
+    .alert-text {
+        margin: 5px;
+        display: block;
+    }
+
+    .alert-info {
+        .form-legend-expand {
+            margin: 5px;
+            font-size: 1.4rem;
+            display: inline;
+        }
+    }
+
+    .icon-failed-round {
+        margin: 2px;
+        position: relative;
+    }
+    .multiSelect {
+        padding-left: 10px;
+        border-radius: 4px;
+        border: 1px solid #ccc;
+        overflow-y: scroll;
+        width: 450px;
+        height: 300px;
+    }
 
-.icon-failed-round{
-  margin: 2px;
-  position: relative;
-}
-  .multiSelect {
-    padding-left: 10px;
-    border-radius: 4px;
-    border: 1px solid #ccc;
-    overflow-y: scroll;
-    width: 450px;
-    height: 300px;
 }