Skip to content

Commit 760c428

Browse files
author
Bogdan Plieshka
committed
MAGETWO-31515: [UI] CSS styling for Installation Form
- Added styles, fonts and images for Intallation wizard - Updated markup and templates - Removed bootstrap - Added grunt packages: autoprefixer, minifier - ConflictsL package.json
1 parent 19b2730 commit 760c428

File tree

101 files changed

+4966
-7237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+4966
-7237
lines changed

lib/web/css/source/lib/variables.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
@color-gray79: #c9c9c9;
4343
@color-gray80: #ccc;
4444
@color-gray82: #d1d1d1;
45+
@color-gray89: #e3e3e3;
4546
@color-gray90: #e5e5e5;
4647
@color-gray91: #e8e8e8;
4748
@color-gray92: #ebebeb;

package.json

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
11
{
2-
"name": "Magento2",
3-
"description": "Magento2 node modules dependencies for local development",
4-
"devDependencies": {
5-
"connect": "^3.3.3",
6-
"grunt": "^0.4.5",
7-
"grunt-contrib-clean": "^0.6.0",
8-
"grunt-contrib-imagemin": "^0.9.2",
9-
"grunt-contrib-jasmine": "^0.8.1",
10-
"grunt-contrib-less": "^0.12.0",
11-
"grunt-contrib-watch": "^0.6.1",
12-
"grunt-exec": "^0.4.6",
13-
"grunt-styledocco": "^0.1.4",
14-
"imagemin-svgo": "^4.0.1",
15-
"grunt-template-jasmine-requirejs": "^0.2.0",
16-
"load-grunt-tasks": "^1.0.0",
17-
"time-grunt": "^1.0.0",
18-
"underscore": "^1.7.0",
19-
"node-minify": "^1.0.1",
20-
"morgan": "^1.5.0",
21-
"serve-static": "^1.7.1",
22-
"time-grunt": "^1.0.0"
23-
},
24-
"engines": {
25-
"node": ">=0.10.0"
26-
}
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+
}
2735
}

setup/module/Magento/Setup/config/states.config.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
'id' => 'root.readiness-check',
3737
'url' => 'readiness-check',
3838
'templateUrl' => "{$base}/readiness-check",
39-
'title' => 'Readiness Check',
39+
'title' => "Readiness \n Check",
4040
'header' => 'Step 1: Readiness Check',
4141
'nav-bar' => true,
4242
'order' => 1,
@@ -55,7 +55,7 @@
5555
'id' => 'root.add-database',
5656
'url' => 'add-database',
5757
'templateUrl' => "{$base}/add-database",
58-
'title' => 'Add a Database',
58+
'title' => "Add \n a Database",
5959
'header' => 'Step 2: Add a Database',
6060
'controller' => 'addDatabaseController',
6161
'nav-bar' => true,
@@ -66,7 +66,7 @@
6666
'id' => 'root.web-configuration',
6767
'url' => 'web-configuration',
6868
'templateUrl' => "{$base}/web-configuration",
69-
'title' => 'Web Configuration',
69+
'title' => "Web \n Configuration",
7070
'header' => 'Step 3: Web Configuration',
7171
'controller' => 'webConfigurationController',
7272
'nav-bar' => true,
@@ -77,7 +77,7 @@
7777
'id' => 'root.customize-your-store',
7878
'url' => 'customize-your-store',
7979
'templateUrl' => "{$base}/customize-your-store",
80-
'title' => 'Customize Your Store',
80+
'title' => "Customize \n Your Store",
8181
'header' => 'Step 4: Customize Your Store',
8282
'controller' => 'customizeYourStoreController',
8383
'nav-bar' => true,
@@ -87,7 +87,7 @@
8787
'id' => 'root.create-admin-account',
8888
'url' => 'create-admin-account',
8989
'templateUrl' => "{$base}/create-admin-account",
90-
'title' => 'Create Admin Account',
90+
'title' => "Create \n Admin Account",
9191
'header' => 'Step 5: Create Admin Account',
9292
'controller' => 'createAdminAccountController',
9393
'nav-bar' => true,

0 commit comments

Comments
 (0)