Skip to content

Commit

Permalink
Merge pull request magento#117 from magento-webdev/develop
Browse files Browse the repository at this point in the history 
[UI] Styles for enabling/disabling modules section in Installation wizard
  • Loading branch information
Momotenko,Natalia(nmomotenko) committed Mar 4, 2015
2 parents 068d068 + c3d76ed commit 51750d9
Show file tree
Hide file tree
Showing 16 changed files with 273 additions and 224 deletions.
3 changes: 3 additions & 0 deletions app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@
display: inline-block;
vertical-align: top;
}
.type {
margin-right: @indent__xs;
}
}
&.overview {
margin: @indent__base 0;
Expand Down
9 changes: 6 additions & 3 deletions app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,15 @@ body {
.navigation ul {
padding: 0 8px;
}

.header {
&.panel {
> .header.links {
float: right;
font-size: 0;
.list-inline();
> li {
font-size: @font-size__base;
margin: 0 0 0 15px;
&.welcome,
a {
Expand All @@ -275,7 +278,7 @@ body {
}
}
&.content {
padding: 30px 20px 0;
padding: @indent__l @indent__base 0;
&:extend(.abs-add-clearfix-desktop all);
}
}
Expand All @@ -287,8 +290,8 @@ body {
border-bottom: 1px solid @secondary__color;
}
.header.panel {
padding-top: 10px;
padding-bottom: 10px;
padding-top: @indent__s;
padding-bottom: @indent__s;
&:extend(.abs-add-clearfix-desktop all);
}
.switcher {
Expand Down
1 change: 1 addition & 0 deletions app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@
&.sku {
.type {
font-weight: normal;
margin-right: @indent__xs;
&:after {
content: '#:';
}
Expand Down
2 changes: 2 additions & 0 deletions app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,11 @@
> .header.links {
.list-inline();
float: right;
font-size: 0;
margin-left: auto;
margin-right: @indent__base;
> li {
font-size: @font-size__base;
margin: 0 0 0 15px;
> a {
.link(
Expand Down
20 changes: 10 additions & 10 deletions dev/tests/unit/testsuite/Magento/Setup/Model/WebLoggerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ public function testConstructorLogFileSpecified()
public function testLogSuccess()
{
$this->webLogger->logSuccess('Success1');
$this->assertEquals('<span class="text-success">[SUCCESS] ' . 'Success1' . '</span><br/>', self::$log);
$this->assertEquals('<span class="text-success">[SUCCESS] ' . 'Success1' . '</span><br>', self::$log);

$this->webLogger->logSuccess('Success2');
$this->assertEquals(
'<span class="text-success">[SUCCESS] ' . 'Success1' . '</span><br/>' .
'<span class="text-success">[SUCCESS] ' . 'Success2' . '</span><br/>',
'<span class="text-success">[SUCCESS] ' . 'Success1' . '</span><br>' .
'<span class="text-success">[SUCCESS] ' . 'Success2' . '</span><br>',
self::$log
);
}
Expand All @@ -105,11 +105,11 @@ public function testLogError()
public function testLog()
{
$this->webLogger->log('Message1');
$this->assertEquals('<span class="text-info">Message1</span><br/>', self::$log);
$this->assertEquals('<span class="text-info">Message1</span><br>', self::$log);

$this->webLogger->log('Message2');
$this->assertEquals(
'<span class="text-info">Message1</span><br/><span class="text-info">Message2</span><br/>',
'<span class="text-info">Message1</span><br><span class="text-info">Message2</span><br>',
self::$log
);
}
Expand All @@ -119,7 +119,7 @@ public function testLogAfterInline()
$this->webLogger->logInline('*');
$this->webLogger->log('Message');
$this->assertEquals(
'<span class="text-info">*</span></br><span class="text-info">Message</span><br/>',
'<span class="text-info">*</span><br><span class="text-info">Message</span><br>',
self::$log
);
}
Expand All @@ -136,10 +136,10 @@ public function testLogInline()
public function testLogMeta()
{
$this->webLogger->logMeta('Meta1');
$this->assertEquals('<span class="hidden">Meta1</span><br/>', self::$log);
$this->assertEquals('<span class="hidden">Meta1</span><br>', self::$log);

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

public function testGet()
Expand All @@ -149,7 +149,7 @@ public function testGet()

$expected = [
'<span class="text-info">Message1',
'</span><br/><span class="text-info">Message2</span><br/>',
'</span><br><span class="text-info">Message2</span><br>',
];

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

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

$this->webLogger->clear();
$this->assertEquals('', self::$log);
Expand Down
2 changes: 1 addition & 1 deletion setup/pub/styles/setup.css
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions setup/src/Magento/Setup/Model/WebLogger.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function __construct(Filesystem $filesystem, $logFile = null)
public function logSuccess($message)
{
$this->terminateLine();
$this->writeToFile('<span class="text-success">[SUCCESS] ' . $message . '</span><br/>');
$this->writeToFile('<span class="text-success">[SUCCESS] ' . $message . '</span><br>');
}

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

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

/**
Expand All @@ -99,7 +99,7 @@ public function logInline($message)
public function logMeta($message)
{
$this->terminateLine();
$this->writeToFile('<span class="hidden">' . $message . '</span><br/>');
$this->writeToFile('<span class="hidden">' . $message . '</span><br>');
}

/**
Expand Down Expand Up @@ -145,7 +145,7 @@ private function terminateLine()
{
if ($this->isInline) {
$this->isInline = false;
$this->writeToFile('</br>');
$this->writeToFile('<br>');
}
}
}
Loading

0 comments on commit 51750d9

Please sign in to comment.