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.

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

Develop #53

Merged
merged 69 commits into from
Jul 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
e1ac6b8
Merge pull request #20 from MabelM1/master
mm1123452 Jun 20, 2020
da0f670
fix: README
Av1sa Jun 22, 2020
cf888c5
Merge pull request #29 from MabelM1/master
tantany Jul 1, 2020
c30c259
feat: update page width
julieg18 Jul 1, 2020
2225c2f
feat: update header screen sizes
julieg18 Jul 1, 2020
74a1203
fix: change header bg image at 425px
julieg18 Jul 1, 2020
2c855fa
Merge pull request #30 from MabelM1/feature/update-header-media-queries
julieg18 Jul 1, 2020
f6de8e9
feat: update hello-there sizes
julieg18 Jul 1, 2020
a84cb4d
Merge pull request #31 from MabelM1/feature/update-hello-there-sizes
julieg18 Jul 1, 2020
d0c786d
change to be ignored
tantany Jul 1, 2020
936756e
Merge branch 'develop' of https://github.com/MabelM1/Out-of-bounds in…
tantany Jul 1, 2020
14835c6
feature: reactive carousel and js cosmetic changes
tantany Jul 1, 2020
c38ba5c
feature: reactive carousel and js cosmetic changes.
tantany Jul 1, 2020
6274e96
feature: reactive carousel and js cosmetic changes and comment delete
tantany Jul 1, 2020
419e797
feat:implement responsive addition-info section
mm1123452 Jul 2, 2020
ce2c917
feature: unity of code and distinguishing the slides
tantany Jul 2, 2020
b3759a3
fix: about carousel didn't work
tantany Jul 2, 2020
c3039c7
fix: delete console.log and export default
tantany Jul 3, 2020
ffa55bb
Merge pull request #33 from MabelM1/feature/carousel
tantany Jul 3, 2020
10ae255
hotfix: correct sizing and updates
mm1123452 Jul 3, 2020
7feb291
merge branch develop
mm1123452 Jul 3, 2020
1e8e654
Merge pull request #34 from MabelM1/feature/learn-more-responsive
mm1123452 Jul 4, 2020
ad99edd
Merge branch 'develop' of github.com:MabelM1/Out-of-bounds into develop
Av1sa Jul 9, 2020
c899b57
feat: update footer for new screen sizes
Av1sa Jul 9, 2020
57120df
Merge pull request #35 from MabelM1/footer-update
julieg18 Jul 9, 2020
2098ab6
feat:update about responsive sizes
mm1123452 Jul 9, 2020
c595b75
Merge pull request #37 from MabelM1/feature/about-responsive
mm1123452 Jul 10, 2020
3c43ec9
fix: donation button padding
Av1sa Jul 22, 2020
8e82ba7
fix: update hello-there media queries
julieg18 Jul 23, 2020
3bd9c40
fix: edit hello there width to match other blocks
julieg18 Jul 23, 2020
decd2a8
Merge pull request #39 from MabelM1/feature/update-hello-there-size
julieg18 Jul 23, 2020
ea54f4e
fix: various elements in different media queries
Av1sa Jul 24, 2020
eb1921c
feat: form validation added
Av1sa Jul 24, 2020
eaa1090
fix: form validation small fixes
Av1sa Jul 25, 2020
ea458f5
fix: formatting
Av1sa Jul 25, 2020
b2f54ec
fix: formatting and small issues
Av1sa Jul 25, 2020
ba5eb59
Merge pull request #41 from MabelM1/donations-fixes
Av1sa Jul 25, 2020
4ad7eb3
feat: set up webpack
julieg18 Jul 25, 2020
09a2883
Merge pull request #42 from MabelM1/feature/set-up-webpack
julieg18 Jul 25, 2020
fc68f42
feat: update donation input errors
julieg18 Jul 25, 2020
090eb41
feat: api request
mm1123452 Jul 25, 2020
580c363
Merge pull request #43 from MabelM1/feature/improve-form-errors
julieg18 Jul 25, 2020
328cfd2
feat: read values from input
mm1123452 Jul 25, 2020
0354efc
fix: remove console.log
mm1123452 Jul 25, 2020
eb06b61
fix: switch to single quotes
mm1123452 Jul 26, 2020
06d96ac
Merge pull request #44 from MabelM1/feature/api
mm1123452 Jul 26, 2020
6ff1737
feat: work on making donations radio btn editable
julieg18 Jul 26, 2020
6f716db
feat: complete making donations radio btn editable
julieg18 Jul 27, 2020
a673f5b
feat: improve formatting on JS code
julieg18 Jul 28, 2020
dde92d1
refactor: update api postPledge parameters
julieg18 Jul 28, 2020
0c7570f
Merge pull request #45 from MabelM1/feature/make-custom-donations-btn…
julieg18 Jul 28, 2020
4e6c9e9
fix: change donations radio button text
julieg18 Jul 28, 2020
c5feaca
Merge pull request #46 from MabelM1/feature/change-donations-radio-text
julieg18 Jul 28, 2020
cb29f92
fix: delete extra padding in hello-there block
julieg18 Jul 28, 2020
bf8efbd
fix: fix additional-info link design and href
julieg18 Jul 28, 2020
592fc8c
Merge pull request #47 from MabelM1/feature/update-additional-info
julieg18 Jul 28, 2020
edf4fe3
feat: complete code for dropdown menu
julieg18 Jul 28, 2020
ad5a4d6
feat: carousel buttons painted yellow on hover
tantany Jul 28, 2020
4f2191a
Merge pull request #49 from MabelM1/feature/carousel
tantany Jul 28, 2020
eecd470
fix: delete unneeded class in dropdown-menu html
julieg18 Jul 28, 2020
6a210c7
feat: change dropdown menu to side menu
julieg18 Jul 28, 2020
23342c7
Merge pull request #48 from MabelM1/feature/dropdown-menu
julieg18 Jul 28, 2020
c82967f
fix: fix padding on hello-there
julieg18 Jul 29, 2020
25b025f
fix: fix margin in additional-info
julieg18 Jul 29, 2020
08b4e00
Merge pull request #50 from MabelM1/feature/fix-hello-there-padding
julieg18 Jul 30, 2020
d67c969
Merge pull request #51 from MabelM1/feature/fix-additional-info-margin
julieg18 Jul 30, 2020
3dd16c8
fix: delete unneeded image
julieg18 Jul 30, 2020
6479c1d
refactor: correct inconsistencies in CSS files
julieg18 Jul 30, 2020
72d7bc9
Merge pull request #52 from MabelM1/feature/correct-css-inconsistency
julieg18 Jul 30, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
dist
17 changes: 17 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const presets = [
[
'@babel/env',
{
targets: {
edge: '17',
ie: '11',
firefox: '50',
chrome: '64',
safari: '11.1',
},
useBuiltIns: 'entry',
},
],
];

