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

Don’t close or merge - Feedback #1

Open
wants to merge 116 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
853383e
Setting up GitHub Classroom Feedback
github-classroom[bot] Apr 27, 2023
ed66dd1
Add assignment deadline url
github-classroom[bot] May 1, 2023
73a9f3d
files architecture
MajaBru May 2, 2023
550796f
main + sections
MajaBru May 2, 2023
c87e2e4
Update README.md
MajaBru May 2, 2023
ff9cfbb
Merge pull request #2 from AdvancedCSS2023/dev
MajaBru May 2, 2023
4e1acd2
multiple elements to the intro scene + gsap in js
MajaBru May 3, 2023
3d4c8ce
Merge branch 'dev' of https://github.com/AdvancedCSS2023/assignment-3…
MajaBru May 3, 2023
a522c93
tweaks
MajaBru May 4, 2023
58d9969
ocean svg scroll animation
MajaBru May 4, 2023
0eaf336
sticky function to ocean
MajaBru May 4, 2023
f162869
seamless ocean fix
MajaBru May 4, 2023
c3ff24c
fonts added, moved keyframes
MajaBru May 4, 2023
4dcd239
naming changes
MajaBru May 5, 2023
d10b739
man_think_section
sabria23 May 5, 2023
9e41038
e
MajaBru May 5, 2023
66d65c0
Merge pull request #4 from AdvancedCSS2023:dev
sabria23 May 5, 2023
a59c28c
added beach
MajaBru May 5, 2023
afdec71
cloud changeup and some responsiveness
MajaBru May 5, 2023
d068307
changes to mediaq, colors, scroll, + added stuff
MajaBru May 6, 2023
df38fa5
removed sum stuff
MajaBru May 6, 2023
8f30e54
removed sections
MajaBru May 6, 2023
5d09bc1
conflict?
MajaBru May 6, 2023
19b599c
Merge branch 'ocean' of https://github.com/AdvancedCSS2023/assignment…
MajaBru May 6, 2023
5bb15d9
intro, bottle, man, boat animations ++
MajaBru May 7, 2023
1c8d348
small improvements
MajaBru May 7, 2023
800cfcc
small fixes for orientation
MajaBru May 7, 2023
cb40582
testing responsiveness
MajaBru May 7, 2023
015babd
major layout change. Splitscreen grid, gsap anim
MajaBru May 8, 2023
e103d83
matchmedia test
MajaBru May 8, 2023
d6d8fb4
added animation, fixed other stuff
MajaBru May 10, 2023
6fd6aa9
Merge pull request #7 from MajaBru/scroller-test
MajaBru May 10, 2023
2184a4d
changed intersection
MajaBru May 10, 2023
0aaefe2
added fish container
sabria23 May 10, 2023
33fa932
change
sabria23 May 10, 2023
a139acc
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
sabria23 May 10, 2023
16b8eba
fish edit
sabria23 May 10, 2023
0a7fb4c
changed fish-container
sabria23 May 10, 2023
4102826
change palms
sabria23 May 10, 2023
1d40fe3
added stuff to "actions" slide, animated man, text
MajaBru May 10, 2023
2e20dd5
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
MajaBru May 10, 2023
e4f8274
palm_change
sabria23 May 10, 2023
dc2e18c
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
sabria23 May 10, 2023
b2b38a8
animation put all in animations.scss
sabria23 May 10, 2023
1b2c514
blinking eye animation
MajaBru May 10, 2023
815581e
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
MajaBru May 10, 2023
420a9f4
update
MajaBru May 10, 2023
e6b7113
gsap fixes
MajaBru May 11, 2023
54fbd85
e
MajaBru May 11, 2023
a7ebf4d
update
MajaBru May 11, 2023
052e2b6
added stuff
MajaBru May 11, 2023
240a280
changed bird img and sidebox animation
sabria23 May 11, 2023
67d22c6
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
sabria23 May 11, 2023
a27976f
fixed man animation
MajaBru May 11, 2023
de441ac
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
MajaBru May 11, 2023
c29e605
cup animation, other fixes
MajaBru May 11, 2023
722d9f6
changed co2
sabria23 May 11, 2023
5be2d3c
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
sabria23 May 11, 2023
4eb075b
update
MajaBru May 11, 2023
034af81
changed animation for text
sabria23 May 11, 2023
6d338cb
changed the last scene
sabria23 May 11, 2023
ba87087
some media queries
MajaBru May 11, 2023
631d584
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
MajaBru May 11, 2023
2f69fd3
fixed fish animation
sabria23 May 11, 2023
9e61894
edited learn-more div
sabria23 May 11, 2023
e806e61
edit
MajaBru May 11, 2023
e73ae6a
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
MajaBru May 11, 2023
71fa78b
edit
sabria23 May 11, 2023
942da73
edit
MajaBru May 11, 2023
c0e93dd
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
MajaBru May 11, 2023
58921a9
e
MajaBru May 11, 2023
6a7ed91
edit
sabria23 May 11, 2023
c248a1d
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
sabria23 May 11, 2023
d510d7f
edit
sabria23 May 11, 2023
ab05778
edit
sabria23 May 11, 2023
8f766c1
edit
sabria23 May 11, 2023
fc13058
edit
sabria23 May 11, 2023
156059d
update
MajaBru May 11, 2023
436f8a4
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
MajaBru May 11, 2023
9877052
edit
sabria23 May 11, 2023
9e6f43b
update
MajaBru May 11, 2023
6a6943a
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
MajaBru May 11, 2023
21af10b
many changes
MajaBru May 12, 2023
378cd94
reduced motion, responsiveness text changes
MajaBru May 12, 2023
858c3da
small fix
MajaBru May 12, 2023
f5c41d9
edit
sabria23 May 12, 2023
dfbf8c0
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
sabria23 May 12, 2023
08d8f1d
edit
sabria23 May 12, 2023
eb4c894
Edit text
sabria23 May 13, 2023
b6912c1
minor fixes
MajaBru May 14, 2023
0e6dd06
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
MajaBru May 14, 2023
01b3052
more fixes and additions
MajaBru May 14, 2023
5dc684e
update readme
MajaBru May 14, 2023
b5cd9ec
edit
MajaBru May 14, 2023
63a96fb
edit
sabria23 May 14, 2023
c3cfca6
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
sabria23 May 14, 2023
f5ff885
readme update
MajaBru May 14, 2023
1818945
readme update
MajaBru May 14, 2023
76bbce3
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
MajaBru May 14, 2023
8155a8d
removed files
MajaBru May 14, 2023
8b0953e
edit fish
sabria23 May 14, 2023
1b3c013
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
sabria23 May 14, 2023
2712073
edit
MajaBru May 14, 2023
0fb1f71
e
MajaBru May 14, 2023
82894c1
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
MajaBru May 14, 2023
30f772d
update
MajaBru May 14, 2023
7b2f903
edit
sabria23 May 14, 2023
0ab207f
Merge branch 'scroller-test' of https://github.com/AdvancedCSS2023/as…
sabria23 May 14, 2023
8c37704
Merge branch 'main' into scroller-test
MajaBru May 14, 2023
af7a281
Merge pull request #9 from AdvancedCSS2023/scroller-test
MajaBru May 14, 2023
68d3e31
added missing cloud
MajaBru May 14, 2023
5bea442
some tweaks
MajaBru May 14, 2023
b7999b2
added logo
MajaBru May 14, 2023
9277439
Update README.md
MajaBru May 14, 2023
2352fa6
Update README.md
MajaBru May 14, 2023
d3f0447
Update README.md
MajaBru May 14, 2023
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
27 changes: 27 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,28 @@
# Scrollytelling website: Goal 14 | Life below water

