Skip to content

Commit

Permalink
resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
l-white committed Oct 2, 2023
2 parents 5fe1501 + cf68dd5 commit c4f812f
Show file tree
Hide file tree
Showing 4 changed files with 175 additions and 0 deletions.
138 changes: 138 additions & 0 deletions Art/Alexandra2888/fan.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
body{
margin: 50px 0 0;
background: aliceblue;
}
.fan{
margin: 0 auto;
background: black;
}
.fan-1{
z-index: 2;
width: 275px;
height: 275px;
border: 10px solid rgb(143, 143, 151);
border-radius: 50%;
}
.fan-1:hover{
animation-name: swing;
animation-duration: 5s;
animation-timing-function: liner;
animation-iteration-count: infinite;
}
@keyframes swing{
0%{
transform: none;
}
25%{
transform: rotate(90deg);
transform: translate(25px);
}
50%{
transform: none;
}
75%{
transform: rotate(-90deg);
transform: translate(-25px);
}
100%{
transform: none;
}
}
.core-part{
margin: 0 auto;
background: gainsboro;
width: 50px;
height: 50px;
border-radius: 50%;
position: relative;
top: 112px;
opacity: 1.0;
animation-name: rotation;
animation-duration: 0.01s;
animation-timing-function: liner;
animation-iteration-count: infinite;
}
@keyframes rotation{
from{
transform: rotate(0deg);
}
to{
transform: rotate(360deg);
}
}
.wing{
margin: 0 auto;
background: #815A8F;
width: 30px;
height: 100px;
border-radius: 5px;
position: relative;
}
.wing-1{
top: 50px;
transform: rotate(0deg);
background: #663399;
}
.wing-2{
right: 65px;
bottom: 88px;
transform: rotate(60deg);
background: #7b5b9c;
}
.wing-3{
right: 64px;
bottom: 264px;
transform: rotate(120deg);
background: #837492;
}
.wing-4{
bottom: 400px;
transform: rotate(180deg);
}
.wing-5{
left: 65px;
bottom: 462px;
transform: rotate(240deg);
background: #9686a5;
}
.wing-6{
left: 65px;
bottom: 488px;
transform: rotate(300deg);
background: #8f8699;
}
.fan-2{
z-index: 1;
width: 50px;
height: 140px;
border-radius: 5px;
border-top: 10px solid rgb(143, 143, 151);
position: relative;
border-bottom: 3px solid dimgray;
bottom: 10px;
}
.fan-3{
width: 250px;
height: 140px;
border: 5px solid rgb(143, 143, 151);
border-radius: 20px;
position: relative;
bottom: 35px;
display: flex;
justify-content: center;
align-content: center;
}
.buttons{
margin-top: 70px;
width: 100px;
display: flex;
justify-content: center;
justify-content: space-between;
align-content: center;
}
.button{
width: 15px;
height: 15px;
background: gray;
border-radius: 50%;
}
30 changes: 30 additions & 0 deletions Art/Alexandra2888/fan.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Animated Fan</title>
<link href="./fan.css" rel="stylesheet" />
</head>
<body>
<div class="fan fan-1">
<div class="core-part">
<div class="wing wing-1"></div>
<div class="wing wing-2"></div>
<div class="wing wing-3"></div>
<div class="wing wing-4"></div>
<div class="wing wing-5"></div>
<div class="wing wing-6"></div>
</div>
</div>
<div class="fan fan-2"></div>
<div class="fan fan-3">
<div class="buttons">
<div class="button"></div>
<div class="button"></div>
<div class="button"></div>
<div class="button"></div>
</div>
</div>
</body>
</html>
Binary file added Art/Alexandra2888/fan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions include.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,13 @@ let cards = [
imageLink: './Art/Rahul-Bhati/Rahul-Bhati.gif',
author: 'Rahul-Bhati',
githubLink: 'https://github.com/Rahul-Bhati'
},
{
artName: 'Animated Fan',
pageLink: './Art/Alexandra2888/fan.html',
imageLink: './Art/Alexandra2888/fan.gif',
author: 'Alexandra2888',
githubLink: 'https://github.com/Alexandra2888'
}
];

Expand Down

0 comments on commit c4f812f

Please sign in to comment.