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 148 commits into
base: feedback
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
f756516
Setting up GitHub Classroom Feedback
github-classroom[bot] Apr 24, 2023
6ba3b62
The first commit: Making the skeleton of the page.
Apr 25, 2023
fd10c69
Add assignment deadline url
github-classroom[bot] May 1, 2023
2b284fe
gsap notes
EmilSkolt May 1, 2023
da41630
Making the opening, scene 1 and the fundation of the page
EmilSkolt May 10, 2023
0afb2c8
Merge pull request #2 from AdvancedCSS2023/Emil-Skolt
EmilSkolt May 10, 2023
dc6d2dc
Gsap Notes
EmilSkolt May 10, 2023
2c09bf4
Merge pull request #3 from AdvancedCSS2023/Emil-Skolt
EmilSkolt May 10, 2023
b21829d
More progress. Fixed the pin scrolling for scene1
EmilSkolt May 11, 2023
ea06fa9
Merge pull request #4 from AdvancedCSS2023/Emil-Skolt
EmilSkolt May 11, 2023
20ddac3
update
EmilSkolt May 11, 2023
7fb7cc1
backup
EmilSkolt May 11, 2023
63c4b4b
Merge pull request #6 from AdvancedCSS2023/Emil-Skolt
EmilSkolt May 11, 2023
d43c801
scene 2 and 4 html
Tobiasfjellvang May 11, 2023
34aac62
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Tobiasfjellvang May 11, 2023
8ea520e
added css for scene 2 and 4
Tobiasfjellvang May 11, 2023
f9a0ea1
html scene 3 and 5
PetterFuruli May 11, 2023
bdeca32
javascript scene 2 and 4
Tobiasfjellvang May 11, 2023
92f4c64
scene 3 and 5 styling
PetterFuruli May 11, 2023
2e3aeb5
images
PetterFuruli May 11, 2023
8b5c339
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Tobiasfjellvang May 11, 2023
6767b81
minor fixes
PetterFuruli May 11, 2023
680e252
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Tobiasfjellvang May 11, 2023
3b41105
scene 4 styling
Tobiasfjellvang May 11, 2023
ff23039
scene 2 styling
Tobiasfjellvang May 11, 2023
fde60e9
svg for scene 2 and 4
Tobiasfjellvang May 11, 2023
bed104c
namechange
Tobiasfjellvang May 11, 2023
9ab12c5
latest update
EmilSkolt May 11, 2023
cd3f839
Merge branch 'main' into Emil-Skolt
EmilSkolt May 11, 2023
965a325
Merge pull request #7 from AdvancedCSS2023/Emil-Skolt
EmilSkolt May 11, 2023
77b612d
minor fixes
PetterFuruli May 11, 2023
c783f7c
Formatting
PetterFuruli May 11, 2023
ab0604a
ground fix
PetterFuruli May 11, 2023
be710f2
ground fix
PetterFuruli May 11, 2023
47beef1
fix
PetterFuruli May 11, 2023
e0870cb
text
PetterFuruli May 11, 2023
7d55c8b
del
PetterFuruli May 11, 2023
e02868a
css fixes
PetterFuruli May 11, 2023
7587707
bug fix
PetterFuruli May 11, 2023
5c9edc7
school changes
PetterFuruli May 11, 2023
365ba53
animation fix
PetterFuruli May 11, 2023
722abd0
test
PetterFuruli May 11, 2023
383e80c
scene update
PetterFuruli May 11, 2023
cc75a23
scene 2 and 4
PetterFuruli May 11, 2023
aca3544
css
PetterFuruli May 11, 2023
60e19bb
script change
PetterFuruli May 11, 2023
4806680
bug fix
PetterFuruli May 11, 2023
f2643f5
reduced motion
PetterFuruli May 11, 2023
ea42a79
RM
PetterFuruli May 11, 2023
eeed454
bug fixes
Tobiasfjellvang May 11, 2023
b5d48fc
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Tobiasfjellvang May 11, 2023
c02c753
fixes
Tobiasfjellvang May 11, 2023
8a8d776
added text
Tobiasfjellvang May 11, 2023
890a5fa
rm
PetterFuruli May 11, 2023
caed8e4
rm
PetterFuruli May 11, 2023
ce3743c
Reduced motion fix
PetterFuruli May 11, 2023
f8081b9
fixed airplane
Tobiasfjellvang May 11, 2023
57fc953
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Tobiasfjellvang May 11, 2023
81444b1
fixes
Tobiasfjellvang May 11, 2023
19f63c9
added text
Tobiasfjellvang May 11, 2023
415de06
Reduced m
PetterFuruli May 11, 2023
4c484e2
Final reduced motion
PetterFuruli May 11, 2023
31463ef
kid kofi
PetterFuruli May 11, 2023
6736fd1
fixes
Tobiasfjellvang May 11, 2023
9d1c499
img update
PetterFuruli May 12, 2023
452f602
test
PetterFuruli May 12, 2023
69b53aa
arc fix
PetterFuruli May 12, 2023
badcc81
trying to fix scene1
Tobiasfjellvang May 12, 2023
4b8304c
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Tobiasfjellvang May 12, 2023
d778663
media q
PetterFuruli May 12, 2023
a88421c
Merge pull request #8 from AdvancedCSS2023/Petter-test
PetterFuruli May 12, 2023
430dc3d
fixed scene 1 position
Tobiasfjellvang May 12, 2023
7b5bd2d
meida
PetterFuruli May 12, 2023
ba4e80d
fix
PetterFuruli May 12, 2023
f78a2fc
colors
PetterFuruli May 12, 2023
b9eeb5a
color update
PetterFuruli May 12, 2023
d0c5c2a
Merge pull request #9 from AdvancedCSS2023/Petter-test
PetterFuruli May 12, 2023
01d14d4
more fixes
Tobiasfjellvang May 12, 2023
7e7d38d
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Tobiasfjellvang May 12, 2023
a0b4398
test
EmilSkolt May 12, 2023
59503b4
fixes
Tobiasfjellvang May 12, 2023
219f971
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Tobiasfjellvang May 12, 2023
465488c
color
PetterFuruli May 12, 2023
2504ed5
fixed scene2
Tobiasfjellvang May 12, 2023
2ad42c0
BEM scene2
Tobiasfjellvang May 12, 2023
2ebd657
BEM scene4
Tobiasfjellvang May 12, 2023
1306398
fixed the scroll bug
EmilSkolt May 12, 2023
f5714ec
fixing the sun position
EmilSkolt May 12, 2023
323578e
changing headline
EmilSkolt May 12, 2023
2038443
Adding UN pictures
EmilSkolt May 12, 2023
113fda7
fixing the time lapse
EmilSkolt May 12, 2023
87bd788
adding more UN pictures
EmilSkolt May 12, 2023
8b8801b
Adjusting bird position + adding clouds
EmilSkolt May 13, 2023
c630c1d
Removing unnecessary plugins
EmilSkolt May 13, 2023
1e7d730
Updating Scene 1
EmilSkolt May 13, 2023
4585c85
latest Update
EmilSkolt May 13, 2023
5c5350a
BEM
Tobiasfjellvang May 13, 2023
5ac8013
fix
Tobiasfjellvang May 13, 2023
21b2c87
sass variables
Tobiasfjellvang May 13, 2023
ea224bc
Changing the color gradient from JS to CSS
EmilSkolt May 13, 2023
6062dfd
variables
Tobiasfjellvang May 13, 2023
f6a2eac
gradient change from java to css
EmilSkolt May 13, 2023
f7ef8dd
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
EmilSkolt May 13, 2023
ddafda5
gradient variables
Tobiasfjellvang May 13, 2023
4fd762d
darkmode
Tobiasfjellvang May 13, 2023
e618f12
color prefers
PetterFuruli May 13, 2023
c1295a1
sun moon
PetterFuruli May 13, 2023
4c58639
day and night
PetterFuruli May 13, 2023
5868384
sun and mon added
PetterFuruli May 13, 2023
820f343
class
PetterFuruli May 13, 2023
6afa3fc
changed id to classes
PetterFuruli May 13, 2023
b69df62
minor fixes
PetterFuruli May 13, 2023
42481e5
Update README.md
Tobiasfjellvang May 13, 2023
37df4d7
Update README.md
Tobiasfjellvang May 13, 2023
f3e908a
del
PetterFuruli May 13, 2023
7fc8f0e
bem
PetterFuruli May 13, 2023
fda90e9
added variabels to css
Tobiasfjellvang May 13, 2023
5392105
MQ
PetterFuruli May 13, 2023
43d57ce
deleted some css
PetterFuruli May 13, 2023
c95bf92
fix
PetterFuruli May 13, 2023
8fb3534
fixes
PetterFuruli May 13, 2023
0e9dbf1
Update README.md
Tobiasfjellvang May 13, 2023
1c2a05c
bug fix
PetterFuruli May 13, 2023
b969997
bug fix
PetterFuruli May 13, 2023
52d10b1
changed/added color variables
Tobiasfjellvang May 13, 2023
d3a7c1e
Adding UN pictures and more scrollfunctions
EmilSkolt May 13, 2023
a8a34f8
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
EmilSkolt May 13, 2023
dd47833
test
PetterFuruli May 13, 2023
01ed5fa
text res
PetterFuruli May 13, 2023
edb28d3
text fix
PetterFuruli May 13, 2023
bdd1e19
Adding more color variables + dark mode
EmilSkolt May 13, 2023
63d50be
Adding more dark mode features
EmilSkolt May 14, 2023
5e23d8c
removing gsap notes
EmilSkolt May 14, 2023
ca66c71
Adding more text and cleaning up
EmilSkolt May 14, 2023
d481d72
styling the text
EmilSkolt May 14, 2023
21eb9a2
dark mode variables
Tobiasfjellvang May 14, 2023
8a7c742
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Tobiasfjellvang May 14, 2023
3b9a68e
minor fix
PetterFuruli May 14, 2023
b0d7312
minor fixes
PetterFuruli May 14, 2023
8c04a2d
adding containers for the text
EmilSkolt May 14, 2023
abdc017
text fix
PetterFuruli May 14, 2023
59db193
small fixes
Tobiasfjellvang May 14, 2023
a0a4722
changing path test
EmilSkolt May 14, 2023
3f7be60
back
EmilSkolt May 14, 2023
1e38667
img update
PetterFuruli May 14, 2023
dbefa6a
sun fix
Tobiasfjellvang May 14, 2023
262030a
changing to the right path
Tobiasfjellvang May 14, 2023
4961241
fixing path
Tobiasfjellvang 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
Prev Previous commit
Next Next commit
more fixes
Tobiasfjellvang committed May 12, 2023
commit 01d14d4b7ee5f197f9598fc1142b40e531a4110a
12 changes: 3 additions & 9 deletions index.html
Copy link

Choose a reason for hiding this comment

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

lack of BEM 😢
duplicated ids 😢

Original file line number Diff line number Diff line change
@@ -41,15 +41,9 @@ <h2 id="headline2"><span>And the Quest for Water</span></h2>

<div class="scene1">

<div id="sky">
<p class="scene1__text1">Deep inside the forest of Ghana in rural Africa, there was a
small and a poor village. In the smallest hut by the water well
that had dried up decades ago, lived a family of six. The family
consisted of a mother, father and four children, two boys and two
girls. They were all dressed in tattered clothes and exhausted
from last day’s work.</p>
</div>
<div class="ground2">
<div class="sky"></div>

<div class="scene1_ground2">

<img src="images/Main house.svg" alt="hut" id="hut" />
<div class="dried-trees">
24 changes: 7 additions & 17 deletions script.js
Original file line number Diff line number Diff line change
@@ -255,17 +255,7 @@ gsap.to("#birds1", {



gsap.to(".scene1", {
background: "linear-gradient(to bottom, #a8c0ff 0%, #FF5733 10%, #1b1c20 20%, #FFA500 40%, #a8c0ff 50%, #FF5733 60%, #1b1c20 80%, #FFA500 90%, #FF5733 100%",
duration: 3,
scrollTrigger: {
trigger: "body",
start: "top top",
end: "bottom bottom",
scrub: 1
}
});



/*
background: "linear-gradient(to bottom, #a8c0ff 0%, #FF5733 10%, #1b1c20 20%, #FFA500 30%, #a8c0ff 40%, #FF5733 50%, #1b1c20 60%, #FFA500 70%, #FF5733 80%, #1b1c20 90%, #FFA500 100%",
@@ -275,16 +265,16 @@ gsap.to("#birds1", {


//scroll scene1
gsap.to(".ground2", {
duration: 8,
gsap.to(".scene1_ground2", {
duration: 1,
scrollTrigger: {
trigger: ".ground2",
trigger: ".scene1_ground2",
start: "bottom bottom",
endTrigger: ".scene1", // change to end at the end of the container
end: "top top",
end: "bottom bottom",
scrub: 1,
toggleActions: "restart none none none",
pin: ".ground2",
pin: ".scene1_ground2",
pinSpacing: true,
},
});
@@ -375,7 +365,7 @@ gsap.to(".scene2_ground", {
pinSpacing: true,
},
});

//scroll scene4
gsap.to(".scene4_ground", {
duration: 8,
12 changes: 6 additions & 6 deletions styling/styling.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.