Skip to content

Commit 51750d9

Browse files
author
Momotenko,Natalia(nmomotenko)
committed
Merge pull request #117 from magento-webdev/develop
[UI] Styles for enabling/disabling modules section in Installation wizard
2 parents 068d068 + c3d76ed commit 51750d9

File tree

16 files changed

+273
-224
lines changed

16 files changed

+273
-224
lines changed

‎app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@
186186
display: inline-block;
187187
vertical-align: top;
188188
}
189+
.type {
190+
margin-right: @indent__xs;
191+
}
189192
}
190193
&.overview {
191194
margin: @indent__base 0;

‎app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,15 @@ body {
254254
.navigation ul {
255255
padding: 0 8px;
256256
}
257+
257258
.header {
258259
&.panel {
259260
> .header.links {
260261
float: right;
262+
font-size: 0;
261263
.list-inline();
262264
> li {
265+
font-size: @font-size__base;
263266
margin: 0 0 0 15px;
264267
&.welcome,
265268
a {
@@ -275,7 +278,7 @@ body {
275278
}
276279
}
277280
&.content {
278-
padding: 30px 20px 0;
281+
padding: @indent__l @indent__base 0;
279282
&:extend(.abs-add-clearfix-desktop all);
280283
}
281284
}
@@ -287,8 +290,8 @@ body {
287290
border-bottom: 1px solid @secondary__color;
288291
}
289292
.header.panel {
290-
padding-top: 10px;
291-
padding-bottom: 10px;
293+
padding-top: @indent__s;
294+
padding-bottom: @indent__s;
292295
&:extend(.abs-add-clearfix-desktop all);
293296
}
294297
.switcher {

‎app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@
223223
&.sku {
224224
.type {
225225
font-weight: normal;
226+
margin-right: @indent__xs;
226227
&:after {
227228
content: '#:';
228229
}

‎app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,11 @@
101101
> .header.links {
102102
.list-inline();
103103
float: right;
104+
font-size: 0;
104105
margin-left: auto;
105106
margin-right: @indent__base;
106107
> li {
108+
font-size: @font-size__base;
107109
margin: 0 0 0 15px;
108110
> a {
109111
.link(

‎dev/tests/unit/testsuite/Magento/Setup/Model/WebLoggerTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ public function testConstructorLogFileSpecified()
7979
public function testLogSuccess()
8080
{
8181
$this->webLogger->logSuccess('Success1');
82-
$this->assertEquals('<span class="text-success">[SUCCESS] ' . 'Success1' . '</span><br/>', self::$log);
82+
$this->assertEquals('<span class="text-success">[SUCCESS] ' . 'Success1' . '</span><br>', self::$log);
8383

8484
$this->webLogger->logSuccess('Success2');
8585
$this->assertEquals(
86-
'<span class="text-success">[SUCCESS] ' . 'Success1' . '</span><br/>' .
87-
'<span class="text-success">[SUCCESS] ' . 'Success2' . '</span><br/>',
86+
'<span class="text-success">[SUCCESS] ' . 'Success1' . '</span><br>' .
87+
'<span class="text-success">[SUCCESS] ' . 'Success2' . '</span><br>',
8888
self::$log
8989
);
9090
}
@@ -105,11 +105,11 @@ public function testLogError()
105105
public function testLog()
106106
{
107107
$this->webLogger->log('Message1');
108-
$this->assertEquals('<span class="text-info">Message1</span><br/>', self::$log);
108+
$this->assertEquals('<span class="text-info">Message1</span><br>', self::$log);
109109

110110
$this->webLogger->log('Message2');
111111
$this->assertEquals(
112-
'<span class="text-info">Message1</span><br/><span class="text-info">Message2</span><br/>',
112+
'<span class="text-info">Message1</span><br><span class="text-info">Message2</span><br>',
113113
self::$log
114114
);
115115
}
@@ -119,7 +119,7 @@ public function testLogAfterInline()
119119
$this->webLogger->logInline('*');
120120
$this->webLogger->log('Message');
121121
$this->assertEquals(
122-
'<span class="text-info">*</span></br><span class="text-info">Message</span><br/>',
122+
'<span class="text-info">*</span><br><span class="text-info">Message</span><br>',
123123
self::$log
124124
);
125125
}
@@ -136,10 +136,10 @@ public function testLogInline()
136136
public function testLogMeta()
137137
{
138138
$this->webLogger->logMeta('Meta1');
139-
$this->assertEquals('<span class="hidden">Meta1</span><br/>', self::$log);
139+
$this->assertEquals('<span class="hidden">Meta1</span><br>', self::$log);
140140

141141
$this->webLogger->logMeta('Meta2');
142-
$this->assertEquals('<span class="hidden">Meta1</span><br/><span class="hidden">Meta2</span><br/>', self::$log);
142+
$this->assertEquals('<span class="hidden">Meta1</span><br><span class="hidden">Meta2</span><br>', self::$log);
143143
}
144144

145145
public function testGet()
@@ -149,7 +149,7 @@ public function testGet()
149149

150150
$expected = [
151151
'<span class="text-info">Message1',
152-
'</span><br/><span class="text-info">Message2</span><br/>',
152+
'</span><br><span class="text-info">Message2</span><br>',
153153
];
154154

155155
$this->assertEquals($expected, $this->webLogger->get());
@@ -163,7 +163,7 @@ public function testClear()
163163
->will($this->returnCallback(['Magento\Setup\Model\WebLoggerTest', 'deleteLog']));
164164

165165
$this->webLogger->log('Message1');
166-
$this->assertEquals('<span class="text-info">Message1</span><br/>', self::$log);
166+
$this->assertEquals('<span class="text-info">Message1</span><br>', self::$log);
167167

168168
$this->webLogger->clear();
169169
$this->assertEquals('', self::$log);

‎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/src/Magento/Setup/Model/WebLogger.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function __construct(Filesystem $filesystem, $logFile = null)
6363
public function logSuccess($message)
6464
{
6565
$this->terminateLine();
66-
$this->writeToFile('<span class="text-success">[SUCCESS] ' . $message . '</span><br/>');
66+
$this->writeToFile('<span class="text-success">[SUCCESS] ' . $message . '</span><br>');
6767
}
6868

6969
/**
@@ -72,7 +72,7 @@ public function logSuccess($message)
7272
public function logError(\Exception $e)
7373
{
7474
$this->terminateLine();
75-
$this->writeToFile('<span class="text-danger">[ERROR] ' . $e . '<span><br/>');
75+
$this->writeToFile('<span class="text-danger">[ERROR] ' . $e . '<span><br>');
7676
}
7777

7878
/**
@@ -81,7 +81,7 @@ public function logError(\Exception $e)
8181
public function log($message)
8282
{
8383
$this->terminateLine();
84-
$this->writeToFile('<span class="text-info">' . $message . '</span><br/>');
84+
$this->writeToFile('<span class="text-info">' . $message . '</span><br>');
8585
}
8686

8787
/**
@@ -99,7 +99,7 @@ public function logInline($message)
9999
public function logMeta($message)
100100
{
101101
$this->terminateLine();
102-
$this->writeToFile('<span class="hidden">' . $message . '</span><br/>');
102+
$this->writeToFile('<span class="hidden">' . $message . '</span><br>');
103103
}
104104

105105
/**
@@ -145,7 +145,7 @@ private function terminateLine()
145145
{
146146
if ($this->isInline) {
147147
$this->isInline = false;
148-
$this->writeToFile('</br>');
148+
$this->writeToFile('<br>');
149149
}
150150
}
151151
}

0 commit comments

Comments
 (0)