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

Jump to bottom

Develop #53

Merged
merged 69 commits into from
Jul 31, 2020
Merged

Develop #53

merged 69 commits into from
Jul 31, 2020

Conversation

tantany
Copy link
Collaborator

@tantany tantany commented Jul 30, 2020

No description provided.

mm1123452 and others added 30 commits June 20, 2020 08:22
@mm1123452
Merge pull request #20 from MabelM1/master
e1ac6b8 
Sync master and dev
@Av1sa
fix: README
da0f670
@tantany
Merge pull request #29 from MabelM1/master
cf888c5 
Get back to develop branch so we can add new features
@julieg18
feat: update page width
c30c259
@julieg18
feat: update header screen sizes
2225c2f
@julieg18
fix: change header bg image at 425px
74a1203
@julieg18
Merge pull request #30 from MabelM1/feature/update-header-media-queries
2c855fa
@julieg18
feat: update hello-there sizes
f6de8e9
@julieg18
Merge pull request #31 from MabelM1/feature/update-hello-there-sizes
a84cb4d
@tantany
change to be ignored
d0c786d
@tantany
Merge branch 'develop' of https://github.com/MabelM1/Out-of-bounds in…
936756e 
…to develop
@tantany
feature: reactive carousel and js cosmetic changes
14835c6
@tantany
feature: reactive carousel and js cosmetic changes.
c38ba5c
@tantany
feature: reactive carousel and js cosmetic changes and comment delete
6274e96
@mm1123452
feat:implement responsive addition-info section
419e797
@tantany
feature: unity of code and distinguishing the slides
ce2c917
@tantany
fix: about carousel didn't work
b3759a3
@tantany
fix: delete console.log and export default
c3039c7
@tantany
Merge pull request #33 from MabelM1/feature/carousel
ffa55bb 
Feature/carousel
@mm1123452
hotfix: correct sizing and updates
10ae255
@mm1123452
merge branch develop
7feb291
@mm1123452
Merge pull request #34 from MabelM1/feature/learn-more-responsive
1e8e654 
feat:implement responsive learn-more section
@Av1sa
Merge branch 'develop' of github.com:MabelM1/Out-of-bounds into develop
ad99edd
@Av1sa
feat: update footer for new screen sizes
c899b57
@julieg18
Merge pull request #35 from MabelM1/footer-update
57120df
@mm1123452
feat:update about responsive sizes
2098ab6
@mm1123452
Merge pull request #37 from MabelM1/feature/about-responsive
c595b75 
feat:update about responsive sizes
@Av1sa
fix: donation button padding
3c43ec9
@julieg18
fix: update hello-there media queries
8e82ba7
@julieg18
fix: edit hello there width to match other blocks
3bd9c40
julieg18 and others added 28 commits July 25, 2020 15:37
@julieg18
Merge pull request #43 from MabelM1/feature/improve-form-errors
580c363
@mm1123452
feat: read values from input
328cfd2
@mm1123452
fix: remove console.log
0354efc
@mm1123452
fix: switch to single quotes
eb06b61
@mm1123452
Merge pull request #44 from MabelM1/feature/api
06d96ac 
Feature/api
@julieg18
feat: work on making donations radio btn editable
6ff1737
@julieg18
feat: complete making donations radio btn editable
6f716db
@julieg18
feat: improve formatting on JS code
a673f5b
@julieg18
refactor: update api postPledge parameters
dde92d1
@julieg18
Merge pull request #45 from MabelM1/feature/make-custom-donations-btn…
0c7570f 
…-editable
@julieg18
fix: change donations radio button text
4e6c9e9
@julieg18
Merge pull request #46 from MabelM1/feature/change-donations-radio-text
c5feaca
@julieg18
fix: delete extra padding in hello-there block
cb29f92
@julieg18
fix: fix additional-info link design and href
bf8efbd
@julieg18
Merge pull request #47 from MabelM1/feature/update-additional-info
592fc8c
@julieg18
feat: complete code for dropdown menu
edf4fe3
@tantany
feat: carousel buttons painted yellow on hover
ad5a4d6
@tantany
Merge pull request #49 from MabelM1/feature/carousel
4f2191a 
feat: carousel buttons painted yellow on hover
@julieg18
fix: delete unneeded class in dropdown-menu html
eecd470
@julieg18
feat: change dropdown menu to side menu
6a210c7
@julieg18
Merge pull request #48 from MabelM1/feature/dropdown-menu
23342c7
@julieg18
fix: fix padding on hello-there
c82967f
@julieg18
fix: fix margin in additional-info
25b025f
@julieg18
Merge pull request #50 from MabelM1/feature/fix-hello-there-padding
08b4e00
@julieg18
Merge pull request #51 from MabelM1/feature/fix-additional-info-margin
d67c969
@julieg18
fix: delete unneeded image
3dd16c8
@julieg18
refactor: correct inconsistencies in CSS files
6479c1d
@julieg18
Merge pull request #52 from MabelM1/feature/correct-css-inconsistency
72d7bc9
julieg18
julieg18 approved these changes Jul 30, 2020
View reviewed changes
Copy link
Collaborator

@julieg18 julieg18 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@tantany tantany merged commit 9af2071 into master Jul 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julieg18 julieg18 julieg18 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tantany @julieg18 @mm1123452 @Av1sa