aboutsummaryrefslogtreecommitdiffstats
path: root/packages/instant/src/components/timed_progress_bar.tsx
diff options
context:
space:
mode:
authorSteve Klebanoff <steve.klebanoff@gmail.com>2018-12-01 04:47:05 +0800
committerSteve Klebanoff <steve.klebanoff@gmail.com>2018-12-01 04:47:05 +0800
commit12d34707b70e4784719593ec8d7ea57c5e601856 (patch)
tree263e872f0dc042f4dd0dfcc85c7ecc403ba83415 /packages/instant/src/components/timed_progress_bar.tsx
parentab631060a05fc6344ef6e2de7b0e6a0f0096e8ed (diff)
parentf496096ce154e51ae0317cc91fd55d062eb6ec4f (diff)
downloaddexon-sol-tools-12d34707b70e4784719593ec8d7ea57c5e601856.tar
dexon-sol-tools-12d34707b70e4784719593ec8d7ea57c5e601856.tar.gz
dexon-sol-tools-12d34707b70e4784719593ec8d7ea57c5e601856.tar.bz2
dexon-sol-tools-12d34707b70e4784719593ec8d7ea57c5e601856.tar.lz
dexon-sol-tools-12d34707b70e4784719593ec8d7ea57c5e601856.tar.xz
dexon-sol-tools-12d34707b70e4784719593ec8d7ea57c5e601856.tar.zst
dexon-sol-tools-12d34707b70e4784719593ec8d7ea57c5e601856.zip
Merge branch 'development' into feature/instant/prod-env-switches-cdn
Diffstat (limited to 'packages/instant/src/components/timed_progress_bar.tsx')
-rw-r--r--packages/instant/src/components/timed_progress_bar.tsx17
1 files changed, 13 insertions, 4 deletions
diff --git a/packages/instant/src/components/timed_progress_bar.tsx b/packages/instant/src/components/timed_progress_bar.tsx
index 8465b9cd0..fb3927088 100644
--- a/packages/instant/src/components/timed_progress_bar.tsx
+++ b/packages/instant/src/components/timed_progress_bar.tsx
@@ -1,8 +1,9 @@
import * as _ from 'lodash';
+import { transparentize } from 'polished';
import * as React from 'react';
import { PROGRESS_FINISH_ANIMATION_TIME_MS, PROGRESS_STALL_AT_WIDTH } from '../constants';
-import { ColorOption, css, keyframes, styled } from '../style/theme';
+import { ColorOption, css, keyframes, styled, ThemeConsumer } from '../style/theme';
import { Container } from './ui/container';
@@ -93,8 +94,16 @@ export interface ProgressBarProps extends ProgressProps {}
export const ProgressBar: React.ComponentType<ProgressBarProps & React.ClassAttributes<{}>> = React.forwardRef(
(props, ref) => (
- <Container width="100%" backgroundColor={ColorOption.lightGrey} borderRadius="6px">
- <Progress {...props} ref={ref as any} />
- </Container>
+ <ThemeConsumer>
+ {theme => (
+ <Container
+ width="100%"
+ borderRadius="6px"
+ rawBackgroundColor={transparentize(0.5, theme[ColorOption.primaryColor])}
+ >
+ <Progress {...props} ref={ref as any} />
+ </Container>
+ )}
+ </ThemeConsumer>
),
);