From 1b99dd8b118eac9c1b878b11e17ffb91708f7683 Mon Sep 17 00:00:00 2001 From: Jonathan Ingram Date: Fri, 20 Oct 2017 10:38:08 +1100 Subject: [PATCH 1/2] Load cloud.gov favicon in cg skin, not globally --- static_src/main.js | 1 - static_src/skins/cg/index.js | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/static_src/main.js b/static_src/main.js index 129e6ead..bb5bdb09 100644 --- a/static_src/main.js +++ b/static_src/main.js @@ -4,7 +4,6 @@ import './css/main.css'; import './css/overrides.css'; // Icon used in cg-uaa. import './img/dashboard-uaa-icon.jpg'; -import 'cloudgov-style/img/favicon.ico'; import React from 'react'; import ReactDOM from 'react-dom'; diff --git a/static_src/skins/cg/index.js b/static_src/skins/cg/index.js index 8a600f46..683a087b 100644 --- a/static_src/skins/cg/index.js +++ b/static_src/skins/cg/index.js @@ -1,6 +1,7 @@ import React from 'react'; export { default as header } from './header'; +import 'cloudgov-style/img/favicon.ico'; import InfoActivities from '../../components/info_activities.jsx'; import InfoEnvironments from '../../components/info_environments.jsx'; import InfoSandbox from '../../components/info_sandbox.jsx'; From da1c19755d8544a6f0b7eff5b2ea383df4300f71 Mon Sep 17 00:00:00 2001 From: Jonathan Ingram Date: Fri, 20 Oct 2017 14:25:30 +1100 Subject: [PATCH 2/2] Remove whitespace --- static_src/components/confirmation_box.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/static_src/components/confirmation_box.jsx b/static_src/components/confirmation_box.jsx index 05d1740c..1174aa36 100644 --- a/static_src/components/confirmation_box.jsx +++ b/static_src/components/confirmation_box.jsx @@ -1,4 +1,3 @@ - /** * A component that renders a box with a different style and background */