module.exports = { presets };
18 changes: 0 additions & 18 deletions blocks/additional-info/__link/additional-info__link.css

This file was deleted.

11 changes: 0 additions & 11 deletions blocks/additional-info/__list-item/additional-info__list-item.css

This file was deleted.

19 changes: 0 additions & 19 deletions blocks/additional-info/__subtitle/additional-info__subtitle.css

This file was deleted.

20 changes: 0 additions & 20 deletions blocks/additional-info/__title/additional-info__title.css

This file was deleted.

25 changes: 0 additions & 25 deletions blocks/additional-info/additional-info.css

This file was deleted.

10 changes: 0 additions & 10 deletions blocks/arrow-icon/arrow-icon.css

This file was deleted.

Binary file removed blocks/arrow-icon/blue-arrow.png
Binary file not shown.
Binary file removed blocks/arrow-icon/yellow-arrow.png
Binary file not shown.
7 changes: 0 additions & 7 deletions blocks/carousel/__bg-image/carousel__bg-image.css

This file was deleted.

3 changes: 0 additions & 3 deletions blocks/carousel/__indicators/carousel__indicators.css

This file was deleted.

This file was deleted.

This file was deleted.

18 changes: 0 additions & 18 deletions blocks/carousel/__slide-button/carousel__slide-button.css

This file was deleted.

4 changes: 0 additions & 4 deletions blocks/carousel/__slide/_type/carousel__slide_type_about.css

This file was deleted.

This file was deleted.

18 changes: 0 additions & 18 deletions blocks/donations/__input/donations__input.css

This file was deleted.

19 changes: 0 additions & 19 deletions blocks/footer/footer.css

This file was deleted.

6 changes: 0 additions & 6 deletions blocks/header/__links/header__links.css

This file was deleted.

32 changes: 0 additions & 32 deletions blocks/header/header.css

This file was deleted.

Binary file removed images/button-slide-next.png
Binary file not shown.
Binary file removed images/button-slide-prev.png
Binary file not shown.
Binary file removed images/phone-header-bg.png
Binary file not shown.
Loading