feat: update branding

* Update Admin Branding * Update Copyright Notice + Remove Magento icon * Update Privacy Policy and Bug Report Links * Update Fallback Logo URL to Mage-OS Logo
mage-os · Oct 7, 2023 · 4310d62 · 4310d62
1 parent db9ec29
commit 4310d62
Show file tree

Hide file tree

Showing 31 changed files with 208 additions and 98 deletions.
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
@@ -240,7 +240,10 @@ password,password
 "Reload Data","Reload Data"
 "Browse Files...","Browse Files..."
 Magento,Magento
+"Mage-OS","Mage-OS"
 "Copyright &copy; %1 Magento Commerce Inc. All rights reserved.","Copyright &copy; %1 Magento Commerce Inc. All rights reserved."
+"Thank you for choosing Mage-OS.","Thank you for choosing Mage-OS."
+"Learn more about Mage-OS.","Learn more about Mage-OS."
 "ver. %1","ver. %1"
 "Magento Admin Panel","Magento Admin Panel"
 "Account Setting","Account Setting"

diff --git a/app/code/Magento/Backend/view/adminhtml/layout/admin_login.xml b/app/code/Magento/Backend/view/adminhtml/layout/admin_login.xml
@@ -24,7 +24,7 @@
         <move element="logo" destination="login.header" before="-"/>
         <referenceBlock name="logo">
             <arguments>
-                <argument name="logo_image_src" xsi:type="string">images/magento-logo.svg</argument>
+                <argument name="logo_image_src" xsi:type="string">images/mage-os-logo.svg</argument>
             </arguments>
         </referenceBlock>
 

diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -26,7 +26,7 @@
                 <arguments>
                     <argument name="show_part" xsi:type="string">logo</argument>
                     <argument name="edition" translate="true" xsi:type="string">Community Edition</argument>
-                    <argument name="logo_image_src" xsi:type="string">images/magento-icon.svg</argument>
+                    <argument name="logo_image_src" xsi:type="string">images/mage-os-icon.svg</argument>
                 </arguments>
             </block>
             <block class="Magento\Backend\Block\GlobalSearch" name="global.search" as="search" after="logo" aclResource="Magento_Backend::global_search"/>
@@ -63,12 +63,12 @@
                     <block class="Magento\Backend\Block\Page\Footer" name="version" as="version" />
                     <block class="Magento\Framework\View\Element\Template" name="privacyPolicy" as="privacyPolicy" template="Magento_Backend::page/privacyPolicy.phtml">
                         <arguments>
-                            <argument name="privacypolicy_url" xsi:type="string">https://www.adobe.com/privacy/policy.html</argument>
+                            <argument name="privacypolicy_url" xsi:type="string">https://mage-os.org/privacy-policy</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Framework\View\Element\Template" name="report" as="report" template="Magento_Backend::page/report.phtml">
                         <arguments>
-                            <argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
+                            <argument name="bugreport_url" xsi:type="string">https://github.com/mage-os/mageos-magento2/issues</argument>
                         </arguments>
                     </block>
                 </container>

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
@@ -3,6 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Backend\Block\Page\Copyright;
+use Magento\Framework\Escaper;
+
+/** @var Escaper $escaper */
+/** @var Copyright $block */
 ?>
-<a class="link-copyright" href="http://magento.com" target="_blank" title="<?= $block->escapeHtmlAttr(__('Magento')) ?>"></a>
-<?= $block->escapeHtml(__('Copyright &copy; %1 Magento Commerce Inc. All rights reserved.', date('Y'))) ?>
+<?= $escaper->escapeHtml(__('Thank you for choosing Mage-OS.')); ?>
+<a class="link-copyright"
+   href="https://mage-os.org/"
+   target="_blank"
+   title="<?= $escaper->escapeHtmlAttr(__('Mage-OS')); ?>">
+    <?= $escaper->escapeHtml(__('Learn more about Mage-OS.')); ?>
+</a>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml
@@ -3,8 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Backend\Block\Page\Footer;
+use Magento\Framework\Escaper;
+
+/** @var Escaper $escaper */
+/** @var Footer $block */
 ?>
 <p class="magento-version">
-    <strong><?= $block->escapeHtml(__('Magento')) ?></strong>
-    <?= $block->escapeHtml(__('ver. %1', $block->getMagentoVersion())) ?>
+    <strong><?= $escaper->escapeHtml(__('Mage-OS')); ?></strong>
+    <?= $escaper->escapeHtml(__('ver. %1', $block->getMagentoVersion())); ?>
 </p>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -3,62 +3,74 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/** @var $block \Magento\Backend\Block\Page\Header */
+use Magento\Backend\Block\Page\Header;
+use Magento\Framework\Escaper;
+
+/** @var Escaper $escaper */
+/** @var Header $block */
 $part = $block->getShowPart();
 ?>
