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

merge dev into master #1135

Merged
merged 27 commits into from
Oct 22, 2024
Merged

merge dev into master #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e5882ce
modify font in login button
atalyaalon Oct 22, 2024
97e6840
Merge pull request #1134 from data-for-change/ref-1132-modify-font
atalyaalon Oct 22, 2024
e8056bf
set background color to null in img download
atalyaalon Oct 22, 2024
10b9222
Merge pull request #1137 from data-for-change/bug-1136-axis-partial
atalyaalon Oct 22, 2024
dd5cb32
update oryarok road img color
atalyaalon Oct 22, 2024
37a2a30
set foreignObjectRendering in img download
atalyaalon Oct 22, 2024
a0be618
Merge pull request #1138 from data-for-change/bug-1136-axis-partial
atalyaalon Oct 22, 2024
f0cdd8b
revert last changes in html2canvas
atalyaalon Oct 22, 2024
fd1814a
modify DEFAULTE_SIZE of AnyWayCard
atalyaalon Oct 22, 2024
6f5d5eb
Merge pull request #1139 from data-for-change/bug-1136-axis-partial
atalyaalon Oct 22, 2024
008bd4c
modify DEFAULTE_SIZE of AnyWayCard
atalyaalon Oct 22, 2024
b829f3c
Merge branch 'dev' into bug-1136-axis-partial
atalyaalon Oct 22, 2024
f3d1bd6
Merge pull request #1140 from data-for-change/bug-1136-axis-partial
atalyaalon Oct 22, 2024
b5e8021
revert DEFAULTE_SIZE modification
atalyaalon Oct 22, 2024
2d96ee9
modify card width and height
atalyaalon Oct 22, 2024
e1ec0f0
Merge pull request #1141 from data-for-change/bug-1136-axis-partial
atalyaalon Oct 22, 2024
c5afdc1
revert card size, decrease content size
atalyaalon Oct 22, 2024
926853b
Merge pull request #1142 from data-for-change/bug-1136-axis-partial
atalyaalon Oct 22, 2024
513611e
modify content margin,height,width
atalyaalon Oct 22, 2024
05b8f6b
Merge pull request #1143 from data-for-change/bug-1136-axis-partial
atalyaalon Oct 22, 2024
87a2e30
modify content margin,height,width
atalyaalon Oct 22, 2024
124be2e
modify borderRadius
atalyaalon Oct 22, 2024
5f4fbef
Merge pull request #1144 from data-for-change/bug-1136-axis-partial
atalyaalon Oct 22, 2024
ede02e0
modify content margins, padding, borderRadius
atalyaalon Oct 22, 2024
fe4ad66
Merge pull request #1145 from data-for-change/bug-1136-axis-partial
atalyaalon Oct 22, 2024
1357a6e
revert content changes
atalyaalon Oct 22, 2024
e3bd442
Merge pull request #1146 from data-for-change/bug-1136-axis-partial
atalyaalon Oct 22, 2024
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
Binary file modified src/assets/card-bg-road-oryarok.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/molecules/LogInLinkGoogle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const useStyles = makeStyles((theme) => ({
padding: theme.spacing(1),
color: `${oceanBlueColor}`,
textDecoration: 'none',
fontFamily: 'Rubik',
'&:hover': {
color: `${skyBlueColor}`,
},
Expand Down