Merge "Update default OpenStack branding across Horizon"

doc/source/topics/customizing.rst

@@ -139,7 +139,7 @@ If the static root of the theme folder contains an ``img`` directory,
 then all images that make use of the {% themable_asset %} templatetag
 can be overridden.
 
-These assets include logo.png, splash-logo.png and favicon.ico, however
+These assets include logo.svg, splash-logo.svg and favicon.ico, however
 overriding the SVG/GIF assets used by Heat within the `dashboard/img` folder
 is not currently supported.
 
@@ -151,10 +151,10 @@ Simple
 
 If you wish to customize the logo that is used on the splash screen or in the
 top navigation bar, then you need to create an ``img`` directory under your
-theme's static root directory and place your custom ``logo.png`` or
-``logo-splash.png`` within it.
+theme's static root directory and place your custom ``logo.svg`` or
+``logo-splash.svg`` within it.
 
-If you wish to override the ``logo.png`` using the previous method, and if the
+If you wish to override the ``logo.svg`` using the previous method, and if the
 image used is larger than the height of the top navigation, then the image will be
 constrained to fit within the height of nav.  You can customize the height of
 the top navigation bar by customizing the SCSS variable: ``$navbar-height``.

horizon/templates/auth/_splash.html

@@ -1,5 +1,5 @@
 {% load themes %}
 
 <div class="text-center">
-  <img class="splash-logo" src={% themable_asset "img/logo-splash.png" %}>
+  <img class="splash-logo" src={% themable_asset "img/logo-splash.svg" %}>
 </div>

openstack_dashboard/static/dashboard/scss/components/_login.scss

@@ -6,8 +6,8 @@
   margin-top: $navbar-height*2;
 
   .splash-logo {
-    padding: $padding-large-horizontal $padding-large-vertical;
-    max-width: 100%;
+    margin: $padding-large-horizontal $padding-large-vertical;
+    max-width: 65%;
   }
 
   .help_text {
@@ -29,4 +29,4 @@
   .hz-icon-required {
     display: none;
   }
-}
+}

openstack_dashboard/static/dashboard/scss/components/_navbar.scss

@@ -5,7 +5,7 @@
 
   img {
     display: inline-block;
-    max-height: $navbar-height;
+    max-height: $navbar-height - $padding-small-vertical*2;
     vertical-align: middle;
   }
 }

openstack_dashboard/templates/500.html

@@ -38,7 +38,7 @@
       left: 50%;
       width: 390px;
 
-      background: url("{% static "dashboard/img/logo.png" %}") no-repeat scroll center 35px padding-box rgb(255, 255, 255);
+      background: url("{% static "dashboard/img/logo.svg" %}") no-repeat scroll center 35px padding-box rgb(255, 255, 255);
       border: 1px solid rgb(225, 225, 225);
 
       -webkit-border-radius: 6px;

openstack_dashboard/templates/header/_brand.html

@@ -2,5 +2,5 @@
 {% load themes %}
 
 <a class="navbar-brand" href="{% site_branding_link %}" target="_self">
-  <img class="openstack-logo" src="{% themable_asset 'img/logo.png' %}" alt="{% site_branding %}">
+  <img class="openstack-logo" src="{% themable_asset 'img/logo.svg' %}" alt="{% site_branding %}">
 </a>

releasenotes/notes/bug/1637490-c29444e4eb458087.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - The logos in Horizon (previously logo-splash.png and logo.png) now
+    load SVG files instead of PNG. The default logos have been updated
+    to reflect the new OpenStack branding.