-<?php if ($part === 'logo') : ?>
-        <?php $edition = $block->hasEdition() ? 'data-edition="' . $block->escapeHtml($block->getEdition()) . '"' : ''; ?>
-        <?php $logoSrc = ($block->hasLogoImageSrc()) ? $block->escapeHtml($block->getLogoImageSrc()) : 'images/magento-logo.svg' ?>
-        <a
-            href="<?= $block->escapeUrl($block->getHomeLink()) ?>"
-            <?= /* @noEscape */ $edition ?>
-            class="logo">
-            <img class="logo-img" src="<?= /* @noEscape */ $block->getViewFileUrl($logoSrc) ?>"
-            alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>" title="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
-        </a>
-<?php elseif ($part === 'user') : ?>
-        <div class="admin-user admin__action-dropdown-wrap">
-            <a
-                href="<?= /* @noEscape */ $block->getUrl('adminhtml/system_account/index') ?>"
-                class="admin__action-dropdown"
-                title="<?= $block->escapeHtml(__('My Account')) ?>"
-                data-mage-init='{"dropdown":{}}'
-                data-toggle="dropdown">
-                <span class="admin__action-dropdown-text">
-                    <span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>
+<?php if ($part === 'logo'): ?>
+    <?php $edition = $block->hasEdition()
+        ? 'data-edition="' . $escaper->escapeHtml($block->getEdition()) . '"'
+        : ''; ?>
+    <?php $logoSrc = $block->hasLogoImageSrc()
+        ? $escaper->escapeHtml($block->getLogoImageSrc())
+        : 'images/mage-os-logo.svg'; ?>
+    <a href="<?= $escaper->escapeUrl($block->getHomeLink()); ?>"
+       <?= /* @noEscape */ $edition; ?>
+       class="logo">
+        <img class="logo-img"
+             src="<?= $escaper->escapeUrl($block->getViewFileUrl($logoSrc)); ?>"
+             alt="<?= $escaper->escapeHtml(__('Magento Admin Panel')); ?>"
+             title="<?= $escaper->escapeHtml(__('Magento Admin Panel')); ?>"/>
+    </a>
+<?php elseif ($part === 'user'): ?>
+    <div class="admin-user admin__action-dropdown-wrap">
+        <a href="<?= $escaper->escapeUrl($block->getUrl('adminhtml/system_account/index')); ?>"
+           class="admin__action-dropdown"
+           title="<?= $escaper->escapeHtmlAttr(__('My Account')); ?>"
+           data-mage-init='{"dropdown":{}}'
+           data-toggle="dropdown">
+            <span class="admin__action-dropdown-text">
+                <span class="admin-user-account-text">
+                    <?= $escaper->escapeHtml($block->getUser()->getUserName()); ?>
                 </span>
-            </a>
-            <ul class="admin__action-dropdown-menu">
-                <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')) : ?>
-                <li>
-                    <a
-                        href="<?= /* @noEscape */ $block->getUrl('adminhtml/system_account/index') ?>"
-                        <?= /* @noEscape */ $block->getUiId('user', 'account', 'settings') ?>
-                        title="<?= $block->escapeHtml(__('Account Setting')) ?>">
-                        <?= $block->escapeHtml(__('Account Setting')) ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>)
-                    </a>
-                </li>
-                <?php endif; ?>
-                <li>
-                    <a
-                        href="<?= /* @noEscape */ $block->getBaseUrl() ?>"
-                        title="<?= $block->escapeHtml(__('Customer View')) ?>"
-                        target="_blank" class="store-front">
-                        <?= $block->escapeHtml(__('Customer View')) ?>
-                    </a>
-                </li>
+            </span>
+        </a>
+        <ul class="admin__action-dropdown-menu">
+            <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')): ?>
                 <li>
-                    <a
-                        href="<?= /* @noEscape */ $block->getLogoutLink() ?>"
-                        class="account-signout"
-                        title="<?= $block->escapeHtml(__('Sign Out')) ?>">
-                        <?= $block->escapeHtml(__('Sign Out')) ?>
+                    <a href="<?= $escaper->escapeUrl($block->getUrl('adminhtml/system_account/index')); ?>"
+                       <?= /* @noEscape */ $block->getUiId('user', 'account', 'settings'); ?>
+                       title="<?= $escaper->escapeHtml(__('Account Setting')); ?>">
+                        <?= $escaper->escapeHtml(__('Account Setting')); ?>
+                        (<span class="admin-user-name">
+                            <?= $escaper->escapeHtml($block->getUser()->getUserName()); ?>
+                        </span>)
                     </a>
                 </li>
-            </ul>
-        </div>
+            <?php endif; ?>
 
