Skip to content

Use Colors.primary in components and change primary color to violet30 #1135

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.

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

Merged
merged 3 commits into from
Jan 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion demo/src/screens/MainScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class MainScreen extends Component {
paddingV-s2
onPress={() => this.openScreen(item)}
onLongPress={() => this.setDefaultScreen(item)}
activeBackgroundColor={Colors.blue40}
activeBackgroundColor={Colors.primary}
activeOpacity={1}
>
<Text style={[item.deprecate && styles.entryTextDeprecated]} dark10 text50>
Expand Down
2 changes: 1 addition & 1 deletion demo/src/screens/componentScreens/ActionBarScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default class ActionBarScreen extends Component {

<View style={styles.page}>
<ActionBar
backgroundColor={Colors.blue30}
backgroundColor={Colors.primary}
actions={[
{label: 'Hide', onPress: () => Alert.alert('hide'), white: true},
{label: 'Add Discount', onPress: () => Alert.alert('add discount'), white: true},
Expand Down
4 changes: 2 additions & 2 deletions demo/src/screens/componentScreens/ButtonsScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ export default class ButtonsScreen extends Component {

<Button
style={{marginBottom: ButtonSpace}}
blue30
primary
outline
iconSource={plusIcon}
label="Icon"
Expand All @@ -339,7 +339,7 @@ export default class ButtonsScreen extends Component {
style={{marginBottom: ButtonSpace}}
>
<Image source={plusIcon} />
<Text style={{marginLeft: 10, color: Colors.blue30}}>
<Text marginL-10 primary>
Custom Icon
</Text>
</Button>
Expand Down
2 changes: 1 addition & 1 deletion generatedTypes/components/badge/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ declare function createStyles(props: BadgeProps): {
badge: {
alignSelf: "flex-start";
borderRadius: number;
backgroundColor: any;
backgroundColor: string | undefined;
alignItems: "center";
justifyContent: "center";
overflow: "hidden";
Expand Down
3 changes: 2 additions & 1 deletion generatedTypes/components/card/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ declare const _default: React.ComponentClass<ViewProps & Pick<import("react-nati
} | undefined;
activeBackgroundColor?: string | undefined;
useNative?: boolean | undefined;
customValue?: any; /**
customValue?: any;
/**
* card custom height
*/
style?: false | {} | ViewStyle | import("react-native").RegisteredStyle<ViewStyle> | import("react-native").RecursiveArray<false | ViewStyle | import("react-native").RegisteredStyle<ViewStyle> | null | undefined> | {
Expand Down
4 changes: 2 additions & 2 deletions generatedTypes/incubator/TextField/presets/default.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ declare const _default: {
enableErrors: boolean;
validateOnBlur: boolean;
floatingPlaceholderColor: {
focus: any;
focus: string;
error: any;
disabled: string;
};
labelColor: {
focus: any;
focus: string;
error: any;
disabled: string;
};
Expand Down
4 changes: 2 additions & 2 deletions generatedTypes/incubator/TextField/usePreset.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
error?: string | undefined;
disabled?: string | undefined;
} | {
focus: any;
focus: string;
error: any;
disabled: string;
};
Expand Down Expand Up @@ -1061,7 +1061,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
error?: string | undefined;
disabled?: string | undefined;
} | {
focus: any;
focus: string;
error: any;
disabled: string;
};
Expand Down
2 changes: 2 additions & 0 deletions generatedTypes/style/colors.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,7 @@ declare const colorObject: Colors & {
violet80: string;
white: string;
black: string;
} & {
primary: string;
};
export default colorObject;
2 changes: 1 addition & 1 deletion lib/components/WheelPicker/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class WheelPicker extends Component {

static defaultProps = {
labelStyle: {fontSize: Typography.text70.fontSize, fontFamily: Typography.text70.fontFamily},
color: Colors.blue30
color: Colors.primary
};

constructor(props) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/actionBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class ActionBar extends Component<ActionBarProps> {
<View row centerV paddingH-20={!centered} style={[this.styles.container, style]} {...others}>
{_.map(actions, (action, i) => (
<View key={i} flex {...this.getAlignment(i)}>
<Button link size={Button.sizes.medium} blue30 {...action}/>
<Button link size={Button.sizes.medium} primary {...action}/>
</View>
))}
</View>
Expand Down
2 changes: 1 addition & 1 deletion src/components/avatar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ function createStyles(props: AvatarProps) {
lineHeight: undefined
},
ribbon: {
backgroundColor: Colors.blue30,
backgroundColor: Colors.primary,
paddingHorizontal: 6,
paddingVertical: 3
}
Expand Down
Loading