diff --git a/src/App.js b/src/App.js index 413ce16..ba1cea7 100644 --- a/src/App.js +++ b/src/App.js @@ -6,7 +6,7 @@ import './assets/App.css'; import Loading from './Loading'; import { inject, observer } from 'mobx-react'; -@inject("commonStore") +@inject("commonStore","contractsStore") @observer class App extends Component { onBallotsRender = () => { @@ -42,8 +42,8 @@ class App extends Component { } render() { - const { commonStore } = this.props; - const loading = commonStore.loading ? : '' + const { commonStore, contractsStore } = this.props; + const loading = commonStore.loading ? : '' const nav = this.shouldShowNavPan() ?
@@ -56,14 +56,14 @@ class App extends Component { return (
{loading} -
+
{nav} {/**/} -
+
); } diff --git a/src/Loading.js b/src/Loading.js index afc664a..ac7fbf6 100644 --- a/src/Loading.js +++ b/src/Loading.js @@ -1,6 +1,22 @@ import React from 'react'; -const Loading = () => ( -
+const styles = (netId) => { + const core = { + backgroundColor: 'rgba(35, 29, 115, 0.8)' + }; + const sokol = { + backgroundColor: 'rgba(47, 109, 99, 0.8)' + } + switch(netId) { + case '77': + return sokol; + case '99': + return core; + default: + return {}; + } +} +const Loading = ({netId}) => ( +
diff --git a/src/assets/App.css b/src/assets/App.css index b768f44..9abca44 100644 --- a/src/assets/App.css +++ b/src/assets/App.css @@ -272,6 +272,8 @@ button { .footer { height: auto; padding: 20px 10px 0; } } + .footer.sokol { + background-color: #6ac9b9; } .footer .container { position: relative; } @media screen and (max-width: 414px) { @@ -314,11 +316,25 @@ button { margin-bottom: 0px; } } .header .container { overflow: hidden; } + .header.sokol { + background-image: none; + background-color: #6ac9b9; } .header-logo { float: left; width: 182px; height: 35px; background-position: 0 -24px; } + .header-logo-sokol { + display: inline-block; + width: 146px; + height: 35px; + background-image: url("./images/logo_sokol.png"); + background-position: 0 0; + background-repeat: no-repeat; } + @media (min--moz-device-pixel-ratio: 1.3), (-o-min-device-pixel-ratio: 2.6 / 2), (-webkit-min-device-pixel-ratio: 1.3), (min-device-pixel-ratio: 1.3), (min-resolution: 1.3dppx) { + .header-logo-sokol { + background-image: url("./images/logo_sokol@2x.png"); + background-size: 146px 35px; } } .header-settings, .header-new-ballot { float: right; border-radius: 3px; diff --git a/src/assets/images/logo_sokol.png b/src/assets/images/logo_sokol.png new file mode 100644 index 0000000..fe08d28 Binary files /dev/null and b/src/assets/images/logo_sokol.png differ diff --git a/src/assets/images/logo_sokol@2x.png b/src/assets/images/logo_sokol@2x.png new file mode 100644 index 0000000..701da74 Binary files /dev/null and b/src/assets/images/logo_sokol@2x.png differ diff --git a/src/assets/stylesheets/footer.scss b/src/assets/stylesheets/footer.scss index d463912..cf4c7cb 100644 --- a/src/assets/stylesheets/footer.scss +++ b/src/assets/stylesheets/footer.scss @@ -10,6 +10,11 @@ padding: 20px 10px 0; } + + &.sokol { + background-color: #6ac9b9; + } + .container { position: relative; diff --git a/src/assets/stylesheets/header.scss b/src/assets/stylesheets/header.scss index 601b8bb..51ba9b2 100644 --- a/src/assets/stylesheets/header.scss +++ b/src/assets/stylesheets/header.scss @@ -15,6 +15,11 @@ overflow: hidden; } + &.sokol { + background-image: none; + background-color: #6ac9b9; + } + &-logo { @extend %logos; float: left; @@ -23,6 +28,16 @@ background-position: 0 -24px; } + &-logo-sokol { + @include image-2x('./images/logo_sokol@2x.png', 146px, 35px); + display: inline-block; + width: 146px; + height: 35px; + background-image: url('./images/logo_sokol.png'); + background-position: 0 0; + background-repeat: no-repeat; + } + &-settings, &-new-ballot { @extend %button; diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index 4a91e59..8be217e 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -2,17 +2,20 @@ import React from "react"; import moment from "moment"; import { Link } from "react-router-dom"; -export const Footer = () => ( -
-
-

{moment().format("YYYY")} POA Network. All rights reserved.

- -
- - - - +export const Footer = ({netId}) => { + const footerClassName = netId === '77' ? 'sokol' : ''; + return ( +
+
+

{moment().format("YYYY")} POA Network. All rights reserved.

+ +
+ + + + +
-
-
-); + + ); +} diff --git a/src/components/Header.jsx b/src/components/Header.jsx index 04805a4..e3678b6 100644 --- a/src/components/Header.jsx +++ b/src/components/Header.jsx @@ -1,12 +1,17 @@ import React from 'react'; import { Link } from 'react-router-dom'; -export const Header = () => ( -
-
- - New ballot - {/*Settings*/} -
-
-); +export const Header = ({netId}) => { + console.log("netId: ", netId) + let headerClassName = netId === '77' ? 'sokol' : ''; + const logoClassName = netId === '77' ? 'header-logo-sokol' : 'header-logo'; + return( +
+
+ + New ballot + {/*Settings*/} +
+
+ ) +};