-<?php elseif ($part === 'other') : ?>
-    <?= $block->getChildHtml() ?>
+            <li>
+                <a href="<?= $escaper->escapeUrl($block->getBaseUrl()); ?>"
+                   title="<?= $escaper->escapeHtml(__('Customer View')); ?>"
+                   target="_blank"
+                   class="store-front">
+                    <?= $escaper->escapeHtml(__('Customer View')); ?>
+                </a>
+            </li>
+            <li>
+                <a href="<?= $escaper->escapeUrl($block->getLogoutLink()); ?>"
+                   class="account-signout"
+                   title="<?= $escaper->escapeHtml(__('Sign Out')); ?>">
+                    <?= $escaper->escapeHtml(__('Sign Out')); ?>
+                </a>
+            </li>
+        </ul>
+    </div>
+<?php elseif ($part === 'other'): ?>
+    <?= $block->getChildHtml(); ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Email/view/frontend/web/logo_email.png b/app/code/Magento/Email/view/frontend/web/logo_email.png
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/templates/html/notices.phtml b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/templates/html/notices.phtml
@@ -8,7 +8,7 @@
  * @var \Magento\Framework\View\Element\Template $block
  * @var \Magento\Framework\Escaper $escaper
  */
-$viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/magento-icon.svg');
+$viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/mage-os-icon.svg');
 ?>
 <?php if ($block->getConfig()->isEnabled()): ?>
     <div class="lac-notification-sticky"
@@ -17,7 +17,9 @@ $viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images
         <div class="lac-notification clearfix" data-bind="visible: isVisible" style="display: none">
             <div class="top-container">
                 <div class="lac-notification-icon wrapper">
-                    <img class="logo-img"  src="<?= $escaper->escapeUrl($viewFileUrl) ?>" alt="Magento" />
+                    <img class="logo-img"
+                         src="<?= $escaper->escapeUrl($viewFileUrl) ?>"
+                         alt="<?= $escaper->escapeHtmlAttr(__('Mage-OS')); ?>"/>
                 </div>
                 <div class="lac-notification-text wrapper">
                     <span data-bind="html: notificationText"></span>

diff --git a/...ode/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/mage-os-icon.svg b/...ode/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/mage-os-icon.svg
diff --git a/...ode/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/magento-icon.svg b/...ode/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/magento-icon.svg
diff --git a/app/code/Magento/Theme/view/adminhtml/web/favicon.ico b/app/code/Magento/Theme/view/adminhtml/web/favicon.ico
diff --git a/app/code/Magento/Theme/view/frontend/web/favicon.ico b/app/code/Magento/Theme/view/frontend/web/favicon.ico
diff --git a/app/code/Magento/Theme/view/install/web/favicon.ico b/app/code/Magento/Theme/view/install/web/favicon.ico
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less
@@ -28,6 +28,7 @@
     padding: 2.6rem 3rem 6rem;
 
     a {
+        /* phpcs:disable */
         .lib-link(
             @_link-color: @footer-link__color,
             @_link-text-decoration: @footer-link__text-decoration,
@@ -40,6 +41,8 @@
         );
     }
 
+    /* phpcs:enable */
+
     .admin__control-select {
         max-width: 52rem;
         width: 100%;
@@ -56,6 +59,8 @@
 
 //  Copyright
 .copyright {
+    display: flex;
+    flex-direction: column;
     margin-bottom: -.2rem;
     position: relative;
     text-align: left;
@@ -67,26 +72,7 @@
         vertical-align: top;
 
         &:hover {
-            &:before {
-                color: lighten(@color-light-phoenix, 10%);
-            }
-        }
-
-        &:before {
-            &:extend(.abs-icon all);
-            .transition(color);
-            color: @primary__color;
-            content: @icon-logo__content;
-            display: block;
-            font-size: 2.5rem;
-            position: relative;
-            top: -.2rem;
-        }
-
-        &:active {
-            &:before {
-                .scale();
-            }
+            color: lighten(@color-light-phoenix, 10%);
         }
     }
 }

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -19,7 +19,7 @@
 @menu-logo__outer-size: @menu-logo__padding-top + @menu-logo-img__height + @menu-logo__padding-bottom;
 @menu-logo__padding-top: 1.7rem;
 @menu-logo-img__height: 4.1rem;
-@menu-logo-img__width: 3.5rem;
+@menu-logo-img__width: 6.5rem;
 
 @menu-item__color: @color-gray65-lighten;
 @menu-item__font-size: 1rem;

diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less
@@ -98,7 +98,6 @@
 @icon-upgrade__content: '\e614';
 @icon-notification-02__content: '\e607';
 @icon-product__content: '\e608';
-@icon-logo__content: '\e606';
 @icon-account__content: '\e600';
 @icon-arrowdown__content: '\e601';
 @icon-cms__content: '\e602';

diff --git a/app/design/adminhtml/Magento/backend/web/images/mage-os-icon.svg b/app/design/adminhtml/Magento/backend/web/images/mage-os-icon.svg
diff --git a/app/design/adminhtml/Magento/backend/web/images/magento-icon.svg b/app/design/adminhtml/Magento/backend/web/images/magento-icon.svg