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

First test #36

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

First test #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c3e8649
Add .circleci/config.yml
sebastien-lb Oct 19, 2020
4b14e74
Update config.yml
sebastien-lb Oct 19, 2020
f487194
Kcal in red
Izaya-San Oct 20, 2020
c8adabe
Kcal in white
Izaya-San Oct 20, 2020
a487ecf
Add .circleci/config.yml
Izaya-San Oct 20, 2020
ac65737
Update config.yml
Izaya-San Oct 20, 2020
2134513
Update config.yml
Izaya-San Oct 20, 2020
f44c00b
Kcal in blue
Izaya-San Oct 20, 2020
0ed5162
Merge remote-tracking branch 'origin/circleci-project-setup' into fir…
Izaya-San Oct 20, 2020
7f7b6f1
add bug
Izaya-San Oct 20, 2020
2bf88e1
remove bug
Izaya-San Oct 20, 2020
bd6a018
test
Izaya-San Oct 21, 2020
4455010
test
Izaya-San Oct 21, 2020
5113926
test
Izaya-San Oct 21, 2020
595299e
test
Izaya-San Oct 21, 2020
027bbbb
test
Izaya-San Oct 21, 2020
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
7 changes: 7 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2.1
orbs:
welcome: circleci/[email protected]
workflows:
welcome:
jobs:
- welcome/run
1 change: 1 addition & 0 deletions src/components/FoodTile/FoodTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ const styles = (theme: CustomTheme): Record<ClassNames, CSSProperties> => ({
},
name: {
color: "black",
fontFamily: "Arial Narrow, sans-serif",
fontWeight: "bold"
},
controls: {
Expand Down
2 changes: 1 addition & 1 deletion src/style/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const theme: CustomTheme = createMuiTheme({
"transparent linear-gradient(101deg, #F78E0D 0%, #F9C41C 100%) 0% 0% no-repeat padding-box"
},
contained: {
color: "white",
color: "blue",
boxShadow: "0px 2px 20px #00000029"
},
label: {
Expand Down
Loading