-
Notifications
You must be signed in to change notification settings - Fork 0
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
github-classroom
wants to merge
41
commits into
feedback
Choose a base branch
from
main
base: feedback
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
366085d
Setting up GitHub Classroom Feedback
github-classroom[bot] 1b7124a
Added the Questions for the READMe.MD
MariamA3 8b8dfc2
Added images, text and SASS so we can build on top of it
MariamA3 dea2c5f
Merge pull request #2 from AdvancedCSS2023/master
MariamA3 d97aed1
Add assignment deadline url
github-classroom[bot] 1e9d114
Lost my files, putting this in as a start
MariamA3 2b078c5
Added more sea life on scene 1
MariamA3 13e2d4b
added more sea creatures to scene 1
MariamA3 2abda09
Add files via upload
julimle1 9f0b81c
Update style.scss
julimle1 2c40a50
Update index.html
julimle1 8a1ded7
Add files via upload
julimle1 c2c7209
Progress on scene 3. Added images,
hakonrh 2781790
Added animated fish and text to scene 3
hakonrh f7df8bd
Added scene 4.
hakonrh 6b8f3fa
Added animations for scene 1, done.
MariamA3 28508ea
removed some unimportant things
MariamA3 579435c
scene2
MariamA3 f6004f2
Answered readme questions
MariamA3 15043a4
done with the scenes
MariamA3 8367b6e
Merge pull request #3 from AdvancedCSS2023/scene1to2
MariamA3 8d05a17
fixed intersection observer so it observes all image-containers
MariamA3 84190af
Some small reorganization in the css
hakonrh 39a8372
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
hakonrh f8d5cdf
Merge branch 'scene-3-4'
hakonrh 05a11d2
Merged to add scene 3 and 4
hakonrh 06c2cc1
Edited the scenes to fit together better
hakonrh 1659636
Merge branch 'main' into scene5-and-6
julimle1 eab4ed9
Merge pull request #4 from AdvancedCSS2023/scene5-and-6
julimle1 95392b8
added margin and changed goal to 14
hakonrh 3f256a1
Merge branch 'scenes1-4-combined'
hakonrh 001f1e7
Merged branch "scenes1-4-combined"
hakonrh 0c50d88
Added new animations for all scenes,
hakonrh aa44b4d
added reduced motion, orientation, and dark mode options
MariamA3 23cf50c
Added BEM
MariamA3 0a62475
Added new gradient to dark mode,
hakonrh 59d614b
checking to see if adding . helps with pages
MariamA3 93d18d0
fixing bugs for pages
MariamA3 566925e
found the issue, now pages should work
MariamA3 1f38c41
retry
MariamA3 14e6713
added link to pages website in README
MariamA3 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"liveServer.settings.port": 5501 | ||
} |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. could have higher quality markdown :) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,21 @@ | ||
[](https://classroom.github.com/a/E1TYCvbT) | ||
[](https://classroom.github.com/online_ide?assignment_repo_id=10969909&assignment_repo_type=AssignmentRepo) | ||
|
||
|
||
What does the project do? | ||
The project is a scrollytelling page that tells a story about the ocean and the effects of pollution on sea creatures. It uses JavaScript and CSS to create interactive animations and effects that are triggered as the user scrolls through the page. | ||
|
||
Why is the project useful? | ||
The project raises awareness about the issue of ocean pollution and its impact on sea creatures. It educates users on the problem and the importance of taking action to address it. Additionally, the interactive and engaging nature of the page helps to hold the user's attention and make the information more memorable. | ||
|
||
How can users get started with the project? | ||
Users can access the project by visiting the website ( https://advancedcss2023.github.io/assignment-3--scrollytelling-group_07/ ) or page where it is hosted. They can then begin scrolling through the page to experience the interactive effects and animations. No additional setup or installation is required. | ||
|
||
Where can users get help with the project? | ||
If users encounter any issues or have questions about the project, they can consult the developers for further assistance. | ||
|
||
Which technology is used? | ||
The project uses HTML,JavaScript and CSS to create the interactive effects and animations on the scrollytelling page. | ||
|
||
Who maintains and contributes to the project? | ||
Mariam, Håkon and julie |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should be ignored |
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,159 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
|
||
<head> | ||
<meta charset="UTF-8" /> | ||
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
<link rel="stylesheet" type="text/css" href="./styles/index.css" /> | ||
<script defer src="script.js"></script> | ||
<title>main__goal 14</title> | ||
</head> | ||
|
||
<body> | ||
<main class="main__goal"> | ||
<div id="flip-phone-message"> | ||
Please flip your phone to landscape mode for a better experience. | ||
</div> | ||
|
||
<section> | ||
<div class="section__image-container"> | ||
<h1>The Ocean's Journey: From Beauty to Devastation and Back Again</h1> | ||
<img src="images/waves.png" class="image-container__waves" alt="waves"> | ||
</div> | ||
</section> | ||
|
||
<section> | ||
<div class="section__image-container"> | ||
<div class="image-container__fish--scene1"><img src="images/scene1-fish-big.png"></div> | ||
<div class="image-container__splash--scene1"><img src="images/scene1-splash.png"></div> | ||
<div class="image-container__dolphin--scene1"><img src="images/scene1-dolphin.png"></div> | ||
<div class="image-container__brownfish--scene1"><img src="images/scene1-brownfish.png"></div> | ||
<div class="image-container__bluefish--scene1"><img src="images/blue-fish.png"></div> | ||
<div><img src="images/scene3-fish-swimming.png" class="image-container__fish--image-container__scene34 image-container__fish--scene1-swimmer" alt="fish swimming"></div> | ||
<img class="image-container__crab" src="images/crab.png" alt="cute crab"> | ||
<img src="images/waves.png" class="image-container__waves" alt="waves"> | ||
<p> | ||
The ocean is vast and bountiful, full of life, critters and creatures. | ||
</p> | ||
</div> | ||
</section> | ||
|
||
<section> | ||
<div class="section__image-container"> | ||
<div class="image-container__ship--scene2"><img src="images/scene2-ship.png"></div> | ||
<div class="image-container__chemspill--scene2"><img src="images/pollution.png"></div> | ||
<div class="image-container__bigfishdead--scene2"><img src="images/scene2-bigfishdead.png"></div> | ||
<div class="image-container__bluefishdead--scene2"><img src="images/scene2-bluefishdead.png"></div> | ||
<div class="image-container__fish1--scene2"><img src="images/scene2-fish1.png"></div> | ||
<div class="image-container__fish2--scene2"><img src="images/blue-fish.png"></div> | ||
<img src="images/crab.png" class="image-container__crab" alt="cute crab"> | ||
<img src="images/waves.png" class="image-container__waves" alt="ocean waves"> | ||
<p> | ||
However, with the advancement of industry and technology, large corporations have used the once beautiful | ||
ocean as a quick and easy way to dump waste. | ||
</p> | ||
</div> | ||
</section> | ||
|
||
<section> | ||
<div class="section__image-container"> | ||
<div class="image-container__scene3"> | ||
<div class="boats"> | ||
<img src="images/scene3-boat-big.png" class="image-container__image-container__boat--scene3" alt="big boat"> | ||
<img src="images/scene3-boat-small.png" class="image-container__image-container__boat--scene3" alt="small boat"> | ||
</div> | ||
|
||
<div class="pollution"> | ||
<img src="images/pollution.png" class="image-container__image-container__pollution--scene34" alt="nasty green pollution"> | ||
<img src="images/pollution.png" class="image-container__image-container__pollution--scene34" alt="nasty green pollution"> | ||
</div> | ||
|
||
<div class="trash"> | ||
<img src="images/trash-bag.png" class="image-container__image-container__trash--scene34" alt="trash bag"> | ||
<img src="images/trash-cup.png" class="image-container__image-container__trash--scene34" alt="trash thing"> | ||
</div> | ||
|
||
<div class="fish"> | ||
<img src="images/scene3-fish-swimming.png" class="image-container__fish--image-container__scene34" alt="fish swimming"> | ||
<img src="images/scene2-bigfishdead.png" class="image-container__fish--image-container__scene34" alt="dead fish"> | ||
<img src="images/scene3-fish-stranded.png" class="image-container__fish--image-container__scene34" alt="stranded fish"> | ||
</div> | ||
<img src="images/waves.png" class="image-container__waves" alt="ocean image-container__waves"> | ||
<p> | ||
As the pollution continues, the ocean becomes uninhabitable for the sea creatures. Some die while others | ||
leave. | ||
</p> | ||
</div> | ||
</div> | ||
</section> | ||
|
||
<section> | ||
<div class="section__image-container"> | ||
<div class="scene4"> | ||
<img src="images/scene3-boat-small.png" class="image-container__boat--scene4" alt="small boat"> | ||
|
||
<div class="pollution"> | ||
<img src="images/pollution.png" class="image-container__image-container__pollution--scene34" alt="nasty green pollution"> | ||
<img src="images/pollution.png" class="image-container__image-container__pollution--scene34" alt="nasty green pollution"> | ||
</div> | ||
|
||
<div class="trash"> | ||
<img src="images/trash-bag.png" class="image-container__image-container__trash--scene34" alt="trash bag"> | ||
<img src="images/trash-cup.png" class="image-container__image-container__trash--scene34" alt="trash cup"> | ||
</div> | ||
|
||
<div class="fish"> | ||
<img src="images/scene3-fish-swimming.png" class="image-container__fish--image-container__scene34" alt="fish swimming"> | ||
<img src="images/scene2-bigfishdead.png" class="image-container__fish--image-container__scene34" alt="dead fish"> | ||
<img src="images/scene3-fish-stranded.png" class="image-container__fish--image-container__scene34" alt="stranded fish"> | ||
</div> | ||
|
||
<img src="images/man-cleaning.png" class="scene4-guy" alt="guy cleaning the beach"> | ||
<img src="images/waves.png" class="image-container__waves" alt="ocean waves"> | ||
<p> | ||
Noticing the poor state of the ocean, some people start working to combat the pollution. | ||
</p> | ||
|
||
</section> | ||
|
||
<section> | ||
<div class="section__image-container"> | ||
<div class="scene5"> | ||
<div class="scene5-fish"><img src="images/scene5-fish.png"></div> | ||
<div><img src="images/scene3-fish-swimming.png" class="image-container__fish--image-container__scene34" alt="fish swimming"></div> | ||
<div class="scene5-boat"><img src="images/boat.png"></div> | ||
<div class="scene5-woman"><img src="images/woman-cleaning.png"></div> | ||
<div class="scene5-man"><img src="images/man-cleaning.png"></div> | ||
<div class="scene5-green-puddle"><img src="images/pollution.png"></div> | ||
<div class="scene5-bag"><img src="images/trash-bag.png"></div> | ||
<div class="scene5-cup"><img src="images/trash-cup.png"></div> | ||
<img src="images/crab.png" class="image-container__crab" alt="cute crab"> | ||
<img src="images/waves.png" class="image-container__waves" alt="ocean waves"> | ||
</div> | ||
|
||
<p> | ||
This, in turn inspires others to help. | ||
</p> | ||
</div> | ||
</section> | ||
|
||
<section> | ||
<div class="section__image-container"> | ||
<div class="scene6"> | ||
<div class="scene6-orange-fish"><img src="images/scene5-fish.png"></div> | ||
<div class="scene6-blue-fish"><img src="images/blue-fish.png"></div> | ||
<div class="scene6-image-container__crab"><img src="images/crab.png"></div> | ||
<img src="images/waves.png" class="image-container__waves" alt="ocean waves"> | ||
</div> | ||
<p> | ||
The damage to the ocean has been severe and we can't fully restore it to how it was, but | ||
through hard work and determination we can get it to a much better state than it currently | ||
is in. | ||
</p> | ||
</div> | ||
</section> | ||
</main> | ||
</body> | ||
|
||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
const observer = new IntersectionObserver(entries => { | ||
entries.forEach(entry => { | ||
if (entry.isIntersecting) { | ||
entry.target.classList.add('visible'); | ||
} else { | ||
entry.target.classList.remove('visible'); | ||
} | ||
}); | ||
}); | ||
|
||
const imageContainers = document.querySelectorAll('.section__image-container'); | ||
imageContainers.forEach(container => observer.observe(container)); | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should go to git-ignore