Skip to content

Commit 45e19dd

Browse files
author
Bogdan Plieshka
committed
MAGETWO-34790: [UI] Manage Components
- Merged Setup & Updater applications
1 parent f808cfd commit 45e19dd

File tree

24 files changed

+1999
-230
lines changed

24 files changed

+1999
-230
lines changed

‎app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@
118118
border-right-style: @data-grid-td__border-outer-style;
119119
}
120120
// Action select data grid styles (can be action-select-secondary in future)
121+
.action-select-wrap {
122+
position: static;
123+
}
121124
.action-select {
122125
.link-pattern();
123126
background-color: transparent;
@@ -131,13 +134,18 @@
131134
}
132135
&:after {
133136
border-color: @link__color transparent transparent transparent;
137+
margin: .6rem 0 0 .7rem;
138+
right: auto;
139+
top: auto;
134140
}
135141
&:before {
136142
display: none;
137143
}
138144
}
139145
.action-menu {
140146
left: auto;
147+
right: auto;
148+
top: auto;
141149
z-index: 1;
142150
}
143151
}

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/_messages.less

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99

1010
@icons-admin__font-name: @icons__font-family;
1111

12-
@icon-info__content: @icon-notice-messages__content;
13-
@icon-warning__content: @icon-warning-messages__content;
14-
@icon-check-mage__content: @icon-success-messages__content;
15-
@icon-error__content: @icon-error-messages__content;
16-
1712
.message {
1813
margin-bottom: 3rem;
1914
}

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

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@
33
// * See COPYING.txt for license details.
44
// */
55

6+
//
7+
// Setup & Upgrade Theme Icons
8+
// _____________________________________________
9+
10+
//
11+
// Variables
12+
// ---------------------------------------------
13+
614
.font-face(
7-
@family-name: 'Icons',
8-
@font-path: '@{path-to-pub}fonts/icons/icons',
15+
@family-name: @icons__font-family,
16+
@font-path: @icons__font-name-path,
917
@font-weight: normal,
1018
@font-style: normal
1119
);
@@ -18,45 +26,56 @@
1826
}
1927
}
2028

