ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 01:25:17 +01:00
Code Issues Releases Wiki Activity

Merge pull request #7 from ascribe/AD-1237-navbar-ascribe-logo-doesnt-link

Browse Source 
AD-1237 Navbar Ascribe Logo Doesn't Link
This commit is contained in:
Tim Daubenschütz 2015-10-27 17:19:44 +01:00
commit d617f7212f
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/components/header.js
View File

@ -2,6 +2,8 @@
import React from 'react';
import { Link } from 'react-router';
import Nav from 'react-bootstrap/lib/Nav';
import Navbar from 'react-bootstrap/lib/Navbar';
import CollapsibleNav from 'react-bootstrap/lib/CollapsibleNav';
@ -71,12 +73,16 @@ let Header = React.createClass({
}
if (whitelabel.subdomain && whitelabel.subdomain !== 'www' && whitelabel.logo){
return (<img className="img-brand" src={whitelabel.logo}/>);
return (
<Link to="/collection">
<img className="img-brand" src={whitelabel.logo} alt="Whitelabel brand"/>
</Link>
);
}
return (
<span>
<span className="icon-ascribe-logo"></span>
<Link className="icon-ascribe-logo" to="/collection"/>
</span>
);
},

21
sass/ascribe_custom_style.scss
View File

@ -91,12 +91,27 @@ hr {
}
}
.navbar-brand,
.navbar-brand:hover {
.navbar-brand {
font-size: 23px;
padding: 12px 15px;
color: $ascribe--nav-fg-prim-color;
.icon-ascribe-logo {
color: $ascribe--nav-fg-prim-color;
&:hover {
color: $ascribe--nav-fg-sec-color;
text-decoration: none;
}
&:focus {
text-decoration: none;
}
}
.img-brand {
height: 100%;
}
}
.img-brand .navbar-brand {
width: 0;
height: 0;