summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kolodyazhny <e0ne@e0ne.info>2017-09-20 13:39:26 +0000
committerMarc GariƩpy (mgariepy) <gariepy.marc@gmail.com>2018-06-14 23:50:15 +0000
commitef2e77916eb48842cf0c8e3bfdf84695fa909ee3 (patch)
treeffdcfd68896e178b5a98debc01095ebdfbbacac2
parentd564ef499bacd3537e4d4bd22796037d6bf16f2d (diff)
downloadhorizon-ef2e77916eb48842cf0c8e3bfdf84695fa909ee3.tar.gz
Fix logo in IE11/Edge browsers
IE11/Edge browsers doesn't scale SVG images correct if weight and height is specified directly in SVG. Also these browsers doesn't work well with max-height style. Change-Id: I3fe643dd5e0d47cb0e5a658c84d23a8750c217e7 Closes-Bug: #1715674 (cherry picked from commit 502cffb1f8d2f476cff682e6aba15f71ee49c3ef)
-rw-r--r--openstack_dashboard/static/dashboard/img/logo-splash.svg2
-rw-r--r--openstack_dashboard/static/dashboard/img/logo.svg2
-rw-r--r--openstack_dashboard/static/dashboard/scss/components/_navbar.scss2
3 files changed, 3 insertions, 3 deletions
diff --git a/openstack_dashboard/static/dashboard/img/logo-splash.svg b/openstack_dashboard/static/dashboard/img/logo-splash.svg
index 70c6c51ce..a46166855 100644
--- a/openstack_dashboard/static/dashboard/img/logo-splash.svg
+++ b/openstack_dashboard/static/dashboard/img/logo-splash.svg
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="79.895mm" width="165.57mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 586.65576 283.09213">
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 586.65576 283.09213">
<defs>
<clipPath id="b" clipPathUnits="userSpaceOnUse">
<path d="m0 612h792v-612h-792v612z"/>
diff --git a/openstack_dashboard/static/dashboard/img/logo.svg b/openstack_dashboard/static/dashboard/img/logo.svg
index 004fc0232..b67fdcc73 100644
--- a/openstack_dashboard/static/dashboard/img/logo.svg
+++ b/openstack_dashboard/static/dashboard/img/logo.svg
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="30.124mm" width="169.55mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 600.77589 106.73737">
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 600.77589 106.73737">
<defs>
<clipPath id="a" clipPathUnits="userSpaceOnUse">
<path d="m0 612h792v-612h-792v612z"/>
diff --git a/openstack_dashboard/static/dashboard/scss/components/_navbar.scss b/openstack_dashboard/static/dashboard/scss/components/_navbar.scss
index 6a6ecf7c1..af14231b4 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 - $padding-small-vertical*2;
+ height: $navbar-height - $padding-small-vertical*2;
vertical-align: middle;
}
}