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.

Sign up for GitHub

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

Jump to bottom

adding my new art #2295

Merged
merged 16 commits into from
Oct 22, 2023
Merged

adding my new art #2295

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
723864d
adding my animation
K-Wiczling Oct 20, 2023
20ba048
create circle animation
K-Wiczling Oct 20, 2023
f03d495
add immage
K-Wiczling Oct 21, 2023
495e436
Update include.js
K-Wiczling Oct 22, 2023
737ba86
Merge branch 'master' into master
sophiabrandt Oct 22, 2023
4b1088a
update fokredd
K-Wiczling Oct 22, 2023
1e250ce
adding new art
K-Wiczling Oct 22, 2023
2ccf349
Merge branch 'zero-to-mastery:master' into master
K-Wiczling Oct 22, 2023
567c766
complex animation
K-Wiczling Oct 22, 2023
39d4bd4
Merge branch 'master' of https://github.com/K-Wiczling/Animation-Nation
K-Wiczling Oct 22, 2023
03d251f
add image
K-Wiczling Oct 22, 2023
99990e9
Merge branch 'master' into master
LaurelineP Oct 22, 2023
0353aea
test
K-Wiczling Oct 22, 2023
9010e9f
Merge branch 'master' of https://github.com/K-Wiczling/Animation-Nation
K-Wiczling Oct 22, 2023
9ab10ca
Update square.html
K-Wiczling Oct 22, 2023
a28df6a
Update square.css
K-Wiczling Oct 22, 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
46 changes: 46 additions & 0 deletions Art/K-Wiczling/complex.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
.inner {
background-color: red;
width: 100px;
height: 100px;
border-radius: 44%;
animation: box 15s infinite;
}
.box{
animation: rot 2s infinite;
background-color: black;
width: 300px;
height: 300px;
margin: 0 auto;
margin-top: 30vh;

}
#inner1{
background-color: red;

}
#inner2{
background-color: greenyellow;

}
#inner3{
background-color: goldenrod;

}
@keyframes box {
0% {
background-color: red;
}

100% {
background-color: green;
}
}
@keyframes rot {
0%,
100% {
transform: rotate(360deg);
}
50% {
transform: rotate(0deg);
}
}
15 changes: 15 additions & 0 deletions Art/K-Wiczling/complex.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<link rel="stylesheet" href="complex.css" />

<div class="animation-wrapper">
<div class="box">
<div class="inner" id="inner1">

</div>
<div class="inner" id="inner2">

</div>
<div class="inner" id="inner3">

</div>
</div>
</div>
Binary file added Art/K-Wiczling/complex.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Art/K-Wiczling/square.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,16 @@
100% {
transform: scale(1);
}
<<<<<<< HEAD

50% {
transform: scale(1.5);
}
}
=======

50% {
transform: scale(1.5);
}
}
>>>>>>> 783945a70f7eef9138a7738237de9f98f7962d83
5 changes: 5 additions & 0 deletions Art/K-Wiczling/square.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<link rel="stylesheet" href="square.css" />

<div class="animation-wrapper">
<<<<<<< HEAD
<div class="box1">
</div>
=======
<div class="box1"></div>
>>>>>>> 783945a70f7eef9138a7738237de9f98f7962d83
</div>
12 changes: 12 additions & 0 deletions include.js
View file
Open in desktop
sophiabrandt marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2166,16 +2166,28 @@ let cards = [
githubLink: 'https://github.com/gabriel-conde'
},
{
<<<<<<< HEAD
artName: 'Square',
pageLink: './Art/K-Wiczling/square.html',
imageLink: './Art/K-Wiczling/square.gif',
=======
artName: 'Square',
pageLink: './Art/K-Wiczling/square.html',
imageLink: './Art/K-Wiczling/square.gif',
>>>>>>> 783945a70f7eef9138a7738237de9f98f7962d83
author: 'K-Wiczling',
githubLink: 'https://github.com/K-Wiczling'
},
{
<<<<<<< HEAD
artName: 'Circle',
pageLink: './Art/K-Wiczling/circle.html',
imageLink: './Art/K-Wiczling/circle.png',
=======
artName: 'Circle',
pageLink: './Art/K-Wiczling/circle.html',
imageLink: './Art/K-Wiczling/circle.png',
>>>>>>> 783945a70f7eef9138a7738237de9f98f7962d83
author: 'K-Wiczling',
githubLink: 'https://github.com/K-Wiczling'
},
Expand Down