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 24 commits into
base: feedback
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
2add0ae
Setting up GitHub Classroom Feedback
github-classroom[bot] Apr 24, 2023
40d779a
Added file structure and styles
SebastianHaugen Apr 24, 2023
03910e2
Adding readme, index og the script file
SebastianHaugen Apr 24, 2023
e4ca2b8
Tried adding a tree, will be used for the forest
SebastianHaugen Apr 24, 2023
d0e0ac0
Tried adding a single tree to the intro section
SebastianHaugen Apr 24, 2023
c45fdc3
Working on svg trees to create forest effect
SebastianHaugen Apr 24, 2023
925dd4d
Expermenting with creating a forest using svgs
SebastianHaugen Apr 24, 2023
c98a65e
Adding animations and a forest to the website
SebastianHaugen Apr 24, 2023
72d0b95
Added a quick intro to the website
SebastianHaugen Apr 24, 2023
06d0cb9
Fixing some bugs in the style folder
SebastianHaugen Apr 24, 2023
c2b9b9d
Tried working on the intersectionObserver
SebastianHaugen Apr 25, 2023
2f45ef4
Tried working with GSAP library
SebastianHaugen Apr 26, 2023
e844867
Working on the animation of the first scene
SebastianHaugen Apr 26, 2023
5b50fe6
Working on scene 1 animation
SebastianHaugen Apr 27, 2023
f55794d
Working with gsap and animations
SebastianHaugen Apr 27, 2023
52ee545
Merge pull request #2 from AdvancedCSS2023/experimental
SebastianHaugen Apr 27, 2023
786e5a2
Fixed scene 1 animation
SebastianHaugen Apr 27, 2023
7067f8d
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
SebastianHaugen Apr 27, 2023
9abc303
Fixed some stuff with code
SebastianHaugen Apr 27, 2023
e045c08
Working on scene2
SebastianHaugen Apr 27, 2023
22ffe92
Working on scene2
SebastianHaugen Apr 27, 2023
e4fd3ba
Continue to work on scene2
SebastianHaugen Apr 27, 2023
efda191
Fixed a small issue with scene2 animation
SebastianHaugen Apr 27, 2023
37b38bb
Tried working on scene 4
SebastianHaugen Apr 29, 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
Added a quick intro to the website
SebastianHaugen committed Apr 24, 2023
commit 72d0b95c1e60dd7d95d6a60790e926d71c57cf14
70 changes: 50 additions & 20 deletions index.html
Original file line number Diff line number Diff line change
@@ -5,33 +5,63 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>UN goal 15</title>
<link
rel="stylesheet"
href="/assignment-3--scrollytelling-group-8/styles/style.css"
/>
<link rel="stylesheet" href="./styles/style.css" />
<script src="script.js" async></script>
</head>
<body>
<div class="scene">
<h1>UN goal 15 - Life on land</h1>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Aliquam, quos
aperiam vitae ut nostrum quis exercitationem ex similique, officia,
deleniti beatae? Eos dolor sapiente quo nemo labore enim dolores
consequuntur.
UN Goal 15 aims to protect, restore and promote the sustainable use of
terrestrial ecosystems, forests, and biodiversity. With the world's
population projected to reach nearly 10 billion by 2050, it is crucial
to ensure that we manage our planet's natural resources in a way that
maintains their productivity, sustains life, and supports economic and
social development.
</p>
<p>
This goal recognizes that the Earth's ecosystems are under significant
pressure from human activities such as deforestation, climate change,
and overexploitation of resources. If left unchecked, these activities
could lead to irreversible damage to our planet's natural systems and
threaten the survival of countless species.
</p>
<p>
By implementing sustainable practices and protecting our natural
resources, we can achieve Goal 15 and ensure that life on land is
protected for future generations. This includes promoting responsible
use of forests, halting land degradation and desertification, and
conserving and restoring biodiversity. Achieving Goal 15 is not only
important for preserving the beauty and diversity of our planet's
ecosystems, but also for supporting sustainable development and
mitigating the effects of climate change.
</p>
<div class="intro-forest">
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img class="tree" src="./images/tree.svg" alt="A picture of a autumn tree" />
<img
class="tree"
src="./images/tree.svg"
alt="A picture of a autumn tree"
/>
<img
class="tree"
src="./images/tree.svg"
alt="A picture of a autumn tree"
/>
<img
class="tree"
src="./images/tree.svg"
alt="A picture of a autumn tree"
/>
<img
class="tree"
src="./images/tree.svg"
alt="A picture of a autumn tree"
/>
<img
class="tree"
src="./images/tree.svg"
alt="A picture of a autumn tree"
/>
</div>
</div>
<!-- Scene 1 -->
52 changes: 0 additions & 52 deletions styles/_forest.scss
Original file line number Diff line number Diff line change
@@ -1,58 +1,6 @@
.tree {
width: 200px;
height: 200px;
margin: 0;
padding: 0;
border: 0;
}

.tree:nth-of-type(1) {
right: -100px;
}

.tree:nth-of-type(2) {
position: relative;
right: -50px;
}

.tree:nth-of-type(3) {
right: 0px;
}

.tree:nth-of-type(4) {
right: 50px;
}

.tree:nth-of-type(5) {
right: 100px;
}

.tree:nth-of-type(6) {
right: 150px;
}

.tree:nth-of-type(7) {
right: -100px;
}

.tree:nth-of-type(8) {
right: -50px;
}

.tree:nth-of-type(9) {
right: 0px;
}

.tree:nth-of-type(10) {
right: 50px;
}

.tree:nth-of-type(11) {
right: 100px;
}

.tree:nth-of-type(12) {
right: 150px;
}

.tree:hover {
55 changes: 3 additions & 52 deletions styles/style.css
Original file line number Diff line number Diff line change
@@ -21,58 +21,6 @@
.tree {
width: 200px;
height: 200px;
margin: 0;
padding: 0;
border: 0;
}

.tree:nth-of-type(1) {
right: -100px;
}

.tree:nth-of-type(2) {
position: relative;
right: -50px;
}

.tree:nth-of-type(3) {
right: 0px;
}

.tree:nth-of-type(4) {
right: 50px;
}

.tree:nth-of-type(5) {
right: 100px;
}

.tree:nth-of-type(6) {
right: 150px;
}

.tree:nth-of-type(7) {
right: -100px;
}

.tree:nth-of-type(8) {
right: -50px;
}

.tree:nth-of-type(9) {
right: 0px;
}

.tree:nth-of-type(10) {
right: 50px;
}

.tree:nth-of-type(11) {
right: 100px;
}

.tree:nth-of-type(12) {
right: 150px;
}

.tree:hover {
@@ -129,6 +77,9 @@ p {
flex-direction: row;
flex-wrap: wrap;
justify-content: flex-start;
margin: 0 auto;
max-width: 1000px;
bottom: 100px;
}

#scene1 {
2 changes: 1 addition & 1 deletion styles/style.css.map

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

4 changes: 3 additions & 1 deletion styles/style.scss
Original file line number Diff line number Diff line change
@@ -50,7 +50,9 @@ p {
flex-direction: row;
flex-wrap: wrap;
justify-content: flex-start;

margin: 0 auto;
max-width: 1000px;
bottom: 100px;
}

#scene1 {