Skip to content

Commit 7aafedc

Browse files
committed
New TA skin
1 parent 9248753 commit 7aafedc

9 files changed

+64
-7
lines changed

client/src/app/song/song.component.css

+45
Original file line numberDiff line numberDiff line change
@@ -977,4 +977,49 @@
977977
transition-duration: 480ms;
978978
-webkit-transform: translate3d(-114.40705px, 11.66307px, 0);
979979
transform: translate3d(-114.40705px, 11.66307px, 0);
980+
}
981+
982+
.ironhack img {
983+
height: 100px;
984+
margin: 0 10px;
985+
animation: loop 1s infinite;
986+
}
987+
988+
@keyframes loop {
989+
0% {
990+
-webkit-transform: rotate(-4deg);
991+
transform: rotate(-4deg);
992+
}
993+
12.5% {
994+
-webkit-transform: rotate(8deg);
995+
transform: rotate(8deg);
996+
}
997+
25% {
998+
-webkit-transform: rotate(-8deg);
999+
transform: rotate(-8deg);
1000+
}
1001+
37.5% {
1002+
-webkit-transform: rotate(15deg);
1003+
transform: rotate(15deg);
1004+
}
1005+
50% {
1006+
-webkit-transform: rotate(-20deg);
1007+
transform: rotate(-20deg);
1008+
}
1009+
62.5% {
1010+
-webkit-transform: rotate(20deg);
1011+
transform: rotate(20deg);
1012+
}
1013+
75% {
1014+
-webkit-transform: rotate(-15deg);
1015+
transform: rotate(-15deg);
1016+
}
1017+
87.5% {
1018+
-webkit-transform: rotate(8deg);
1019+
transform: rotate(8deg);
1020+
}
1021+
100% {
1022+
-webkit-transform: rotate(-4deg);
1023+
transform: rotate(-4deg);
1024+
}
9801025
}

client/src/app/song/song.component.html

+17-7
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
<div class="headerWrap">
44
<div class="filterMenu" [ngStyle]="showMenu">
55
<nav class="menu">
6-
<input type="checkbox" href="#" class="menu-open" name="menu-open" id="menu-open" />
6+
<input type="checkbox" [(ngModel)]="isChecked" class="menu-open" name="menu-open" id="menu-open" />
77
<label class="menu-open-button" for="menu-open">
88
<span class="hamburger hamburger-1"></span>
99
<span class="hamburger hamburger-2"></span>
1010
<span class="hamburger hamburger-3"></span>
1111
</label>
12-
<a class="menu-item" (click)="changeSkin('disco')">
12+
<a class="menu-item" (click)="changeSkin('disco');">
1313
<i class="fas fa-compact-disc"></i>
1414
</a>
15-
<a class="menu-item" (click)="changeSkin('speaker')">
15+
<a class="menu-item" (click)="changeSkin('speaker');">
1616
<i class="fas fa-microphone-alt"></i>
1717
</a>
18-
<a class="menu-item" (click)="changeSkin('ironhack')">
18+
<a class="menu-item" (click)="changeSkin('ironhack');">
1919
<i class="fas fa-heart"></i>
2020
</a>
21-
<a class="menu-item" (click)="changeSkin('wings')">
21+
<a class="menu-item" (click)="changeSkin('wings');">
2222
<i class="fas fa-feather"></i>
2323
</a>
24-
<a class="menu-item" (click)="changeSkin('atom')">
24+
<a class="menu-item" (click)="changeSkin('atom');">
2525
<i class="fas fa-atom"></i>
2626
</a>
2727
</nav>
@@ -117,8 +117,13 @@
117117
</svg>
118118
</div>
119119
</div>
120-
121120

121+
<div class="ironhack" [ngStyle]="showTA">
122+
<img src="../../assets/ta/marcHead.png" alt="Marc">
123+
<img src="../../assets/ta/beltranHead.png" alt="Beltrán">
124+
<img src="../../assets/ta/giorgioHeadNew.png" alt="Giorgio">
125+
</div>
126+
122127
<div class="title">
123128
<h1 class="clip-text clip-text--cover">{{song.title}}</h1>
124129
<h2 class="{{changeTextColor}}">{{song.artist}}</h2>
@@ -168,6 +173,11 @@ <h2 class="{{changeTextColor}}">{{song.artist}}</h2>
168173
</div>
169174
</div>
170175

176+
<div class="ironhack" [ngStyle]="showTA">
177+
<img src="../../assets/ta/susanaHead.png" alt="Susana">
178+
<img src="../../assets/ta/gabiHead.png" alt="Gabi">
179+
<img src="../../assets/ta/juanHead.png" alt="Juan">
180+
</div>
171181

172182
</div>
173183

client/src/app/song/song.component.ts

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export class SongComponent implements OnInit {
2424
showWings = {'display': 'none'}
2525
showAtom = {'display': 'none'}
2626
activeSkin: any;
27+
isChecked;
2728

2829
@ViewChild('videoPlayer') videoplayer: any;
2930
videoSource: string = "";
@@ -197,6 +198,7 @@ export class SongComponent implements OnInit {
197198

198199
changeSkin(skin){
199200
this.activeSkin = skin;
201+
this.isChecked = false;
200202
}
201203

202204
}

client/src/assets/ta/beltranHead.png

38.3 KB
Loading

client/src/assets/ta/gabiHead.png

15.2 KB
Loading
11.9 KB
Loading

client/src/assets/ta/juanHead.png

36.6 KB
Loading

client/src/assets/ta/marcHead.png

34.2 KB
Loading

client/src/assets/ta/susanaHead.png

26.9 KB
Loading

0 commit comments

Comments
 (0)