From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 26 Oct 2015 08:50:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/branch-5.2'
X-Git-Tag: 5.3-RC1~455
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=81c7de07a6766809f7610a51883608f99f639af6;p=sonarqube.git

Merge remote-tracking branch 'origin/branch-5.2'
---

81c7de07a6766809f7610a51883608f99f639af6
diff --cc server/sonar-web/src/main/js/main/nav/global/global-nav-branding.js
index 680654fc37e,00000000000..1860d5eaf2a
mode 100644,000000..100644
--- a/server/sonar-web/src/main/js/main/nav/global/global-nav-branding.js
+++ b/server/sonar-web/src/main/js/main/nav/global/global-nav-branding.js
@@@ -1,21 -1,0 +1,21 @@@
 +import React from 'react';
 +
 +export default React.createClass({
 +  renderLogo() {
 +    let url = this.props.logoUrl || `${window.baseUrl}/images/logo.svg`,
-         width = this.props.logoWidth || null,
-         height = this.props.logoWidth ? 30 : null,
++        width = this.props.logoWidth || 100,
++        height = 30,
 +        title = window.t('layout.sonar.slogan');
 +    return <img src={url} width={width} height={height} alt={title} title={title}/>;
 +  },
 +
 +  render() {
 +    const homeUrl = window.baseUrl + '/';
 +    const homeLinkClassName = 'navbar-brand' + (this.props.logoUrl ? ' navbar-brand-custom' : '');
 +    return (
 +        <div className="navbar-header">
 +          <a className={homeLinkClassName} href={homeUrl}>{this.renderLogo()}</a>
 +        </div>
 +    );
 +  }
 +});