Skip to content

Commit 1aef003

Browse files
authored
Merge pull request #201 from magento-falcons/MAGETWO-55903
[Falcons] Improvement of Web Setup Wizard
2 parents f175469 + 011332b commit 1aef003

File tree

143 files changed

+10375
-5777
lines changed

Some content is hidden

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

143 files changed

+10375
-5777
lines changed

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@
112112
@icon-stores__content: '\e60d';
113113
@icon-systems__content: '\e610';
114114
@icon-views__content: '\e60f';
115+
@icon-module__content: '\e647';
116+
@icon-alert-round__content: '\e648';
115117

116118
@icons-round__size: 2.5rem;
117119

app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less

Lines changed: 101 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Variables
88
// _____________________________________________
99

10-
@component-indicator__size: 20px;
10+
@component-indicator__size: 16px;
1111

1212
//
1313
// Component grid elements
@@ -19,6 +19,7 @@
1919
display: inline-block;
2020
height: @component-indicator__size;
2121
text-align: center;
22+
vertical-align: middle;
2223
width: @component-indicator__size;
2324

2425
&::before,
@@ -37,7 +38,7 @@
3738
box-shadow: 0 0 2px rgba(0,0,0,.4);
3839
content: attr(data-label);
3940
font-size: @font-size__s;
40-
margin: 34px 0 0 -10px;
41+
margin: 30px 0 0 -10px;
4142
min-width: 50px;
4243
padding: 4px 5px;
4344
}
@@ -73,7 +74,7 @@
7374
content: '';
7475
display: block;
7576
font-family: @icons__font-family;
76-
font-size: 20px;
77+
font-size: @component-indicator__size;
7778
height: 100%;
7879
line-height: @component-indicator__size;
7980
width: 100%;
@@ -105,10 +106,105 @@
105106

106107
&:before {
107108
color: @color-info;
108-
content: @icon-notice-messages__content;
109+
content: @icon-alert-round__content;
109110
font-family: @icons__font-family;
110-
font-size: 21px;
111+
font-size: @component-indicator__size;
111112
}
112113
}
113114
}
114115
}
116+
117+
.col-manager-item-name {
118+
.data-grid-data {
119+
padding-left: 5px;
120+
}
121+
122+
.ng-hide {
123+
+ .data-grid-data {
124+
padding-left: 24px;
125+
}
126+
}
127+
128+
._show-dependencies,
129+
._hide-dependencies {
130+
cursor: pointer;
131+
padding-left: 24px;
132+
position: relative;
133+
134+
&:before {
135+
display: block;
136+
font-family: @icons__font-family;
137+
font-size: 12px;
138+
left: 0;
139+
position: absolute;
140+
top: 1px;
141+
}
142+
}
143+
144+
._show-dependencies {
145+
&:before {
146+
content: @icon-caret-up__content;
147+
}
148+
}
149+
150+
._hide-dependencies {
151+
&:before {
152+
content: @icon-caret-down__content;
153+
}
154+
}
155+
156+
._no-dependencies {
157+
padding-left: 24px;
158+
}
159+
}
160+
161+
.product-modules-block {
162+
.lib-font-size(12);
163+
padding: 15px 0 0;
164+
165+
.col-manager-item-name & {
166+
padding-left: @indent__s;
167+
}
168+
}
169+
170+
.product-modules-title,
171+
.product-modules-descriprion {
172+
font-weight: @font-weight__bold;
173+
margin: 0 0 7px;
174+
}
175+
176+
.product-modules-list {
177+
.lib-font-size(11);
178+
list-style: none;
179+
margin: 0;
180+
181+
.col-manager-item-name & {
182+
margin-left: 15px;
183+
184+
li {
185+
padding: 0 0 0 15px;
186+
position: relative;
187+
}
188+
}
189+
190+
li {
191+
margin: 0 0 @indent__xs;
192+
}
193+
194+
.component-indicator {
195+
height: 10px;
196+
left: 0;
197+
position: absolute;
198+
top: 3px;
199+
width: 10px;
200+
}
201+
}
202+
203+
.module-summary {
204+
white-space: nowrap;
205+
}
206+
207+
.module-summary-title {
208+
.lib-font-size(21);
209+
margin-right: @indent__s;
210+
}

app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_header.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@page-header__border-color: @color-gray89;
1111
@page-header__border-width: 1px;
12-
@page-header__padding-bottom: 2.9rem;
12+
@page-header__padding-bottom: 2rem;
1313
@page-header__margin-bottom: 2.7rem;
1414

1515
@search-global-label-icon__color: @color-very-dark-gray1;

app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_menu.less

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@
6464
}
6565
}
6666

67+
.item-extension {
68+
> a {
69+
&:before {
70+
content: @icon-module__content;
71+
}
72+
}
73+
}
74+
6775
.item-upgrade {
6876
> a {
6977
&:before {

app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_component-manager.less

Lines changed: 0 additions & 99 deletions
This file was deleted.
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
// /**
2+
// * Copyright © 2016 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Web Setup Wizard -> Extension Manager
8+
// _____________________________________________
9+
10+
//
11+
// Variables
12+
// ---------------------------------------------
13+
14+
@extension-manager-wrap__border-color: @color-gray-light2;
15+
16+
@extension-manager-title__background-color: @color-white-fog;
17+
@extension-manager-title__border-color: @color-gray89;
18+
@extension-manager-title__color: @color-brown-darkie;
19+
20+
@extension-manager-button__border-color: @color-gray68;
21+
22+
//
23+
24+
.extension-manager-wrap {
25+
border: 1px solid @extension-manager-wrap__border-color;
26+
margin: 0 0 @indent__xl;
27+
}
28+
29+
.extension-manager-account {
30+
.lib-font-size(21);
31+
display: inline-block;
32+
font-weight: @font-weight__regular;
33+
}
34+
35+
.extension-manager-title {
36+
&:extend(.abs-clearer all);
37+
.lib-font-size(32);
38+
background-color: @extension-manager-title__background-color;
39+
border-bottom: 1px solid @extension-manager-title__border-color;
40+
color: @extension-manager-title__color;
41+
font-weight: @font-weight__semibold;
42+
line-height: 1.2;
43+
padding: @indent__base;
44+
}
45+
46+
.extension-manager-content {
47+
&:extend(.abs-clearer all);
48+
padding: @indent__m @indent__base @indent__base;
49+
}
50+
51+
.extension-manager-items {
52+
list-style: none;
53+
margin: 0;
54+
text-align: center;
55+
56+
.btn {
57+
border: 1px solid @extension-manager-button__border-color;
58+
display: block;
59+
margin: @indent__s auto 0;
60+
}
61+
62+
.item-title {
63+
.lib-font-size(21);
64+
display: inline-block;
65+
text-align: left;
66+
}
67+
68+
.item-number {
69+
.lib-font-size(41);
70+
display: inline-block;
71+
line-height: .8;
72+
margin: 0 5px 1.5rem 0;
73+
vertical-align: top;
74+
}
75+
76+
.item-date {
77+
.lib-font-size(26);
78+
margin-top: 1px;
79+
}
80+
81+
.item-date-title {
82+
.lib-font-size(15);
83+
}
84+
85+
.item-install {
86+
margin: 0 0 @indent__base;
87+
}
88+
}

app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_home.less

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,19 @@
6161
}
6262
}
6363

64-
.setup-home-item-component {
64+
.setup-home-item-component,
65+
.setup-home-item-extension {
6566
&:before {
6667
content: @icon-lego__content;
6768
}
6869
}
6970

71+
.setup-home-item-module {
72+
&:before {
73+
content: @icon-module__content;
74+
}
75+
}
76+
7077
.setup-home-item-upgrade {
7178
&:before {
7279
content: @icon-updater__content;

0 commit comments

Comments
 (0)