Skip to content
Snippets Groups Projects
Commit 560cb7aa authored by Maddy Chellathurai's avatar Maddy Chellathurai
Browse files

MAGETWO-33669: Contribution of Sprint 23 Work to Mainline

- applying patch from UI team
parent e7203293
No related merge requests found
...@@ -35,10 +35,10 @@ module.exports = function (grunt) { ...@@ -35,10 +35,10 @@ module.exports = function (grunt) {
tmpSource: 'var/view_preprocessed/source/', tmpSource: 'var/view_preprocessed/source/',
tmp: 'var', tmp: 'var',
css: { css: {
setup: 'setup/pub/magento/setup/css' setup: 'setup/pub/styles'
}, },
less: { less: {
setup: 'setup/module/Magento/Setup/styles' setup: 'setup/view/styles'
}, },
uglify: { uglify: {
legacy: 'lib/web/legacy-build.min.js' legacy: 'lib/web/legacy-build.min.js'
......
This diff is collapsed.
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Magento Setup Tool</title> <title>Magento Setup Tool</title>
<?php echo $this->headLink() <?php echo $this->headLink()
->appendStylesheet($this->basePath() . '/pub/magento/setup/css/setup.css'); ->appendStylesheet($this->basePath() . '/pub/styles/setup.css');
?> ?>
<?php echo $this->headScript() <?php echo $this->headScript()
->appendFile('pub/angular/angular.min.js') ->appendFile('pub/angular/angular.min.js')
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<h2 class="page-title">{{$state.current.header}}</h2> <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="row form-row">
<div class="col-m-3"> <div class="col-m-3">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
// Paths // Paths
@path-to-pub: '../../../../pub/'; @path-to-pub: '../../pub/';
// //
// Colors // Colors
......
...@@ -3,47 +3,58 @@ ...@@ -3,47 +3,58 @@
// * See COPYING.txt for license details. // * See COPYING.txt for license details.
// */ // */
.multiSelect { .customize-your-store {
.selected {
width: 430px;
background-color: #d9edf7;
padding: 5px;
}
.notSelected{
width: 430px;
padding: 5px;
}
.form-label {
font-size: 1.8rem;
}
}
.form-legend-expand { .multiSelect {
margin: 1px; .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 { .form-legend-expand {
margin: 5px; margin: 1px;
display: block; }
}
.alert-info { .alert-text {
.form-legend-expand { margin: 5px;
margin: 5px; display: block;
font-size: 1.4rem; }
display: inline;
} .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;
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment