[MERGE] merge from master

7 files changed, 7 insertions, 7 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 0d14b82d5f5..461684faf5f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1041,7 +1041,7 @@
   color: black;
 }
 .openerp .oe_footer a span {
-  color: #c81010;
+  color: #a24689;
 }
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 100406caf85..4baddd7d862 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -880,7 +880,7 @@ $sheet-padding: 16px
             font-weight: bold
             color: black
             span
-                color: #c81010
+                color: #a24689
     // }}}
     // Webclient.leftbar items {{{
 
diff --git a/addons/web/static/src/img/favicon.ico b/addons/web/static/src/img/favicon.ico
index a323cc21c00..4abb40924b7 100644
--- a/addons/web/static/src/img/favicon.ico
+++ b/addons/web/static/src/img/favicon.ico
diff --git a/addons/web/static/src/img/logo.png b/addons/web/static/src/img/logo.png
index 231cc26379f..a0a79df29fb 100644
--- a/addons/web/static/src/img/logo.png
+++ b/addons/web/static/src/img/logo.png
diff --git a/addons/web/static/src/img/logo2.png b/addons/web/static/src/img/logo2.png
index 6b32937328b..1651b0c94a8 100644
--- a/addons/web/static/src/img/logo2.png
+++ b/addons/web/static/src/img/logo2.png
diff --git a/addons/web/static/src/img/nologo.png b/addons/web/static/src/img/nologo.png
index 36ff0e1d16c..be3cd13a94e 100644
--- a/addons/web/static/src/img/nologo.png
+++ b/addons/web/static/src/img/nologo.png
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a8563818b82..f3de92e0a0f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -403,8 +403,8 @@
             </a>
             <ul class="dropdown-menu">
                 <li><a href="#" data-menu="settings">Preferences</a></li>
-                <li><a href="#" data-menu="account">My OpenERP.com account</a></li>
-                <li><a href="#" data-menu="about">About OpenERP</a></li>
+                <li><a href="#" data-menu="account">My Odoo.com account</a></li>
+                <li><a href="#" data-menu="about">About Odoo</a></li>
                 <li><a href="#" data-menu="help">Help</a></li>
                 <li><a href="#" data-menu="logout">Log out</a></li>
             </ul>
@@ -420,9 +420,9 @@
 
       <div class="oe_bottom">
         <p>Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br />
-            OpenERP is a trademark of the <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP SA Company</a>.</p>
+            OpenERP is a trademark of the <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">OpenERP SA Company</a>.</p>
         <p>Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a></p>
-        <p>For more information visit <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP.com</a></p>
+        <p>For more information visit <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">Odoo.com</a></p>
       </div>
     </div>
 
@@ -448,7 +448,7 @@
                     </a>
                     <div class="oe_secondary_menus_container"/>
                     <div class="oe_footer">
-                        Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a>
+                        Powered by <a href="http://www.odoo.com" target="_blank"><span>Odoo</span></a>
                     </div>
                 </div>
             </td>