From 7e438dcaf5c6b23c9a48b0884c33dcff4103c347 Mon Sep 17 00:00:00 2001 From: Brett Sun Date: Tue, 27 Oct 2015 11:44:40 +0100 Subject: [PATCH 1/2] Add link to /collection to ascribe branding on navbar --- js/components/header.js | 10 ++++++++-- sass/ascribe_custom_style.scss | 19 ++++++++++++++++--- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/js/components/header.js b/js/components/header.js index bcdabd31..fa32440d 100644 --- a/js/components/header.js +++ b/js/components/header.js @@ -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 (); + return ( + + Whitelabel brand + + ); } return ( - + ); }, diff --git a/sass/ascribe_custom_style.scss b/sass/ascribe_custom_style.scss index 51281d91..fc7012c5 100644 --- a/sass/ascribe_custom_style.scss +++ b/sass/ascribe_custom_style.scss @@ -91,12 +91,25 @@ 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, + &:focus { + color: $ascribe--nav-fg-sec-color; + text-decoration: none; + } + } + + .img-brand { + height: 100%; + } } + .img-brand .navbar-brand { width: 0; height: 0; From c362b960dd006d8cba27232dede7be21698e9f6f Mon Sep 17 00:00:00 2001 From: Brett Sun Date: Tue, 27 Oct 2015 16:04:28 +0100 Subject: [PATCH 2/2] Change focused styling of logo to be normal --- sass/ascribe_custom_style.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sass/ascribe_custom_style.scss b/sass/ascribe_custom_style.scss index fc7012c5..914a981c 100644 --- a/sass/ascribe_custom_style.scss +++ b/sass/ascribe_custom_style.scss @@ -98,11 +98,13 @@ hr { .icon-ascribe-logo { color: $ascribe--nav-fg-prim-color; - &:hover, - &:focus { + &:hover { color: $ascribe--nav-fg-sec-color; text-decoration: none; } + &:focus { + text-decoration: none; + } } .img-brand {