aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/components/ui
diff options
context:
space:
mode:
authorFred Carlsen <fred@sjelfull.no>2018-12-05 23:15:44 +0800
committerFred Carlsen <fred@sjelfull.no>2018-12-05 23:15:44 +0800
commit00dbddc1aafd56c352e7a8905338d81e236b1fa1 (patch)
treec8462eb4e6882a39dec601b990f75761b4897ce8 /packages/website/ts/components/ui
parentb552c2bd0c5090629a96bc6b0e032cb85d9c52b3 (diff)
parentb411e2250aed82b87d1cbebf5cf805d794ddbdb7 (diff)
downloaddexon-sol-tools-00dbddc1aafd56c352e7a8905338d81e236b1fa1.tar
dexon-sol-tools-00dbddc1aafd56c352e7a8905338d81e236b1fa1.tar.gz
dexon-sol-tools-00dbddc1aafd56c352e7a8905338d81e236b1fa1.tar.bz2
dexon-sol-tools-00dbddc1aafd56c352e7a8905338d81e236b1fa1.tar.lz
dexon-sol-tools-00dbddc1aafd56c352e7a8905338d81e236b1fa1.tar.xz
dexon-sol-tools-00dbddc1aafd56c352e7a8905338d81e236b1fa1.tar.zst
dexon-sol-tools-00dbddc1aafd56c352e7a8905338d81e236b1fa1.zip
Merge remote-tracking branch 'upstream/development' into website
# Conflicts: # packages/website/package.json # packages/website/ts/style/colors.ts
Diffstat (limited to 'packages/website/ts/components/ui')
-rw-r--r--packages/website/ts/components/ui/image.tsx2
-rw-r--r--packages/website/ts/components/ui/text.tsx2
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/website/ts/components/ui/image.tsx b/packages/website/ts/components/ui/image.tsx
index c8d39352b..d698ddaa0 100644
--- a/packages/website/ts/components/ui/image.tsx
+++ b/packages/website/ts/components/ui/image.tsx
@@ -10,6 +10,7 @@ export interface ImageProps {
height?: string | number;
maxWidth?: string | number;
maxHeight?: string | number;
+ additionalStyle?: React.CSSProperties;
}
interface ImageState {
imageLoadFailed: boolean;
@@ -30,6 +31,7 @@ export class Image extends React.Component<ImageProps, ImageState> {
onError={this._onError.bind(this)}
src={src}
style={{
+ ...this.props.additionalStyle,
borderRadius: this.props.borderRadius,
maxWidth: this.props.maxWidth,
maxHeight: this.props.maxHeight,
diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx
index 2fe2a8c79..046442ee5 100644
--- a/packages/website/ts/components/ui/text.tsx
+++ b/packages/website/ts/components/ui/text.tsx
@@ -3,7 +3,7 @@ import { darken } from 'polished';
import * as React from 'react';
import { styled } from 'ts/style/theme';
-export type TextTag = 'p' | 'div' | 'span' | 'label' | 'h1' | 'h2' | 'h3' | 'h4' | 'i';
+export type TextTag = 'p' | 'div' | 'span' | 'label' | 'h1' | 'h2' | 'h3' | 'h4' | 'i' | 'span';
export interface TextProps {
className?: string;