Skip to content

Commit 4f9d344

Browse files
author
Bogdan Plieshka
committed
MAGETWO-31515: [UI] CSS styling for Installation Form
- CR changes - Added extend mixins - Added general comment creation via Grunt concat plugin
1 parent 760c428 commit 4f9d344

File tree

10 files changed

+83
-46
lines changed

10 files changed

+83
-46
lines changed

Gruntfile.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ module.exports = function (grunt) {
99

1010
// Required plugins
1111
// _____________________________________________
12-
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt);
12+
13+
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt),
14+
svgo = require('imagemin-svgo');
1315

1416
require('./dev/tools/grunt/tasks/mage-minify')(grunt);
1517

@@ -21,8 +23,6 @@ module.exports = function (grunt) {
2123
pattern: ['grunt-*', '!grunt-template-jasmine-requirejs']
2224
});
2325

24-
var svgo = require('imagemin-svgo');
25-
2626
// Configuration
2727
// _____________________________________________
2828

@@ -318,7 +318,8 @@ module.exports = function (grunt) {
318318

319319
cssmin: {
320320
options: {
321-
report: 'gzip'
321+
report: 'gzip',
322+
keepSpecialComments: 0
322323
},
323324
setup: {
324325
files: {
@@ -342,6 +343,20 @@ module.exports = function (grunt) {
342343
}
343344
},
344345

346+
// Concatenation
347+
// ---------------------------------------------
348+
349+
concat: {
350+
options: {
351+
stripBanners: true,
352+
banner: '/**\n * Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n'
353+
},
354+
setup: {
355+
src: '<%= path.css.setup %>/setup.css',
356+
dest: '<%= path.css.setup %>/setup.css'
357+
}
358+
},
359+
345360

346361
// Watches files for changes and runs tasks based on the changed files
347362
// ---------------------------------------------
@@ -538,7 +553,8 @@ module.exports = function (grunt) {
538553
grunt.task.run([
539554
'less:' + component,
540555
'autoprefixer:' + component,
541-
'cssmin:' + component
556+
'cssmin:' + component,
557+
'concat:' + component
542558
]);
543559
}
544560
if (component == undefined) {

package.json

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
11
{
2-
"name": "Magento2",
3-
"author": "Magento, an eBay Inc. company",
4-
"description": "Magento2 node modules dependencies for local development",
5-
"version": "0.42.0-beta1",
6-
"repository": {
7-
"type": "git",
8-
"url": "https://github.com/magento/magento2.git"
9-
},
10-
"homepage": "http://magento.com/",
11-
"devDependencies": {
12-
"connect": "^3.3.3",
13-
"grunt": "^0.4.5",
14-
"grunt-autoprefixer": "^2.0.0",
15-
"grunt-contrib-clean": "^0.6.0",
16-
"grunt-contrib-cssmin": "^0.10.0",
17-
"grunt-contrib-imagemin": "^0.9.2",
18-
"grunt-contrib-jasmine": "^0.8.1",
19-
"grunt-contrib-less": "^0.12.0",
20-
"grunt-contrib-watch": "^0.6.1",
21-
"grunt-exec": "^0.4.6",
22-
"grunt-styledocco": "^0.1.4",
23-
"imagemin-svgo": "^4.0.1",
24-
"grunt-template-jasmine-requirejs": "^0.2.0",
25-
"load-grunt-tasks": "^1.0.0",
26-
"morgan": "^1.5.0",
27-
"node-minify": "^1.0.1",
28-
"serve-static": "^1.7.1",
29-
"time-grunt": "^1.0.0",
30-
"underscore": "^1.7.0"
31-
},
32-
"engines": {
33-
"node": ">=0.10.0"
34-
}
2+
"name": "Magento2",
3+
"author": "Magento, an eBay Inc. company",
4+
"description": "Magento2 node modules dependencies for local development",
5+
"version": "0.42.0-beta1",
6+
"repository": {
7+
"type": "git",
8+
"url": "https://github.com/magento/magento2.git"
9+
},
10+
"homepage": "http://magento.com/",
11+
"devDependencies": {
12+
"connect": "^3.3.3",
13+
"grunt": "^0.4.5",
14+
"grunt-autoprefixer": "^2.0.0",
15+
"grunt-contrib-clean": "^0.6.0",
16+
"grunt-contrib-concat": "^0.5.0",
17+
"grunt-contrib-cssmin": "^0.10.0",
18+
"grunt-contrib-imagemin": "^0.9.2",
19+
"grunt-contrib-jasmine": "^0.8.1",
20+
"grunt-contrib-less": "^0.12.0",
21+
"grunt-contrib-watch": "^0.6.1",
22+
"grunt-exec": "^0.4.6",
23+
"grunt-styledocco": "^0.1.4",
24+
"grunt-template-jasmine-requirejs": "^0.2.0",
25+
"imagemin-svgo": "^4.0.1",
26+
"load-grunt-tasks": "^1.0.0",
27+
"morgan": "^1.5.0",
28+
"node-minify": "^1.0.1",
29+
"serve-static": "^1.7.1",
30+
"time-grunt": "^1.0.0",
31+
"underscore": "^1.7.0"
32+
},
33+
"engines": {
34+
"node": ">=0.10.0"
35+
}
3536
}

setup/module/Magento/Setup/styles/components/_navigation-bar.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
background-color: @nav__background-color;
4141
border-bottom: 1px solid @nav__border-color;
4242
border-top: 1px solid @nav__border-color;
43-
.clearer();
43+
.extend__clearer();
4444
display: none;
4545
padding: @nav-bar-dot__size @nav__indent-right 0 0;
4646
}
@@ -271,7 +271,7 @@
271271
margin-top: 0;
272272
}
273273
.nav-bar {
274-
.clearer();
274+
.extend__clearer();
275275
display: block;
276276
margin-bottom: 0;
277277
margin-left: auto;

setup/module/Magento/Setup/styles/lib/_alerts.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
@alert-icon__size: 3.8rem;
1919

20+
//
2021
// Common
2122
// _____________________________________________
2223

@@ -29,7 +30,7 @@
2930
min-width: @spinner__size;
3031
}
3132
.ie9 & {
32-
.clearer();
33+
.extend__clearer();
3334
.spinner {
3435
float: left;
3536
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
// Clearfix
7+
8+
.abs-clearer {
9+
.clearer();
10+
}
11+
12+
.extend__clearer() {
13+
&:extend(.abs-clearer all);
14+
}

setup/module/Magento/Setup/styles/lib/forms/_forms.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
// ---------------------------------------------
3636

3737
.form-row {
38-
.clearer();
38+
.extend__clearer();
3939
margin-bottom: 2.2rem;
4040

4141
.form-row {

setup/module/Magento/Setup/styles/lib/utilities/_grid.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
margin-right: auto;
1919
padding-left: (@gutter / 2);
2020
padding-right: (@gutter / 2);
21-
.clearer();
21+
.extend__clearer();
2222
}
2323

2424
// Creates a wrapper for a series of columns
2525

2626
.make-row(@gutter: @grid-gutter-width) {
2727
margin-left: (@gutter / -2);
2828
margin-right: (@gutter / -2);
29-
.clearer();
29+
.extend__clearer();
3030
}
3131

3232
//

setup/module/Magento/Setup/styles/pages/_common.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// _____________________________________________
2525

2626
.header {
27-
.clearer();
27+
.extend__clearer();
2828
display: none;
2929
.logo {
3030
float: left;

setup/module/Magento/Setup/styles/setup.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
@import 'lib/_variables';
1919
@import 'lib/_utilities';
2020
@import 'lib/_reset';
21+
@import 'lib/_extends';
2122
@import 'lib/_classes';
2223
@import 'lib/_typography';
2324
@import 'lib/_icons';

setup/pub/magento/setup/css/setup.css

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)