Skip to content

Commit

Permalink
0.26.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ritz078 committed Mar 6, 2019
1 parent 7ebef39 commit a67cb1c
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 7 deletions.
Binary file modified assets/dummy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pebble-native",
"version": "0.26.0",
"version": "0.26.1",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"files": [
Expand Down
3 changes: 2 additions & 1 deletion src/components/Banner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ const Banner: React.FunctionComponent<BannerProps> = ({
return (
<View style={[styles.container, style]}>
<View style={styles.innerContainer}>
{!!image && <Image source={image} style={[styles.image, imageStyle]} />}

<Text style={styles.title} size={13} color={colors.gray.dark}>
{title}
</Text>
Expand All @@ -78,7 +80,6 @@ const Banner: React.FunctionComponent<BannerProps> = ({
</Text>
</Button>
)}
{!!image && <Image source={image} style={[styles.image, imageStyle]} />}
</View>
</View>
);
Expand Down
9 changes: 4 additions & 5 deletions src/components/InfoCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ const styles = StyleSheet.create({
alignItems: "center"
},
imageWrapper: {
width: 200,
height: 140,
height: 100,
position: "absolute",
bottom: -45,
right: -25
bottom: -20,
right: -30
},
descriptionText: {
width: "60%",
Expand Down Expand Up @@ -128,7 +127,7 @@ class InfoCard extends React.Component<InfoCardProps, InfoCardState> {
<View style={styles.defaultContent}>
{!!image && (
<Image
style={styles.imageWrapper as any}
style={[styles.imageWrapper as any, style.imageWrapper]}
source={image}
resizeMode="contain"
/>
Expand Down
1 change: 1 addition & 0 deletions src/components/typings/InfoCard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export interface InfoCardProps {
container?: any;
topSection?: any;
heading?: any;
imageWrapper?: any;
};
disabled?: boolean;
}
Expand Down
5 changes: 5 additions & 0 deletions storybook/stories/banner.story.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ storiesOf("Banner", module).add("Default", () => (
description="Kasturi Maniratnam is recently moved in final negotiations."
buttonText="ADD BOOKING INFO"
image={require("../../assets/dummy.png")}
imageStyle={{
height: 130,
width: 130,
bottom: -13
}}
/>
</CenterView>
));
7 changes: 7 additions & 0 deletions storybook/stories/infoCard.story.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ storiesOf("InfoCard", module)
description="Have more information about Kasturi to add?"
linkText="Click here to add"
image={require("../../assets/dummy.png")}
style={{
imageWrapper: {
width: 120,
height: 120,
bottom: -26
}
}}
/>
</View>
</CenterView>
Expand Down

0 comments on commit a67cb1c

Please sign in to comment.