diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/mage-os-icon.svg b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/mage-os-icon.svg
new file mode 100644
index 000000000000..9921e44b9828
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/mage-os-icon.svg
@@ -0,0 +1,6 @@
+
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/magento-icon.svg b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/magento-icon.svg
deleted file mode 100644
index 47e64067795e..000000000000
--- a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/magento-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/code/Magento/Theme/view/adminhtml/web/favicon.ico b/app/code/Magento/Theme/view/adminhtml/web/favicon.ico
index d467f2bcbaed..cf0e2921e5cd 100644
Binary files a/app/code/Magento/Theme/view/adminhtml/web/favicon.ico and b/app/code/Magento/Theme/view/adminhtml/web/favicon.ico differ
diff --git a/app/code/Magento/Theme/view/frontend/web/favicon.ico b/app/code/Magento/Theme/view/frontend/web/favicon.ico
index d467f2bcbaed..cf0e2921e5cd 100644
Binary files a/app/code/Magento/Theme/view/frontend/web/favicon.ico and b/app/code/Magento/Theme/view/frontend/web/favicon.ico differ
diff --git a/app/code/Magento/Theme/view/install/web/favicon.ico b/app/code/Magento/Theme/view/install/web/favicon.ico
index d467f2bcbaed..cf0e2921e5cd 100644
Binary files a/app/code/Magento/Theme/view/install/web/favicon.ico and b/app/code/Magento/Theme/view/install/web/favicon.ico differ
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
index 0244775fad0b..3d27d79dc14b 100644
--- 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
index 7486fa76078e..501c614f9148 100644
--- 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
index be1378638180..493cc5238ac1 100644
--- 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
new file mode 100644
index 000000000000..9921e44b9828
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/web/images/mage-os-icon.svg
@@ -0,0 +1,6 @@
+
diff --git a/app/design/adminhtml/Magento/backend/web/images/magento-icon.svg b/app/design/adminhtml/Magento/backend/web/images/magento-icon.svg
deleted file mode 100644
index 2ade240eac73..000000000000
--- a/app/design/adminhtml/Magento/backend/web/images/magento-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/app/design/frontend/Magento/blank/web/images/logo.svg b/app/design/frontend/Magento/blank/web/images/logo.svg
index 0f29d4e3eef2..e941d36d123c 100644
--- a/app/design/frontend/Magento/blank/web/images/logo.svg
+++ b/app/design/frontend/Magento/blank/web/images/logo.svg
@@ -1 +1,19 @@
-
+
diff --git a/lib/web/images/logo.svg b/lib/web/images/logo.svg
index 0f29d4e3eef2..e941d36d123c 100644
--- a/lib/web/images/logo.svg
+++ b/lib/web/images/logo.svg
@@ -1 +1,19 @@
-
+
diff --git a/lib/web/images/mage-os-logo.svg b/lib/web/images/mage-os-logo.svg
new file mode 100644
index 000000000000..e941d36d123c
--- /dev/null
+++ b/lib/web/images/mage-os-logo.svg
@@ -0,0 +1,19 @@
+
diff --git a/lib/web/images/magento-logo.svg b/lib/web/images/magento-logo.svg
deleted file mode 100644
index 0f29d4e3eef2..000000000000
--- a/lib/web/images/magento-logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/pub/errors/default/images/favicon.ico b/pub/errors/default/images/favicon.ico
index 1cb7c7713718..cf0e2921e5cd 100644
Binary files a/pub/errors/default/images/favicon.ico and b/pub/errors/default/images/favicon.ico differ
diff --git a/pub/errors/default/images/logo.gif b/pub/errors/default/images/logo.gif
index 7ba2e6dd0995..07d7d5e120b4 100644
Binary files a/pub/errors/default/images/logo.gif and b/pub/errors/default/images/logo.gif differ
diff --git a/setup/pub/images/favicon/favicon-16x16.png b/setup/pub/images/favicon/favicon-16x16.png
index 0a6bffc73b13..10e30ac4d68d 100644
Binary files a/setup/pub/images/favicon/favicon-16x16.png and b/setup/pub/images/favicon/favicon-16x16.png differ
diff --git a/setup/pub/images/favicon/favicon-32x32.png b/setup/pub/images/favicon/favicon-32x32.png
index a72d9d7d3421..678079a4f5eb 100644
Binary files a/setup/pub/images/favicon/favicon-32x32.png and b/setup/pub/images/favicon/favicon-32x32.png differ
diff --git a/setup/pub/images/favicon/favicon-96x96.png b/setup/pub/images/favicon/favicon-96x96.png
index 6e1428d10a0f..2c3458da986b 100644
Binary files a/setup/pub/images/favicon/favicon-96x96.png and b/setup/pub/images/favicon/favicon-96x96.png differ
diff --git a/setup/pub/images/favicon/favicon.ico b/setup/pub/images/favicon/favicon.ico
index 5901a2120ca0..cf0e2921e5cd 100644
Binary files a/setup/pub/images/favicon/favicon.ico and b/setup/pub/images/favicon/favicon.ico differ
diff --git a/setup/pub/images/mage-os-logo.svg b/setup/pub/images/mage-os-logo.svg
new file mode 100644
index 000000000000..e941d36d123c
--- /dev/null
+++ b/setup/pub/images/mage-os-logo.svg
@@ -0,0 +1,19 @@
+
diff --git a/setup/pub/images/magento-logo.svg b/setup/pub/images/magento-logo.svg
deleted file mode 100644
index e4f627809b62..000000000000
--- a/setup/pub/images/magento-logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/setup/view/magento/setup/index.phtml b/setup/view/magento/setup/index.phtml
index 9c8b147b2c21..6a938ff84e66 100644
--- a/setup/view/magento/setup/index.phtml
+++ b/setup/view/magento/setup/index.phtml
@@ -10,28 +10,31 @@
-
Magento
-
-
+
Mage-OS
+
+