Skip to content

Commit b5d3927

Browse files
Evgeniy Kolesovzanilee
authored andcommitted
MAGETWO-43072: Style issues in Web Setup Wizard
- Fixes after merge with mainline
1 parent f8a4c72 commit b5d3927

File tree

12 files changed

+34
-46
lines changed

12 files changed

+34
-46
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@
4040
// ---------------------------------------------
4141

4242
.nav {
43+
.extend__clearer();
4344
background-color: @nav__background-color;
4445
border-bottom: 1px solid @nav__border-color;
4546
border-top: 1px solid @nav__border-color;
46-
.extend__clearer();
4747
display: none;
48+
margin-bottom: @nav-bar__indent-top;
4849
padding: @nav-bar-dot__size @nav__indent-right 0 0;
4950
}
5051

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
margin-left: -(@tooltip-arrow__size / 2);
5555
padding: 0 @tooltip-arrow__size;
5656
}
57+
p:last-child {
58+
margin-bottom: 0;
59+
}
5760
}
5861

5962
// Wrapper for the tooltip content

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@
113113
);
114114
color: @btn-prime__color;
115115
}
116-
&:active,
117-
&:focus {
116+
&:active {
118117
.lib-background-gradient(
119118
@_background-gradient: true,
120119
@_background-gradient-direction: horizontal,

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

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

6+
body:not([class]) {
7+
min-width: 0;
8+
}
69
.container {
710
display: block;
811
margin: 0 auto 4rem;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
// ---------------------------------------------
157157

158158
@container__width: 100rem;
159-
@container__indent: 2rem;
159+
@container__indent: 0;
160160

161161
@content__indent: @indent__l;
162162

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_readiness-check.less

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,20 @@
1010
// Sizes
1111

1212
@readiness-check-side__width: 22rem;
13-
@readiness-check-content__indent: 7.5rem;
13+
@readiness-check-content__indent: 5.7rem;
1414

1515
//
1616
// Common
1717
// ---------------------------------------------
1818

1919
.readiness-check-item {
2020
margin-bottom: 4rem;
21+
min-height: 2.5rem;
22+
.spinner {
23+
font-size: 2.5rem;
24+
float: left;
25+
margin: -.4rem 0 0 1.7rem;
26+
}
2127
}
2228

2329
.readiness-check-title {
@@ -49,7 +55,7 @@
4955

5056
.readiness-check-icon {
5157
float: left;
52-
margin-left: 2rem;
58+
margin-left: 1.7rem;
5359
margin-top: .7rem;
5460
}
5561

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
// Updater pages
9999
@import '../../../updater/styles/less/pages/_common.less';
100100
@import '../../../updater/styles/less/pages/_home.less';
101-
@import '../../../updater/styles/less/pages/_readiness-check.less';
102101
@import '../../../updater/styles/less/pages/_component-manager.less';
103102
@import '../../../updater/styles/less/pages/_login.less';
104103

app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_readiness-check.less

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

setup/pub/styles/setup.css

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

setup/view/magento/setup/home.phtml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@
66
?>
77

88
<section class="home-page-inner-wrap ng-scope">
9-
<p class="upgrade-home-title">
9+
<p class="setup-home-title">
1010
Welcome to the Magento Setup Tool. Please choose a task below.
1111
</p>
1212

1313
<div class="row" style="padding-left: 145px;" >
1414
<div class="col-m-4">
15-
<a href="" class="upgrade-home-item upgrade-home-item-component" ui-sref="root.update">
16-
<span class="upgrade-home-item-title">Component Manager</span>
17-
<span class="upgrade-home-item-description">I want to manage my packages and modules.</span>
15+
<a href="" class="setup-home-item setup-home-item-component" ui-sref="root.update">
16+
<span class="setup-home-item-title">Component Manager</span>
17+
<span class="setup-home-item-description">I want to manage my packages and modules.</span>
1818
</a>
1919
</div>
2020
<div class="col-m-4">
21-
<a href="" class="upgrade-home-item upgrade-home-item-upgrade" ui-sref="root.upgrade">
22-
<span class="upgrade-home-item-title">System Upgrade</span>
23-
<span class="upgrade-home-item-description">I want to upgrade my Magento Admin version.</span>
21+
<a href="" class="setup-home-item setup-home-item-upgrade" ui-sref="root.upgrade">
22+
<span class="setup-home-item-title">System Upgrade</span>
23+
<span class="setup-home-item-description">I want to upgrade my Magento Admin version.</span>
2424
</a>
2525
</div>
2626
<div class="col-m-4">
27-
<a href="" class="upgrade-home-item upgrade-home-item-configuration" ui-sref="root.system-config">
28-
<span class="upgrade-home-item-title">System Configuration</span>
29-
<span class="upgrade-home-item-description">I want to change my Magento system configurations.</span>
27+
<a href="" class="setup-home-item setup-home-item-configuration" ui-sref="root.system-config">
28+
<span class="setup-home-item-title">System Configuration</span>
29+
<span class="setup-home-item-description">I want to change my Magento system configurations.</span>
3030
</a>
3131
</div>
3232
</div>

0 commit comments

Comments
 (0)