Skip to content

Commit 3ba2ead

Browse files
authored
Replaced a lot of Magento logos with OpenMage ones (#1599)
* Removed unused scss variables, removed unused (and actually wrong) logo image), removed unused CSS directives * Replacing all magento logo (and names) with OpenMage, also replacing old OpenMage logos with the new ones * replaced old openmage logo with svg one * replaced all favicon with the new openmage one * removed unused template (it has magento and varien data, it has to go) * default admin theme now has svg logo to the login page * reverted mistaken commit about openmage admin theme logo * OpenMage logos (instead of magento ones) for RWD theme * replaced error logo with svg * removed unused attributes * added quotes Co-authored-by: Fabrizio Balliano <[email protected]>
1 parent 0d7b9ca commit 3ba2ead

File tree

35 files changed

+191
-15
lines changed

35 files changed

+191
-15
lines changed

app/design/adminhtml/default/default/locale/en_US/translate.csv

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
"Order Comment","Order Comment"
171171
"Edit Role","Edit Role"
172172
"Tax Rates Import / Export","Tax Rates Import / Export"
173-
"Magento Logo","Magento Logo"
173+
"OpenMage Logo","OpenMage Logo"
174174
"A name is required","A name is required"
175175
"Assigned options","Assigned options"
176176
"Please Enter New Group Name","Please Enter New Group Name"

app/design/adminhtml/default/default/template/page/header.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/** @var $this Mage_Adminhtml_Block_Page_Header */
2828
?>
2929
<div class="header-top">
30-
<a href="<?php echo $this->getHomeLink() ?>"><img src="<?php echo $this->getSkinUrl('images/logo.png') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Magento Logo')) ?>" class="logo"/></a>
30+
<a href="<?php echo $this->getHomeLink() ?>"><img src="<?php echo $this->getSkinUrl('images/logo.svg') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('OpenMage Logo')) ?>" class="logo"/></a>
3131
<div class="header-right">
3232
<p class="super">
3333
<?php echo $this->__("Logged in as %s", $this->escapeHtml($this->getUser()->getUsername())) ?><span class="separator">|</span><a href="<?php echo $this->getLogoutLink() ?>" class="link-logout"><?php echo $this->__('Log Out') ?></a>

app/design/install/default/default/template/page.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<div class="header-top-container">
6161
<div class="header-top">
6262
<h1 id="logo">
63-
<a href="<?php echo $this->getUrl('') ?>"><img src="<?php echo $this->getSkinUrl('images/logo.png') ?>" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('install')->__('OpenMage')) ?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('install')->__('OpenMage')) ?>" /></a>
63+
<a href="<?php echo $this->getUrl('') ?>"><img src="<?php echo $this->getSkinUrl('images/logo.svg') ?>" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('install')->__('OpenMage')) ?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('install')->__('OpenMage')) ?>" /></a>
6464
</h1>
6565

6666
<?php echo $this->getChildHtml('topSearch') ?>

errors/default/images/favicon.ico

-443 Bytes
Binary file not shown.

errors/default/images/logo.gif

-3.88 KB
Binary file not shown.

errors/default/images/logo.svg

+45
Loading

errors/default/page.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<div class="page">
4343
<div class="header-container">
4444
<div class="header">
45-
<a href="<?php echo $this->getBaseUrl()?>" title="Magento Commerce" class="logo"><img src="images/logo.gif" alt="Magento Commerce" /></a>
45+
<a href="<?php echo $this->getBaseUrl()?>" title="OpenMage" class="logo"><img src="images/logo.svg" alt="OpenMage" height="35" /></a>
4646
</div>
4747
</div>
4848
<div class="main-container">

favicon.ico

-2.03 KB
Binary file not shown.

skin/adminhtml/default/default/boxes.css

+3-2
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ div.main-col-inner { float:left; /* Fixes some inner clears in the liquid main-c
590590
/* HEADER & FOOTER
591591
*******************************************************************************/
592592

593-
.logo { float:left; margin:5px 20px 5px 27px; height:43px; }
593+
.logo { float:left; margin:7px 20px 5px 32px; height:30px; }
594594
.header-top { border-bottom:1px solid #5F767F; }
595595

596596
/* Header right */
@@ -743,7 +743,8 @@ div.autocomplete ul li { padding:.5em .7em; min-height:32px; cursor:pointer; tex
743743
/* LOGIN
744744
*******************************************************************************/
745745
#page-login { background:#f8f8f8; text-align:center; }
746-
.login-container { width:581px; margin:170px auto; padding-left:32px; background:url(images/login_logo.png) no-repeat; }
746+
.login-container { position: relative; width:581px; margin:170px auto; padding-left:32px; }
747+
.login-container::before { content: "";position: absolute;width: 150px;height: 35px;top: 60px;left: -55px;background: url(images/logo_gray.svg) 0 0 no-repeat;background-size: contain;transform: rotate(-90deg); }
747748
.login-form { padding:27px 57px 35px 57px; background:url(images/login_box_bg.jpg) no-repeat; text-align:left; }
748749
.login-form .input-left { float:left; }
749750
.login-form .input-right { float:right; }
-2.03 KB
Binary file not shown.
Binary file not shown.
Loading
-13.2 KB
Binary file not shown.
Loading
Loading
Loading
Loading
-14 KB
Binary file not shown.
Binary file not shown.

skin/adminhtml/default/openmage/images/logo.svg

+2-2
Loading

skin/adminhtml/default/openmage/login.css

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

skin/adminhtml/default/openmage/scss/_variables.scss

+2-3
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ $font_3: Arial;
7373
$font_4: sans-serif;
7474

7575
//urls
76-
$url_0: url(images/logo-openmage.png);
76+
$url_0: url(images/logo.svg);
7777
$url_1: url(images/information-variant.svg);
7878
$url_2: url(images/icon-error.png);
79-
$url_3: url(images/icon-success.png);
80-
$url_4: url(images/logo-magento.png);
79+
$url_3: url(images/icon-success.png);

skin/adminhtml/default/openmage/scss/login.scss

-2
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,6 @@ input {
206206

207207
.legal {
208208
margin: 0;
209-
background: $url_4 no-repeat;
210-
padding: 8px 8px 5px 8px;
211209
font-size: .95em;
212210
background: none;
213211
padding: 0;
-2.03 KB
Binary file not shown.
-443 Bytes
Binary file not shown.
-443 Bytes
Binary file not shown.
-2.03 KB
Binary file not shown.
-443 Bytes
Binary file not shown.
-443 Bytes
Binary file not shown.
-1.91 KB
Loading
-4.25 KB
Loading
-1.97 KB
Loading
-2.03 KB
Binary file not shown.
-8.55 KB
Binary file not shown.

0 commit comments

Comments
 (0)