### What the project does
The project aims to deliver an animated scrollable website about [UN goal 14](https://www.globalgoals.org/goals/14-life-below-water/): Life below water. Goal 14 focuses on the conservation and sustainable use of the world's oceans, seas, and marine resources. It addresses the significant challenges faced by marine ecosystems due to pollution, climate change, overfishing, and habitat destruction. The project created primarily tackles the human aspect, and how our behavior tends affects the oceans negatively, but also shows how humans can change for the better.
### Why the project is useful
The project is useful since it helps to raise awereness about the importance of protecting marine life and achieving sustainable development. The goal with the webpage is to encourage viewers to become more enlightened on the subject and feel inspired to take action. The page is meant for the target audience: adults between 35-45 years old, so it should be mostly useful for this group, but also the general public. The design is meant to be illustrative as well as easy to read and understand.
### How users can get started with the project
This is how users and developers can get started with the project:
1. If you seek to do further development or simply look into the code, fork the project repository and clone it locally. This way, one is able to make any changes and experiment with the exisiting code. Open the repository in Visual Studio Code, and you are set to begin.
2. Optionally, you could clone the project directly, make desired changes in a new branch and create a pull request that can be reviewed upon.
3. If you want to just see and experience the webpage, the link is found down below.
### Where users can get help with your project
Users can reach out to the project maintainers and contributors thourgh the GitHub repository's issue tracker for any questions or help needed. If not, then users are open to contact the contributors directly.
### Which technology is used
The technology used in this project include: HTML, CSS/SASS, BEM, Figma, Javascript and GSAP (GreenStock Animation Platform). Using SASS allows us to organize the code in a clearer and more efficient manner than with regular CSS. This also allows us to use SASS variables and BEM intertwined with SASS which comes in handy. We used Live Sass Compiler extention for compiling the files. In the Javascript, Intersection Observer API was utilized alongside GSAP library. Since the page is intended to be a scrollytelling experience, we used primarily GSAP "Scrolltrigger" plugin to to coordinate how elements move with scroll, and this allows us to give an immersive experience. While the intersection observer controls how text and other elements animates in.
#### Other notes
- It was attempted to get this webpage more responsive, and most of it runs alright to an extent when switching to landscape orientation. The struggle was mostly getting story responsive with GSAP, so there are a few bugs in that translation.
- "@import animations" had to be included in the beginning of the "layout.scss" in order for the files to run without facing problems. There was an attempt to fix this in the "index.scss" file, but even when "@import layout" was stated after "animations", the files did not communicate as they should have.
### Who maintains and contributes to the project
This project was made during the course [Advanced CSS](https://www.ntnu.edu/studies/courses/IDG1293/#tab=omEmnet) as part of a portfolio project.
The contents of the page is created and maintained by Maja Brunsvik and Sabrina Altahrawi, web development students at NTNU.

## Visit our webpage
[Scrollytelling website - Life below water](https://advancedcss2023.github.io/assignment-3--scrollytelling-group-6/)


[![Review Assignment Due Date](https://classroom.github.com/assets/deadline-readme-button-24ddc0f5d75046c5622901739e7c5dd533143b0c8e959d652212380cedb1ea36.svg)](https://classroom.github.com/a/E1TYCvbT)
[![Open in Visual Studio Code](https://classroom.github.com/assets/open-in-vscode-718a45dd9cf7e7f842a935f5ebbe5719a5e09af4491e668f4dbf3b35d5cca122.svg)](https://classroom.github.com/online_ide?assignment_repo_id=11008367&assignment_repo_type=AssignmentRepo)
Binary file added assets/img/beach-cleaning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
179 changes: 179 additions & 0 deletions assets/img/beach-second.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
128 changes: 128 additions & 0 deletions assets/img/big_garbage.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions assets/img/birds.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions assets/img/boat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions assets/img/bottle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions assets/img/bulb-idea.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/img/cloud-bigger.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/img/cloud.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions assets/img/co2 puff.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading