From 3110c7f5d26fad5b172999bceecc899395d5594d Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 6 Oct 2015 16:39:51 +0200
Subject: [PATCH] fix ie9 issues

---
 .../src/main/js/apps/nav/global/global-nav-branding.jsx  | 9 +++++----
 .../main/js/apps/nav/templates/nav-shortcuts-help.hbs    | 4 ++--
 server/sonar-web/src/main/less/init/icons.less           | 2 ++
 server/sonar-web/src/main/less/pages/login.less          | 2 ++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/nav/global/global-nav-branding.jsx b/server/sonar-web/src/main/js/apps/nav/global/global-nav-branding.jsx
index 7aae0a4b3a0..680654fc37e 100644
--- a/server/sonar-web/src/main/js/apps/nav/global/global-nav-branding.jsx
+++ b/server/sonar-web/src/main/js/apps/nav/global/global-nav-branding.jsx
@@ -2,10 +2,11 @@ import React from 'react';
 
 export default React.createClass({
   renderLogo() {
-    const url = this.props.logoUrl || `${window.baseUrl}/images/logo.svg`;
-    const width = this.props.logoWidth || null;
-    const title = window.t('layout.sonar.slogan');
-    return <img src={url} width={width} height="30" alt={title} title={title}/>
+    let url = this.props.logoUrl || `${window.baseUrl}/images/logo.svg`,
+        width = this.props.logoWidth || null,
+        height = this.props.logoWidth ? 30 : null,
+        title = window.t('layout.sonar.slogan');
+    return <img src={url} width={width} height={height} alt={title} title={title}/>;
   },
 
   render() {
diff --git a/server/sonar-web/src/main/js/apps/nav/templates/nav-shortcuts-help.hbs b/server/sonar-web/src/main/js/apps/nav/templates/nav-shortcuts-help.hbs
index f49ed110e0e..2ef8a865b8b 100644
--- a/server/sonar-web/src/main/js/apps/nav/templates/nav-shortcuts-help.hbs
+++ b/server/sonar-web/src/main/js/apps/nav/templates/nav-shortcuts-help.hbs
@@ -25,7 +25,7 @@
 
       <h3 class="shortcuts-section-title">{{t 'shortcuts.section.rules'}}</h3>
       <ul class="shortcuts-list">
-        <li><span class="shortcut-button">&uparrow;</span> <span
+        <li><span class="shortcut-button">&uarr;</span> <span
             class="shortcut-button">&darr;</span> &nbsp;&nbsp; {{t 'shortcuts.section.rules.navigate_between_rules'}}</li>
         <li><span class="shortcut-button">&rarr;</span> &nbsp;&nbsp; {{t 'shortcuts.section.rules.open_details'}}</li>
         <li><span class="shortcut-button">&larr;</span> &nbsp;&nbsp; {{t 'shortcuts.section.rules.return_to_list'}}</li>
@@ -37,7 +37,7 @@
     <div class="column-half">
       <h3 class="shortcuts-section-title">{{t 'shortcuts.section.issues'}}</h3>
       <ul class="shortcuts-list">
-        <li><span class="shortcut-button">&uparrow;</span> <span
+        <li><span class="shortcut-button">&uarr;</span> <span
             class="shortcut-button">&darr;</span> &nbsp;&nbsp; {{t 'shortcuts.section.issues.navigate_between_issues'}}
         </li>
         <li><span class="shortcut-button">&rarr;</span> &nbsp;&nbsp; {{t 'shortcuts.section.issues.open_details'}}</li>
diff --git a/server/sonar-web/src/main/less/init/icons.less b/server/sonar-web/src/main/less/init/icons.less
index 4fb95d59cc8..3b2fff04283 100644
--- a/server/sonar-web/src/main/less/init/icons.less
+++ b/server/sonar-web/src/main/less/init/icons.less
@@ -189,6 +189,8 @@ a[class^="icon-"], a[class*=" icon-"] {
   background-color: @blue;
   background-image: url('data:image/svg+xml,%3Csvg%20viewBox%3D%220%200%2014%2014%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20stroke-linejoin%3D%22round%22%20stroke-miterlimit%3D%221.414%22%3E%3Cpath%20d%3D%22M12%204.665c0%20.172-.06.318-.18.438l-5.55%205.55c-.12.12-.266.18-.438.18s-.318-.06-.438-.18L2.18%207.438C2.06%207.317%202%207.17%202%207s.06-.318.18-.44l.878-.876c.12-.12.267-.18.44-.18.17%200%20.317.06.437.18l1.897%201.903%204.233-4.24c.12-.12.266-.18.438-.18s.32.06.44.18l.876.88c.12.12.18.265.18.438z%22%20fill%3D%22%23fff%22%20fill-rule%3D%22nonzero%22%2F%3E%3C%2Fsvg%3E');
   border-color: @blue;
+
+  .ie9 & { background-position: -3px 0; }
 }
 
 .icon-checkbox-checked.icon-checkbox-single:before {
diff --git a/server/sonar-web/src/main/less/pages/login.less b/server/sonar-web/src/main/less/pages/login.less
index 740185c3af4..ad4d3503525 100644
--- a/server/sonar-web/src/main/less/pages/login.less
+++ b/server/sonar-web/src/main/less/pages/login.less
@@ -40,6 +40,8 @@
     border-color: @blue;
     background-color: @blue;
     background-image: url('data:image/svg+xml,%3Csvg%20viewBox%3D%220%200%2014%2014%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20stroke-linejoin%3D%22round%22%20stroke-miterlimit%3D%221.414%22%3E%3Cpath%20d%3D%22M12%204.665c0%20.172-.06.318-.18.438l-5.55%205.55c-.12.12-.266.18-.438.18s-.318-.06-.438-.18L2.18%207.438C2.06%207.317%202%207.17%202%207s.06-.318.18-.44l.878-.876c.12-.12.267-.18.44-.18.17%200%20.317.06.437.18l1.897%201.903%204.233-4.24c.12-.12.266-.18.438-.18s.32.06.44.18l.876.88c.12.12.18.265.18.438z%22%20fill%3D%22%23fff%22%20fill-rule%3D%22nonzero%22%2F%3E%3C%2Fsvg%3E');
+
+    .ie9 & { background-position: -3px 0; }
   }
 
   & ~ label {
-- 
2.39.5