aboutsummaryrefslogtreecommitdiffstats
path: root/packages/instant/src/components/ui
diff options
context:
space:
mode:
authorSteve Klebanoff <steve@0xproject.com>2018-11-30 06:34:14 +0800
committerGitHub <noreply@github.com>2018-11-30 06:34:14 +0800
commitd4c439b27703b6855a6f7da60cf5a249d82b6b81 (patch)
tree874eef17e239e99d2585141ab86a5dcac02cb8c5 /packages/instant/src/components/ui
parenta864328ecf20e1dcbe1c8699d08317e075abc5e2 (diff)
parent105dcd73e473bf347a3db0143f7730d46fa44d84 (diff)
downloaddexon-sol-tools-d4c439b27703b6855a6f7da60cf5a249d82b6b81.tar
dexon-sol-tools-d4c439b27703b6855a6f7da60cf5a249d82b6b81.tar.gz
dexon-sol-tools-d4c439b27703b6855a6f7da60cf5a249d82b6b81.tar.bz2
dexon-sol-tools-d4c439b27703b6855a6f7da60cf5a249d82b6b81.tar.lz
dexon-sol-tools-d4c439b27703b6855a6f7da60cf5a249d82b6b81.tar.xz
dexon-sol-tools-d4c439b27703b6855a6f7da60cf5a249d82b6b81.tar.zst
dexon-sol-tools-d4c439b27703b6855a6f7da60cf5a249d82b6b81.zip
Merge pull request #1345 from 0xProject/fix/instant/progress-bar-bg
[instant] Progress bar background
Diffstat (limited to 'packages/instant/src/components/ui')
-rw-r--r--packages/instant/src/components/ui/container.tsx13
1 files changed, 12 insertions, 1 deletions
diff --git a/packages/instant/src/components/ui/container.tsx b/packages/instant/src/components/ui/container.tsx
index 4dafe1386..a015ab5bc 100644
--- a/packages/instant/src/components/ui/container.tsx
+++ b/packages/instant/src/components/ui/container.tsx
@@ -27,6 +27,7 @@ export interface ContainerProps {
borderBottom?: string;
className?: string;
backgroundColor?: ColorOption;
+ rawBackgroundColor?: string;
hasBoxShadow?: boolean;
zIndex?: number;
whiteSpace?: string;
@@ -38,6 +39,16 @@ export interface ContainerProps {
flexGrow?: string | number;
}
+const getBackgroundColor = (theme: any, backgroundColor?: ColorOption, rawBackgroundColor?: string): string => {
+ if (backgroundColor) {
+ return theme[backgroundColor] as string;
+ }
+ if (rawBackgroundColor) {
+ return rawBackgroundColor;
+ }
+ return 'none';
+};
+
export const Container =
styled.div <
ContainerProps >
@@ -70,7 +81,7 @@ export const Container =
${props => props.width && stylesForMedia<string>('width', props.width)}
${props => props.height && stylesForMedia<string>('height', props.height)}
${props => props.borderRadius && stylesForMedia<string>('border-radius', props.borderRadius)}
- background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
+ background-color: ${props => getBackgroundColor(props.theme, props.backgroundColor, props.rawBackgroundColor)};
border-color: ${props => (props.borderColor ? props.theme[props.borderColor] : 'none')};
&:hover {
${props =>