Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(pirateship): fixes prods text and shop all cats to dark gray #130

Closed
wants to merge 5 commits into from
Closed

fix(pirateship): fixes prods text and shop all cats to dark gray #130

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbad882
fix(pirateship): fixes prods text and shop all cats to dark gray
Aug 3, 2018
833c90c
fix(pirateship): fixes navigator typing and merge conflict
Aug 8, 2018
ae3e778
Merge branch 'master' into shopHomeTextColors
bweissbart Aug 9, 2018
4da1c02
fix(pirateship): removes extraneous navigator type
Aug 13, 2018
60085bd
Merge branch 'master' into shopHomeTextColors
bweissbart Aug 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions packages/pirateship/src/components/PSProductCarousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Component } from 'react';
import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';

import {
MultiCarousel,
ProductItem,
Expand All @@ -9,6 +10,9 @@ import { fontSize, palette } from '../styles/variables';

const styles = StyleSheet.create({
container: {},
brandText: {
color: palette.secondary
},
item: {
marginLeft: 15
},
Expand All @@ -20,14 +24,16 @@ const styles = StyleSheet.create({
},
productTitle: {
fontWeight: 'normal',
fontSize: 13
fontSize: 13,
color: palette.secondary
},
productPriceText: {
fontSize: 15
},
productPrice: {
justifyContent: 'center',
marginTop: 5
marginTop: 5,
color: palette.secondary
},
priceContainer: {
marginBottom: 0
Expand All @@ -54,7 +60,7 @@ export interface PSProductCarouselProps {

export default class PSProductCarousel extends Component<
PSProductCarouselProps
> {
> {
render(): JSX.Element {
return (
<MultiCarousel
Expand All @@ -77,7 +83,8 @@ export default class PSProductCarousel extends Component<
priceStyle={styles.productPrice}
reviewStyle={styles.reviews}
promoStyle={styles.promoText}
buttonProps={{palette}}
brandStyle={styles.brandText}
buttonProps={{ palette }}
promoContainerStyle={styles.promosContainer}
reviewIndicatorProps={{ itemSize: 15 } as any}
{...item}
Expand Down
6 changes: 4 additions & 2 deletions packages/pirateship/src/components/PSScreenWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { PureComponent } from 'react';

import { Navigator } from 'react-native-navigation';
import {
Animated,
KeyboardAvoidingView,
Expand Down Expand Up @@ -30,13 +30,15 @@ const styles = StyleSheet.create({
}
});


export interface PSScreenWrapperProps {
style?: StyleProp<ViewStyle>;

hideGlobalBanner?: boolean;
overrideGlobalBanner?: PSGlobalBannerSlotItem;

needInSafeArea?: boolean;
navigator?: Navigator;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is necessary because we're defining navigator on line 46. If you're getting a tsc error it's probably coming from somewhere else.


// Whether or not the wrapper should scroll it's children. Defaults to true
scroll?: boolean;
Expand All @@ -49,7 +51,7 @@ export interface PSScreenWrapperProps {

export default class PSScreenWrapper extends PureComponent<
PSScreenWrapperProps
> {
> {
state: any = {
safeAreaInsets: {
top: 0,
Expand Down
3 changes: 2 additions & 1 deletion packages/pirateship/src/screens/Shop.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ const ShopStyle = StyleSheet.create({
marginTop: 0,
paddingTop: 15,
paddingBottom: 15,
justifyContent: 'center'
justifyContent: 'center',
color: palette.secondary
},
shopLandingCategories: {
borderTopWidth: 1,
Expand Down