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

Feedback #36

Open
wants to merge 147 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
c205c49
Setting up GitHub Classroom Feedback
github-classroom[bot] Apr 17, 2023
795d876
Initial commit
AndrChr0 Apr 17, 2023
4cd5db5
added two equal size divs side by side in body
AndrChr0 Apr 17, 2023
eab5be1
Merge pull request #2 from AdvancedCSS2023/wrapper-creation-fundamentals
AndrChr0 Apr 17, 2023
df07912
added svg + foulder
AndrChr0 Apr 17, 2023
e107d38
experiemnt with svg placement
AndrChr0 Apr 17, 2023
c2451af
modifyed wrappers and scroll behaviour
AndrChr0 Apr 19, 2023
3a090a8
added gradient to both wrappers
AndrChr0 Apr 19, 2023
68a0d58
fixed units, added houses
AndrChr0 Apr 19, 2023
9607fce
removed useless wrapper
AndrChr0 Apr 19, 2023
4cd401c
Added the first trees
sanderby Apr 19, 2023
6b17389
Optimized forest svgs
sanderby Apr 20, 2023
f51a60a
Changed from using inline svg to using them throug
sanderby Apr 20, 2023
a1441f0
changed svg mark-up to img elements
AndrChr0 Apr 20, 2023
ea89b26
Added mixin for placement
sanderby Apr 20, 2023
5d23ab5
Merge pull request #3 from AdvancedCSS2023/Forest
sanderby Apr 20, 2023
ecb0c5c
removed height on some elements
AndrChr0 Apr 20, 2023
7fc00b8
Merge branch 'initial-A' into intial-features
AndrChr0 Apr 20, 2023
7d42065
Readded images
sanderby Apr 20, 2023
b9dd657
Merge pull request #4 from AdvancedCSS2023/intial-features
sanderby Apr 20, 2023
49a54ba
Added two extra rows of forest
sanderby Apr 20, 2023
d73f528
repositioned houses + added clouds
AndrChr0 Apr 20, 2023
5f929a1
Merge branch 'intial-features' into village-improvments-branch
sanderby Apr 20, 2023
bc60f08
Merge pull request #5 from AdvancedCSS2023/village-improvments-branch
sanderby Apr 20, 2023
36f3ce0
Fixed merge errors!
sanderby Apr 20, 2023
984163a
added cloud back
AndrChr0 Apr 20, 2023
f0f2cc7
Added tree animations
sanderby Apr 23, 2023
f5d3687
added alt text houses
AndrChr0 Apr 25, 2023
a527a03
added oriantation stylses
AndrChr0 Apr 25, 2023
7b6f3bd
added some people
AndrChr0 Apr 25, 2023
0bd6ea0
fixed walking animation
AndrChr0 Apr 25, 2023
f267123
Added intersection observer
sanderby Apr 25, 2023
c059f20
minor changes
AndrChr0 Apr 25, 2023
9dce1e7
Merge pull request #6 from AdvancedCSS2023/intersection-observer
AndrChr0 Apr 25, 2023
28917cc
Merge branch 'intial-features' into people-animation
AndrChr0 Apr 25, 2023
999b9dc
last commit of branch
AndrChr0 Apr 25, 2023
c1e2ba0
Merge pull request #7 from AdvancedCSS2023/people-animation
sanderby Apr 25, 2023
bad53e7
added animation file
sanderby Apr 25, 2023
7a791ed
hotfix
sanderby Apr 25, 2023
5905245
added village anmations to animations file
AndrChr0 Apr 25, 2023
2b06353
fixed animation bug
sanderby Apr 25, 2023
896d026
fixed files
sanderby Apr 25, 2023
ba94a17
added sun with svg animation
AndrChr0 Apr 25, 2023
e1034d4
Merge pull request #8 from AdvancedCSS2023/svg-animations
AndrChr0 Apr 25, 2023
b45e615
added view anyways button to orientation message
AndrChr0 Apr 27, 2023
b6645f3
Add assignment deadline url
github-classroom[bot] May 1, 2023
f47bfca
added remove button for orientation and a cow
AndrChr0 May 2, 2023
27acb2d
Merge pull request #9 from AdvancedCSS2023:orientation-remove-button
sanderby May 2, 2023
a780b8b
Merge pull request #10 from AdvancedCSS2023/intial-features
AndrChr0 May 2, 2023
61d7271
added svgs
AndrChr0 May 2, 2023
eb82033
Added and positioned animals
sanderby May 2, 2023
1ed6594
Merge pull request #11 from AdvancedCSS2023/animals
AndrChr0 May 2, 2023
3a3784b
added factory svg
AndrChr0 May 2, 2023
fe27de1
Merge branch 'intial-features' into svg-dump
AndrChr0 May 2, 2023
884de6f
fixed merge problems
AndrChr0 May 2, 2023
bce2b21
fixed bugs
AndrChr0 May 2, 2023
4c0a10b
minor changes
AndrChr0 May 2, 2023
47d52cd
fixed compiling error
AndrChr0 May 2, 2023
ea0906c
added more svgs
AndrChr0 May 2, 2023
09eee4f
Merge pull request #11 from AdvancedCSS2023/animals
AndrChr0 May 4, 2023
2ef18d1
Merge branch 'intial-features' of https://github.com/AdvancedCSS2023/…
AndrChr0 May 4, 2023
bd73f0f
minor changes
AndrChr0 May 4, 2023
e09a3eb
Merge pull request #12 from AdvancedCSS2023/svg-dump
sanderby May 4, 2023
b49fd0c
added title image and a title
AndrChr0 May 4, 2023
0d79828
added intersection observer styles
AndrChr0 May 4, 2023
b5b5fb5
Merge pull request #13 from AdvancedCSS2023/intial-features
AndrChr0 May 9, 2023
2543231
minor fixes
AndrChr0 May 9, 2023
e49f5a9
Merge branch 'master' into start-section
AndrChr0 May 9, 2023
47ade88
Merge pull request #14 from AdvancedCSS2023/start-section
sanderby May 9, 2023
5d415c9
Added the text
sanderby May 9, 2023
9e63e95
Merge pull request #15 from AdvancedCSS2023/textboxes
AndrChr0 May 9, 2023
fb2e89b
made a start intro display with different images
AndrChr0 May 9, 2023
de70ec5
added and modifyed intersection boxes
AndrChr0 May 10, 2023
6c41258
added donation button + styling
AndrChr0 May 10, 2023
663075c
fixed position issues, text size, start-screen
AndrChr0 May 10, 2023
b41a3ad
Merge pull request #17 from AdvancedCSS2023/start-screen-intro
sanderby May 10, 2023
177c3ca
Hides everything that shouldn't be visible in scene 1
sanderby May 10, 2023
eadb5fc
Merge pull request #18 from AdvancedCSS2023/Peekaboo
AndrChr0 May 10, 2023
fb11e83
Added initial animation
sanderby May 10, 2023
1152624
deleted the picyture intro, added funky video
AndrChr0 May 10, 2023
fc7e1e2
Merge pull request #19 from AdvancedCSS2023/firefox-bug-fix
sanderby May 10, 2023
847cfe9
Added animations for first half
sanderby May 10, 2023
c8d2a25
Added most of the remaining animations
sanderby May 10, 2023
b139d8b
Merge branch 'master' into scrolling-animations
AndrChr0 May 10, 2023
d709561
added fire svg/animation
AndrChr0 May 10, 2023
c503b2f
Merge pull request #20 from AdvancedCSS2023/scrolling-animations
AndrChr0 May 10, 2023
1bd6489
minor changes
AndrChr0 May 10, 2023
ef99052
Merge branch 'master' into fire-effect
AndrChr0 May 10, 2023
67c9e7f
Finalised most animations except for extreme weather
sanderby May 10, 2023
55d75e4
Merge pull request #21 from AdvancedCSS2023/story-end-animations
AndrChr0 May 10, 2023
9828a77
finalized fire animations
AndrChr0 May 10, 2023
5a7a851
Merge branch 'master' into fire-effect
AndrChr0 May 10, 2023
97faa74
Merge pull request #22 from AdvancedCSS2023/fire-effect
sanderby May 10, 2023
d44baf0
added flooding animation
AndrChr0 May 10, 2023
eca5531
Made a reduced motion media query
sanderby May 10, 2023
872c5e8
Merge branch 'master' into reduced-motion
AndrChr0 May 10, 2023
9e6d0b1
Merge pull request #23 from AdvancedCSS2023/reduced-motion
AndrChr0 May 10, 2023
873f97d
killed a man (flood)
AndrChr0 May 10, 2023
89028c0
Added reduced motion option to fire
sanderby May 10, 2023
be7e713
Merge branch 'master' into flood-effect+minor-changes
sanderby May 10, 2023
77bb046
Merge pull request #25 from AdvancedCSS2023/flood-effect+minor-changes
sanderby May 10, 2023
2d5f05a
Merge branch 'master' into flame-reduced-motion
sanderby May 10, 2023
e2eceb3
Merge pull request #24 from AdvancedCSS2023/flame-reduced-motion
AndrChr0 May 10, 2023
8fdba3c
fixed css variables for colors
sanderby May 10, 2023
a1c113a
added dark color scheeme
sanderby May 10, 2023
e73d1e0
Merge pull request #26 from AdvancedCSS2023/colors-and-color-scheme
AndrChr0 May 10, 2023
40d16d6
minor adjustments
AndrChr0 May 10, 2023
ba95fbf
killed the cows
AndrChr0 May 10, 2023
0d838cd
made the video loop
AndrChr0 May 10, 2023
265bdd3
moved fire 4 a bit back
AndrChr0 May 10, 2023
a96884f
minor changes
AndrChr0 May 10, 2023
3a4c4c7
fixed reduced motion bug
AndrChr0 May 11, 2023
4672392
formatting
AndrChr0 May 11, 2023
3831428
Merge branch 'cow-massacre-2023' into three-branch-combo
AndrChr0 May 11, 2023
b2c99db
Merge branch 'reduced-motion-bug' into three-branch-combo
AndrChr0 May 11, 2023
14d8e1e
moved reduce motion to media queries
AndrChr0 May 11, 2023
2c7ecd6
forgot to stage
AndrChr0 May 11, 2023
213549b
added poster effect to the video
AndrChr0 May 11, 2023
acbbb9d
Merge branch 'master' into three-branch-combo
AndrChr0 May 11, 2023
7d61eb5
Merge pull request #27 from AdvancedCSS2023/three-branch-combo
sanderby May 11, 2023
9681d95
Added more colors to dark mode
sanderby May 11, 2023
d380895
Merge branch 'master' of https://github.com/AdvancedCSS2023/assignmen…
sanderby May 11, 2023
2d47940
-Made more elements change color in dark mode
sanderby May 11, 2023
421fd33
Merge pull request #28 from AdvancedCSS2023/better-dark-mode
AndrChr0 May 11, 2023
ebd8c5d
-Cow one is now afraid of water
sanderby May 11, 2023
6cd4c98
added filter on end screen
AndrChr0 May 11, 2023
c7bc724
Merge pull request #29 from AdvancedCSS2023/hydrophobic-cow
AndrChr0 May 11, 2023
6faf6d7
Merge branch 'master' into end-screen
AndrChr0 May 11, 2023
e6d1ca7
Merge pull request #30 from AdvancedCSS2023/end-screen
sanderby May 11, 2023
23b104f
deleted useless images
AndrChr0 May 11, 2023
b40d707
switching branches locally
AndrChr0 May 11, 2023
04d3415
fixed cow drowning bug
AndrChr0 May 11, 2023
b73ca12
formatting
AndrChr0 May 11, 2023
ff0791d
- Wrote content of the readme file
sanderby May 11, 2023
49434e0
Merge pull request #31 from AdvancedCSS2023/Donotreadme
AndrChr0 May 11, 2023
0c7bbca
more formatting
AndrChr0 May 11, 2023
4d9c290
Merge pull request #32 from AdvancedCSS2023/clean-up
sanderby May 11, 2023
5b3476d
added fire class lost in mergelation
sanderby May 11, 2023
7165d83
Merge pull request #33 from AdvancedCSS2023/firefix
AndrChr0 May 11, 2023
86c2898
few changes to readme file, fixed text in html
AndrChr0 May 11, 2023
c894ab4
html text changes
AndrChr0 May 11, 2023
9a5cd87
Merge pull request #34 from AdvancedCSS2023/very-minor-changes
AndrChr0 May 11, 2023
5a83719
added some refined alt text
AndrChr0 May 12, 2023
1a57749
more alt text
AndrChr0 May 12, 2023
034dafb
moved color scheme to media queries
AndrChr0 May 12, 2023
c82ec96
added abbr to UN
AndrChr0 May 12, 2023
571544e
Merge pull request #35 from AdvancedCSS2023/minor-clean-up
AndrChr0 May 12, 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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
52 changes: 52 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,53 @@
# Deforestation scrollytelling experience

