aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/ui
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-11-12 21:56:04 +0100
committerLibravatar GitHub <noreply@github.com>2017-11-12 21:56:04 +0100
commit48fe63a3b23e2a067d9994277bac3f6fa89a422f (patch)
tree9b9ca1ce08f0f419b017fba34ed31ffe5e34cfa6 /src/components/ui
parentMerge pull request #252 from meetfranz/feature/mute-service (diff)
parentfix wrong loader color (diff)
downloadferdium-app-48fe63a3b23e2a067d9994277bac3f6fa89a422f.tar.gz
ferdium-app-48fe63a3b23e2a067d9994277bac3f6fa89a422f.tar.zst
ferdium-app-48fe63a3b23e2a067d9994277bac3f6fa89a422f.zip
Merge pull request #261 from meetfranz/feature/branding
Fix app loader spinner color
Diffstat (limited to 'src/components/ui')
-rw-r--r--src/components/ui/AppLoader.js2
-rw-r--r--src/components/ui/Loader.js5
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 >