Skip to content

Commit

Permalink
Replaced a lot of Magento logos with OpenMage ones (#1599)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
fballiano and fballiano authored May 18, 2022
1 parent 0d7b9ca commit 3ba2ead
Show file tree
Hide file tree
Showing 35 changed files with 191 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
"Order Comment","Order Comment"
"Edit Role","Edit Role"
"Tax Rates Import / Export","Tax Rates Import / Export"
"Magento Logo","Magento Logo"
"OpenMage Logo","OpenMage Logo"
"A name is required","A name is required"
"Assigned options","Assigned options"
"Please Enter New Group Name","Please Enter New Group Name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/** @var $this Mage_Adminhtml_Block_Page_Header */
?>
<div class="header-top">
<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>
<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>
<div class="header-right">
<p class="super">
<?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>
Expand Down
2 changes: 1 addition & 1 deletion app/design/install/default/default/template/page.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<div class="header-top-container">
<div class="header-top">
<h1 id="logo">
<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>
<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>
</h1>

<?php echo $this->getChildHtml('topSearch') ?>
Expand Down
Binary file modified errors/default/images/favicon.ico
Binary file not shown.
Binary file removed errors/default/images/logo.gif
Binary file not shown.
45 changes: 45 additions & 0 deletions errors/default/images/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion errors/default/page.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<div class="page">
<div class="header-container">
<div class="header">
<a href="<?php echo $this->getBaseUrl()?>" title="Magento Commerce" class="logo"><img src="images/logo.gif" alt="Magento Commerce" /></a>
<a href="<?php echo $this->getBaseUrl()?>" title="OpenMage" class="logo"><img src="images/logo.svg" alt="OpenMage" height="35" /></a>
</div>
</div>
<div class="main-container">
Expand Down
Binary file modified favicon.ico
Binary file not shown.
5 changes: 3 additions & 2 deletions skin/adminhtml/default/default/boxes.css
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ div.main-col-inner { float:left; /* Fixes some inner clears in the liquid main-c
/* HEADER & FOOTER
*******************************************************************************/

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

/* Header right */
Expand Down Expand Up @@ -743,7 +743,8 @@ div.autocomplete ul li { padding:.5em .7em; min-height:32px; cursor:pointer; tex
/* LOGIN
*******************************************************************************/
#page-login { background:#f8f8f8; text-align:center; }
.login-container { width:581px; margin:170px auto; padding-left:32px; background:url(images/login_logo.png) no-repeat; }
.login-container { position: relative; width:581px; margin:170px auto; padding-left:32px; }
.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); }
.login-form { padding:27px 57px 35px 57px; background:url(images/login_box_bg.jpg) no-repeat; text-align:left; }
.login-form .input-left { float:left; }
.login-form .input-right { float:right; }
Expand Down
Binary file modified skin/adminhtml/default/default/favicon.ico
Binary file not shown.
Binary file removed skin/adminhtml/default/default/images/login_logo.png
Binary file not shown.
Binary file modified skin/adminhtml/default/default/images/logo-large.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed skin/adminhtml/default/default/images/logo.png
Binary file not shown.
45 changes: 45 additions & 0 deletions skin/adminhtml/default/default/images/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified skin/adminhtml/default/default/images/logo_email.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 45 additions & 0 deletions skin/adminhtml/default/default/images/logo_gray.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified skin/adminhtml/default/default/images/logo_print.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified skin/adminhtml/default/openmage/favicon.ico
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions skin/adminhtml/default/openmage/images/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions skin/adminhtml/default/openmage/login.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions skin/adminhtml/default/openmage/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ $font_3: Arial;
$font_4: sans-serif;

//urls
$url_0: url(images/logo-openmage.png);
$url_0: url(images/logo.svg);
$url_1: url(images/information-variant.svg);
$url_2: url(images/icon-error.png);
$url_3: url(images/icon-success.png);
$url_4: url(images/logo-magento.png);
$url_3: url(images/icon-success.png);
2 changes: 0 additions & 2 deletions skin/adminhtml/default/openmage/scss/login.scss
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,6 @@ input {

.legal {
margin: 0;
background: $url_4 no-repeat;
padding: 8px 8px 5px 8px;
font-size: .95em;
background: none;
padding: 0;
Expand Down
Binary file modified skin/frontend/base/default/favicon.ico
Binary file not shown.
Binary file modified skin/frontend/default/blank/favicon.ico
Binary file not shown.
Binary file modified skin/frontend/default/blue/favicon.ico
Binary file not shown.
Binary file modified skin/frontend/default/default/favicon.ico
Binary file not shown.
Binary file modified skin/frontend/default/iphone/favicon.ico
Binary file not shown.
Binary file modified skin/frontend/default/modern/favicon.ico
Binary file not shown.
Binary file modified skin/frontend/rwd/default/images/logo.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified skin/frontend/rwd/default/images/logo_email.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified skin/frontend/rwd/default/images/logo_print.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified skin/install/default/default/favicon.ico
Binary file not shown.
Binary file removed skin/install/default/default/images/logo.png
Binary file not shown.
Loading

0 comments on commit 3ba2ead

Please sign in to comment.