The project is a scrollytelling experience that highlights the impacts of deforestation. It is aimed to educate adults between the age of 35 – 45 about deforestation by visualizing how deforestation effects animals and humans alike. Additionally, the project serves as a platform to promote The Nature Conservancy's initiatives in nature preservation.

## Why the project is useful

The project is useful for us as it helps us develop our coding skills while also gaining experience using Git/GitHub. It also provides a visually engaging way to present the impacts of deforestation and to promote conservation efforts.

## How to get started

### Running the project

1. Clone the project to your local enviroment using git clone https://github.com/AdvancedCSS2023/assignment-3--scrollytelling-group_4.git or go to https://github.com/AdvancedCSS2023/assignment-3--scrollytelling-group_4 and press "Open in Visual Studio Code"
2. Open the index.html file by running a live server with the live server plugin in Visual Studio Code or open it in a browser

### Contributing to the project

1. Make a new branch from master
2. Commit changes to the new branch and pubish it to github
3. Make a pull request for merging the new branch with master


## Where to seek help

### Reporting bugs, suggesting enhancements and other issues

To report issues and bugs in the project, or suggest enhancements:

1. Go to the Issues section in the Repository on Github.
2. Click on “New Issue”.
3. Write a detailed explanation of the issue.
4. Click “Submit” to create the Issue.

### Help contributing to the project

To get help contributing to the project, please reach out to one of the contributors on Github.

## Which technology is used

The project is developed using mostly HTML and CSS/SASS. The project also utilizes some Javascript, particularly the Intersection Observer API. The codebase is hosted on Github.

## Who are the creators/maintainers

The project is developed and maintained by students in the Advanced CSS course at NTNU.

The main contributors are:

- Andreas Christiansen
- Sander Byenstuen


[![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=10887732&assignment_repo_type=AssignmentRepo)
11 changes: 11 additions & 0 deletions assets/Basic Animations.svg
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 assets/building-tall-one.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions assets/building-tall-three.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 45 additions & 0 deletions assets/building-tall-two.svg
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 assets/cat.svg
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 assets/cloud-one.svg
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 assets/cloud-two.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading