diff options
author | 2017-11-12 22:01:28 +0100 | |
---|---|---|
committer | 2017-11-12 22:01:28 +0100 | |
commit | 83ccd49a2caf37a31f9b3f6f0823a7f99eb13a9a (patch) | |
tree | 85f658ff72aa6c23d2181a3ab80db8d5b753d76d /src/components/ui | |
parent | remove console logging (diff) | |
parent | Merge pull request #261 from meetfranz/feature/branding (diff) | |
download | ferdium-app-83ccd49a2caf37a31f9b3f6f0823a7f99eb13a9a.tar.gz ferdium-app-83ccd49a2caf37a31f9b3f6f0823a7f99eb13a9a.tar.zst ferdium-app-83ccd49a2caf37a31f9b3f6f0823a7f99eb13a9a.zip |
Merge branch 'develop' into feature/mute-service
Diffstat (limited to 'src/components/ui')
-rw-r--r-- | src/components/ui/AppLoader.js | 2 | ||||
-rw-r--r-- | src/components/ui/Loader.js | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/components/ui/AppLoader.js b/src/components/ui/AppLoader.js index 64a212969..ac3cdcb05 100644 --- a/src/components/ui/AppLoader.js +++ b/src/components/ui/AppLoader.js | |||
@@ -8,7 +8,7 @@ export default function () { | |||
8 | <div className="app-loader"> | 8 | <div className="app-loader"> |
9 | <Appear> | 9 | <Appear> |
10 | <h1 className="app-loader__title">Franz</h1> | 10 | <h1 className="app-loader__title">Franz</h1> |
11 | <Loader /> | 11 | <Loader color="#FFF" /> |
12 | </Appear> | 12 | </Appear> |
13 | </div> | 13 | </div> |
14 | ); | 14 | ); |
diff --git a/src/components/ui/Loader.js b/src/components/ui/Loader.js index e4fbd96a2..f73296bb6 100644 --- a/src/components/ui/Loader.js +++ b/src/components/ui/Loader.js | |||
@@ -9,12 +9,14 @@ export default class LoaderComponent extends Component { | |||
9 | children: oneOrManyChildElements, | 9 | children: oneOrManyChildElements, |
10 | loaded: PropTypes.bool, | 10 | loaded: PropTypes.bool, |
11 | className: PropTypes.string, | 11 | className: PropTypes.string, |
12 | color: PropTypes.string, | ||
12 | }; | 13 | }; |
13 | 14 | ||
14 | static defaultProps = { | 15 | static defaultProps = { |
15 | children: null, | 16 | children: null, |
16 | loaded: false, | 17 | loaded: false, |
17 | className: '', | 18 | className: '', |
19 | color: '#373a3c', | ||
18 | }; | 20 | }; |
19 | 21 | ||
20 | render() { | 22 | render() { |
@@ -22,6 +24,7 @@ export default class LoaderComponent extends Component { | |||
22 | children, | 24 | children, |
23 | loaded, | 25 | loaded, |
24 | className, | 26 | className, |
27 | color, | ||
25 | } = this.props; | 28 | } = this.props; |
26 | 29 | ||
27 | return ( | 30 | return ( |
@@ -30,7 +33,7 @@ export default class LoaderComponent extends Component { | |||
30 | // lines={10} | 33 | // lines={10} |
31 | width={4} | 34 | width={4} |
32 | scale={0.6} | 35 | scale={0.6} |
33 | color="#373a3c" | 36 | color={color} |
34 | component="span" | 37 | component="span" |
35 | className={className} | 38 | className={className} |
36 | > | 39 | > |