Skip to content

Commit ca96579

Browse files
authored
Merge pull request #13 from blue-core-lod/t1-bc-branding
Blue Core Colors and Logo
2 parents 53b3efe + 5ed35bb commit ca96579

File tree

8 files changed

+27
-6
lines changed

8 files changed

+27
-6
lines changed

src/components/Header.jsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import { selectCurrentResourceKey } from "selectors/resources"
1212
import usePermissions from "hooks/usePermissions"
1313
import HeaderSearch from "./search/HeaderSearch"
1414

15+
const bcLogo = require("../styles/bluecore-small.png")
16+
1517
const Header = (props) => {
1618
const { canCreate } = usePermissions()
1719
const location = useLocation()
@@ -26,7 +28,14 @@ const Header = (props) => {
2628
<div className="row">
2729
<div className="col-6">
2830
<a href="/">
29-
<h1 className="editor-logo">Sinopia{`${Config.sinopiaEnv}`}</h1>
31+
<h1 className="editor-logo">
32+
<img
33+
src={bcLogo}
34+
alt="Blue Core Logo"
35+
style={{ paddingBottom: "8px" }}
36+
></img>{" "}
37+
| Sinopia{`${Config.sinopiaEnv}`}
38+
</h1>
3039
</a>
3140
</div>
3241
<div className="col-6">

src/components/home/Header.jsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,23 @@ import Config from "Config"
77
import { connect } from "react-redux"
88
import { selectUser } from "selectors/authenticate"
99
import { signOut } from "actionCreators/authenticate"
10+
11+
const bcLogo = require("../../styles/bluecore-small.png")
12+
1013
import { bindActionCreators } from "redux"
1114

1215
const Header = (props) => (
1316
<div className="navbar homepage-navbar">
1417
<div className="navbar-header">
1518
<a className="navbar-brand" href={`${Config.sinopiaUrl}`}>
16-
<h1 className="editor-logo"> Sinopia{`${Config.sinopiaEnv}`}</h1>
19+
<h1 className="editor-logo">
20+
<img
21+
src={bcLogo}
22+
alt="Blue Core Logo"
23+
style={{ paddingBottom: "8px" }}
24+
></img>{" "}
25+
| Sinopia{`${Config.sinopiaEnv}`}
26+
</h1>
1727
</a>
1828
</div>
1929
<ul className="nav">

src/styles/bluecore-small.png

13.7 KB
Loading

src/styles/bootstrap-variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $enable-shadows: true;
1515
$enable-validation-icons: false;
1616

1717
// Body
18-
$body-bg: $white-linen;
18+
$body-bg: $bluecore-bkgrd;
1919

2020
// Links
2121
$link-color: $orient;

src/styles/colors.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ $swirl: #d7cec4;
1212
$double-spanish-white: #cfc2a8;
1313
$nobel: #989898;
1414
$greyblue: #e8ecf4;
15+
$bluecore-header: #b9c8e8;
16+
$bluecore-bkgrd: #ebeefa;

src/styles/header.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.editor-navbar {
2-
background-image: url("./editorheaderbg.png");
2+
background-color: $bluecore-header;
33
}
44

55
/** For header tabs **/

src/styles/main.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
.banner {
2323
background-size: cover;
24-
background-image: url("home-background.png");
24+
background-color: $bluecore-header;
2525
}
2626

2727
.editor-save {

src/styles/modal.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
padding: 0;
44

55
.card {
6-
background: $spring-wood;
6+
background: $bluecore-bkgrd;
77
border-color: $nobel;
88
border-radius: 2px;
99
}

0 commit comments

Comments
 (0)