Merge remote-tracking branch 'gitlab/master'

This commit is contained in:
Bart Akeley 2017-04-26 22:06:36 -05:00
commit 27ad3d5769
2 changed files with 4 additions and 4 deletions

Binary file not shown.

View file

@ -10,7 +10,7 @@ export const primaryColor = '#6d5354';
export default {
palette: {
primaryColor,
accentColor: '#9c7f80',
accentColor: '#0E6E9E',
disabledColor: COLOR.grey500,
},
toolbar: {
@ -19,7 +19,7 @@ export default {
rightElement: { color: COLOR.white },
container: {
backgroundColor: primaryColor,
height: 50,
height: 56,
elevation: 0,
},
},
@ -38,7 +38,7 @@ export default {
thumbnailSize: 50,
thumbnailColor: COLOR.grey500,
itemNameStyle: {
color: COLOR.grey800,
color: COLOR.black,
},
itemPlaceStyle: {
color: COLOR.grey500,
@ -54,7 +54,7 @@ export default {
textColor: COLOR.white,
},
quantityPicker: {
color: COLOR.blue500,
color: '#0E6E9E',
},
foodItemDetails: {
actionIconColor: COLOR.blue500,