21-
.icon-success-thick {
22-
&:after {
23-
content: @icon-success-thick__content;
29+
.icon-success,
30+
.icon-failed {
31+
&:before {
32+
&:extend(.abs-icon all);
33+
font-family: @icons__font-family;
2434
}
2535
}
2636

2737
.icon-success {
28-
&:after {
29-
content: '\e601';
38+
color: @color-success;
39+
&:before {
40+
content: @icon-check-mage__content;
3041
}
3142
}
3243

33-
.icon-collapse {
44+
.icon-failed {
45+
color: @color-failed;
46+
&:before {
47+
content: @icon-error__content;
48+
}
49+
}
50+
51+
.icon-success-thick {
3452
&:after {
35-
content: @icon-collapse__content;
53+
content: @icon-check-mage__content;
3654
}
3755
}
3856

39-
.icon-failed-thick {
57+
58+
.icon-collapse {
4059
&:after {
41-
content: @icon-failed-thick__content;
60+
content: @icon-expand-close__content;
4261
}
4362
}
4463

45-
.icon-failed {
64+
.icon-failed-thick {
4665
&:after {
47-
content: '\e604';
66+
content: @icon-error__content;
4867
}
4968
}
5069

5170
.icon-expand {
5271
&:after {
53-
content: @icon-expand__content;
72+
content: @icon-expand-open__content;
5473
}
5574
}
5675

5776
.icon-warning {
5877
&:after {
59-
content: '\e606';
78+
content: @icon-warning__content;
6079
}
6180
}
6281

@@ -71,24 +90,24 @@
7190
width: 1em;
7291
&:after {
7392
bottom: 0;
74-
font-size: .8em;
93+
font-size: .5em;
7594
left: 0;
7695
position: absolute;
7796
right: 0;
78-
top: .15em;
97+
top: .45em;
7998
}
8099
}
81100

82101
.icon-success-round {
83102
background-color: @color-success;
84103
&:after {
85-
content: @icon-success-thick__content;
104+
content: @icon-check-mage__content;
86105
}
87106
}
88107

89108
.icon-failed-round {
90109
background-color: @color-failed;
91110
&:after {
92-
content: @icon-failed-thick__content;
111+
content: @icon-error__content;
93112
}
94-
}
113+
}

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ dl {
6161
.list-item-success {
6262
&:before {
6363
color: @color-success;
64-
content: @icon-success__content;
64+
content: @icon-check-mage__content;
6565
}
6666
}
6767

6868
.list-item-failed {
6969
&:before {
7070
color: @color-failed;
71-
content: @icon-failed__content;
71+
content: @icon-error__content;
7272
}
7373
}
7474

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// */
55

66
@import 'utilities/_vendor-prefixes.less';
7-
@import 'utilities/_grid-framework.less';
8-
@import 'utilities/_grid.less';
7+
//@import 'utilities/_grid-framework.less';
8+
//@import 'utilities/_grid.less';
99
@import 'utilities/_animations.less';
1010
@import 'utilities/_spinner.less';
1111

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

Lines changed: 61 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,68 @@
5757
// ---------------------------------------------
5858

5959
@icons__font-family: 'Icons';
60+
@icons__font-name-path: '../fonts/icons/icons';
61+
62+
@icon-close-mage__content: '\e62f';
63+
@icon-info__content: '\e61a';
64+
@icon-lock__content: '\e61b';
65+
@icon-loop__content: '\e61c';
66+
@icon-plus__content: '\e61d';
67+
@icon-recover__content: '\e61e';
68+
@icon-refresh__content: '\e61f';
69+
@icon-remove-small__content: '\e620';
70+
@icon-retweet__content: '\e621';
71+
@icon-unlocked__content: '\e622';
72+
@icon-warning__content: '\e623';
73+
@icon-arrow-left__content: '\e624';
74+
@icon-arrow-right__content: '\e625';
75+
@icon-back-arrow__content: '\e626';
76+
@icon-calendar__content: '\e627';
77+
@icon-caret-down__content: '\e628';
78+
@icon-caret-left__content: '\e629';
79+
@icon-caret-right__content: '\e62a';
80+
@icon-caret-up__content: '\e62b';
81+
@icon-ccw__content: '\e62c';
82+
@icon-check-mage__content: '\e62d';
83+
@icon-clock__content: '\e62e';
84+
@icon-delete__content: '\e630';
85+
@icon-edit__content: '\e631';
86+
@icon-error__content: '\e632';
87+
@icon-help__content: '\e633';
88+
@icon-history__content: '\e634';
89+
@icon-gripper__content: '\e617';
90+
@icon-forward__content: '\e618';
91+
@icon-backward__content: '\e619';
92+
@icon-expand-close__content: '\e615';
93+
@icon-expand-open__content: '\e616';
94+
@icon-system-config__content: '\e610';
95+
@icon-home__content: '\e611';
96+
@icon-lego__content: '\e612';
97+
@icon-tool__content: '\e613';
98+
@icon-upgrade__content: '\e614';
99+
@icon-notification-02__content: '\e607';
100+
@icon-product__content: '\e608';
101+
@icon-logo__content: '\e606';
102+
@icon-account__content: '\e600';
103+
@icon-arrowdown__content: '\e601';
104+
@icon-cms__content: '\e602';
105+
@icon-customers__content: '\e603';
106+
@icon-dashboard__content: '\e604';
107+
@icon-filter__content: '\e605';
108+
@icon-promotions__content: '\e609';
109+
@icon-reports__content: '\e60a';
110+
@icon-sales__content: '\e60b';
111+
@icon-search__content: '\e60c';
112+
@icon-stores__content: '\e60d';
113+
@icon-systems__content: '\e60e';
114+
@icon-views__content: '\e60f';
115+
60116
@icons-round__size: 2.5rem;
61-
@icon-success__content: '\e601';
62-
@icon-failed__content: '\e604';
63-
@icon-collapse__content: '\e602';
64-
@icon-expand__content: '\e605';
65-
@icon-success-thick__content: '\e600';
66-
@icon-failed-thick__content: '\e603';
67-
68-
@icon-success-messages__content: '\e62d';
69-
@icon-error-messages__content: '\e632';
70-
@icon-warning-messages__content: '\e623';
71-
@icon-notice-messages__content: '\e61a';
117+
118+
@icon-success-messages__content: @icon-check-mage__content;
119+
@icon-error-messages__content: @icon-error__content;
120+
@icon-warning-messages__content: @icon-warning__content;
121+
@icon-notice-messages__content: @icon-info__content;
72122

73123
//
74124
// Typography

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@checkbox__border-color: @color-gray68;
1212
@checkbox-check__font-size: 1em;
1313
@checkbox-check__line-height: 1;
14-
@checkbox-icon__content: @icon-success-thick__content;
14+
@checkbox-icon__content: @icon-check-mage__content;
1515
@radio-bullet__color: @color-brownie;
1616

1717
//

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_legends.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
}
4545
&.expanded {
4646
&:after {
47-
content: @icon-collapse__content;
47+
content: @icon-expand-close__content;
4848
}
4949
}
5050
&:after {
5151
margin-left: .5em;
5252
font-weight: @font-weight__regular;
5353
font-size: 1.15em;
5454
font-family: @icons__font-family;
55-
content: @icon-expand__content;
55+
content: @icon-expand-open__content;
5656
vertical-align: sub;
5757
}
5858
}

‎app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_navigation-bar.less

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)