diff --git a/doc/source/topics/customizing.rst b/doc/source/topics/customizing.rst index 9115b0e7ed..ca2a09e71c 100644 --- a/doc/source/topics/customizing.rst +++ b/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``. diff --git a/horizon/templates/auth/_splash.html b/horizon/templates/auth/_splash.html index b89aa33c7c..8ccdc272cf 100644 --- a/horizon/templates/auth/_splash.html +++ b/horizon/templates/auth/_splash.html @@ -1,5 +1,5 @@ {% load themes %}
- +
diff --git a/openstack_dashboard/static/dashboard/img/favicon.ico b/openstack_dashboard/static/dashboard/img/favicon.ico index f3b9bf9c44..6257c06e98 100644 Binary files a/openstack_dashboard/static/dashboard/img/favicon.ico and b/openstack_dashboard/static/dashboard/img/favicon.ico differ diff --git a/openstack_dashboard/static/dashboard/img/logo-splash.png b/openstack_dashboard/static/dashboard/img/logo-splash.png deleted file mode 100644 index d83e9c6644..0000000000 Binary files a/openstack_dashboard/static/dashboard/img/logo-splash.png and /dev/null differ diff --git a/openstack_dashboard/static/dashboard/img/logo-splash.svg b/openstack_dashboard/static/dashboard/img/logo-splash.svg index 0257920c20..70c6c51cec 100644 --- a/openstack_dashboard/static/dashboard/img/logo-splash.svg +++ b/openstack_dashboard/static/dashboard/img/logo-splash.svg @@ -1,314 +1,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/openstack_dashboard/static/dashboard/img/logo.png b/openstack_dashboard/static/dashboard/img/logo.png deleted file mode 100644 index 1a48c2124c..0000000000 Binary files a/openstack_dashboard/static/dashboard/img/logo.png and /dev/null differ diff --git a/openstack_dashboard/static/dashboard/img/logo.svg b/openstack_dashboard/static/dashboard/img/logo.svg index 14ede6031f..004fc0232c 100644 --- a/openstack_dashboard/static/dashboard/img/logo.svg +++ b/openstack_dashboard/static/dashboard/img/logo.svg @@ -1,297 +1,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/openstack_dashboard/static/dashboard/scss/components/_login.scss b/openstack_dashboard/static/dashboard/scss/components/_login.scss index 50890dcb60..bd6e708886 100644 --- a/openstack_dashboard/static/dashboard/scss/components/_login.scss +++ b/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; } -} \ No newline at end of file +} diff --git a/openstack_dashboard/static/dashboard/scss/components/_navbar.scss b/openstack_dashboard/static/dashboard/scss/components/_navbar.scss index 74bb3cb5e7..6a6ecf7c12 100644 --- a/openstack_dashboard/static/dashboard/scss/components/_navbar.scss +++ b/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; } } diff --git a/openstack_dashboard/templates/500.html b/openstack_dashboard/templates/500.html index b901983e87..6037fb6e2d 100644 --- a/openstack_dashboard/templates/500.html +++ b/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; diff --git a/openstack_dashboard/templates/header/_brand.html b/openstack_dashboard/templates/header/_brand.html index c3d6ed964b..dd0e0e41e3 100644 --- a/openstack_dashboard/templates/header/_brand.html +++ b/openstack_dashboard/templates/header/_brand.html @@ -2,5 +2,5 @@ {% load themes %} - + diff --git a/releasenotes/notes/bug/1637490-c29444e4eb458087.yaml b/releasenotes/notes/bug/1637490-c29444e4eb458087.yaml new file mode 100644 index 0000000000..fb23273490 --- /dev/null +++ b/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.