More color updates

This commit is contained in:
Erick Clark 2020-04-04 19:47:53 -05:00
parent 9bf81cdbac
commit f592e35850
7 changed files with 22 additions and 22 deletions

View file

@ -5,14 +5,14 @@ h2 {
text-align: center; text-align: center;
} }
a, a:active, a:visited { a, a:active, a:visited {
color: #6D5354; color: #017C9A;
} }
a:hover { a:hover {
text-decoration: underline; text-decoration: underline;
} }
.btn, .btn:visited { .btn, .btn:visited {
background-color: #6D5354; background-color: #017C9A;
border-color: #6D5354; border-color: #017C9A;
color: #fff; color: #fff;
} }
.atc-header { .atc-header {
@ -42,7 +42,7 @@ a:hover {
.screens img { .screens img {
max-height: 288px; max-height: 288px;
margin-top: 1rem; margin-top: 1rem;
border: 1px #6D5354 solid; border: 1px #017C9A solid;
} }
@media (max-width : 576px) { @media (max-width : 576px) {

View file

@ -130,13 +130,13 @@ class TopToolbar extends Component {
<TouchableOpacity <TouchableOpacity
onPress={onFilterPress} onPress={onFilterPress}
style={{ style={{
backgroundColor: '#E5E5E5', backgroundColor: '#D4EAEF',
borderRadius: 3, borderRadius: 3,
marginHorizontal: 10, marginHorizontal: 10,
paddingVertical: 5, paddingVertical: 5,
paddingHorizontal: 8, paddingHorizontal: 8,
}}> }}>
<FAIcon name="filter" style={{ fontSize: 22 }} /> <FAIcon name="filter" style={{ fontSize: 22, color: palette.primaryColor }} />
</TouchableOpacity> </TouchableOpacity>
)} )}
</View> </View>

View file

@ -175,7 +175,7 @@ export const FoodItemDetail = (props: Props) => {
<RouterButton <RouterButton
title="Log in to update quantity" title="Log in to update quantity"
to={loginWithBackto(`/foodItem/${foodItem.id}?loginAction=open-quantity-modal`)} to={loginWithBackto(`/foodItem/${foodItem.id}?loginAction=open-quantity-modal`)}
color={theme.palette.primaryColor} color={theme.actionButton.speedDialActionIcon.backgroundColor}
/> />
)} )}
</View> </View>

View file

@ -1,7 +1,7 @@
// @flow // @flow
import React from 'react'; import React from 'react';
import { View, Text } from 'react-native'; import { View, Text } from 'react-native';
// import atcCookieImage from '../imgs/atc-cookie-logo.png'; import wttpImage from '../imgs/toilet-paper-solid.png';
import { Link } from 'react-router-native'; import { Link } from 'react-router-native';
import RouterButton from 'react-router-native-button'; import RouterButton from 'react-router-native-button';
import { compose, withHandlers, withState } from 'recompose'; import { compose, withHandlers, withState } from 'recompose';
@ -36,11 +36,11 @@ const LandingPage = ({ skipIfAlreadyChosen, loading }: Props) => {
flex: 1, flex: 1,
height: '100%', height: '100%',
}}> }}>
{/* <Image { <Image
source={atcCookieImage} source={wttpImage}
style={{ height: 320, marginBottom: 10 }} style={{ height: 320, marginBottom: 10 }}
resizeMode="contain" resizeMode="contain"
/> */} /> }
<Text style={{ fontSize: 24, marginBottom: 30, textAlign: 'center', width: 330 }}> <Text style={{ fontSize: 24, marginBottom: 30, textAlign: 'center', width: 330 }}>
We need to use your location to bring you the best experience possible. We need to use your location to bring you the best experience possible.
</Text> </Text>

View file

@ -140,7 +140,7 @@ const LoginPageComponent = ({
<View style={{ flexDirection: 'row', padding: 16, paddingBottom: 0, paddingTop: 32 }}> <View style={{ flexDirection: 'row', padding: 16, paddingBottom: 0, paddingTop: 32 }}>
<View style={{ flex: 1, flexDirection: 'column' }}> <View style={{ flex: 1, flexDirection: 'column' }}>
<Button title={submitTitle} onPress={submitAction} color={theme.palette.primaryColor} /> <Button title={submitTitle} onPress={submitAction} color={theme.actionButton.speedDialActionIcon.backgroundColor} />
</View> </View>
</View> </View>

View file

@ -5,11 +5,11 @@
*/ */
import { COLOR } from 'react-native-material-ui'; import { COLOR } from 'react-native-material-ui';
export const primaryColor = '#6d5354'; export const primaryColor = '#017C9A';
export const palette = { export const palette = {
primaryColor, primaryColor,
accentColor: '#0E6E9E', accentColor: '#017C9A',
disabledColor: COLOR.grey500, disabledColor: COLOR.grey500,
facebook: '#3B5998', facebook: '#3B5998',
google: '#DB4437', google: '#DB4437',
@ -18,7 +18,7 @@ export const palette = {
}; };
export default { export default {
statusBarColor: '#412A2B', statusBarColor: '#00506C',
palette: palette, palette: palette,
toolbar: { toolbar: {
titleText: { color: COLOR.white }, titleText: { color: COLOR.white },
@ -32,12 +32,12 @@ export default {
}, },
actionButton: { actionButton: {
speedDialActionIcon: { speedDialActionIcon: {
backgroundColor: '#48A0CC', backgroundColor: '#00506C',
}, },
}, },
checkbox: { checkbox: {
icon: { icon: {
color: '#0E6E9E', color: '#017C9A',
}, },
}, },
page: { page: {
@ -89,18 +89,18 @@ export default {
pressHighlightColor: COLOR.pink500, pressHighlightColor: COLOR.pink500,
}, },
countBadge: { countBadge: {
backgroundColor: primaryColor, backgroundColor: '#00506C',
textColor: COLOR.white, textColor: COLOR.white,
}, },
pickerItemRow: { pickerItemRow: {
defaultColor: '#000000', defaultColor: '#000000',
selectedColor: '#0E6E9E', selectedColor: '#017C9A',
}, },
foodItemDetails: { foodItemDetails: {
actionIconColor: '#0E6E9E', actionIconColor: '#017C9A',
}, },
placeDetails: { placeDetails: {
actionIconColor: '#0E6E9E', actionIconColor: '#017C9A',
}, },
imagePreview: { imagePreview: {
deleteBtnIconColor: 'white', deleteBtnIconColor: 'white',
@ -131,7 +131,7 @@ export default {
elevation: 6, elevation: 6,
}, },
contentContainer: { contentContainer: {
backgroundColor: '#6D5354', backgroundColor: '#017C9A',
height: 150, height: 150,
}, },
}, },

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB