Skip to content

Commit b53b6e2

Browse files
queadquead
committed
2.0 - Fixing latest things
1 parent a069bc1 commit b53b6e2

File tree

12 files changed

+103
-57
lines changed

12 files changed

+103
-57
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ This player is compatible only with Chrome/webkit browsers.
4848

4949
**For building app**
5050

51+
1. Add to body classes application app-win / app-mac / app-linux
52+
`<body class="application app-mac">`
5153
1. Build the src folder with
5254
`ng build` in root folder
5355
*You need to have angular-cli installed on global (check above)*

‎dist/assets/img/ui/win-close.png

346 Bytes
Loading

‎dist/assets/img/ui/win-maxim.png

320 Bytes
Loading

‎dist/assets/img/ui/win-minim.png

287 Bytes
Loading

‎dist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="stylesheet" href="assets/css/main.css">
1010
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
1111
</head>
12-
<body class="application app-win">
12+
<body class="">
1313
<div class="update-bar">
1414
<div id="output">Checking for updates...</div>
1515
<span class="update-loading">

‎scss/_app.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,11 @@
1313
.win-controls {
1414
display: flex;
1515
}
16+
}
17+
18+
.app-linux,
19+
.app-mac {
20+
.linux-controls {
21+
display: flex;
22+
}
1623
}

‎scss/_header.scss

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
}
2525
}
2626

27-
.mac-controls {
27+
.linux-controls {
2828
display: none;
2929
position: absolute;
3030
left: 10px;
31-
top: 10px;
31+
top: 7px;
3232
z-index: 9999;
3333
button {
3434
background: transparent;
@@ -38,41 +38,58 @@
3838
height: 14px;
3939
width: 14px;
4040
padding: 0;
41+
border-radius: 50%;
4142
cursor: pointer;
4243
+ button {
4344
margin-left: 5px;
4445
}
4546
}
4647
}
4748

48-
#mac-close {
49-
background-image: url('../img/ui/mac-sprites.png');
50-
background-size: 62px auto;
51-
background-position: 0 0;
52-
background-repeat: no-repeat;
53-
&:active {
54-
background-position: 0 -16px;
49+
.app-mac {
50+
#linux-close {
51+
background-color: #fc5753;
52+
&:active {
53+
background-color: #F53B38;
54+
}
5555
}
56-
}
57-
58-
#mac-minimize {
59-
background-image: url('../img/ui/mac-sprites.png');
60-
background-size: 62px auto;
61-
background-position: -16px 0;
62-
background-repeat: no-repeat;
63-
&:active {
64-
background-position: -16px -16px;
56+
57+
#linux-minimize {
58+
background-color: #fdbc40;
59+
&:active {
60+
background-color: #FC9F00;
61+
}
6562
}
63+
64+
#linux-maximize {
65+
background-color: #33c748;
66+
&:active {
67+
background-color: #23A134;
68+
}
69+
}
6670
}
6771

68-
#mac-maximize {
69-
background-image: url('../img/ui/mac-sprites.png');
70-
background-size: 62px auto;
71-
background-position: -32px 0;
72-
background-repeat: no-repeat;
73-
&:active {
74-
background-position: -32px -16px;
72+
.app-linux {
73+
#linux-close {
74+
background-color: #fc5753;
75+
&:active {
76+
background-color: #F53B38;
77+
}
7578
}
79+
80+
#linux-minimize {
81+
background-color: #585869;
82+
&:active {
83+
background-color: #464657;
84+
}
85+
}
86+
87+
#linux-maximize {
88+
background-color: #4f4f54;
89+
&:active {
90+
background-color: #38383D;
91+
}
92+
}
7693
}
7794

7895
.win-controls {

‎src/app/app.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ <h1>YouTube Player v2.0</h1>
66
<button id="win-maximize" (click)="winMaximize();"></button>
77
<button id="win-close" (click)="winClose();"></button>
88
</div>
9-
<div class="mac-controls">
10-
<button id="mac-close"></button>
11-
<button id="mac-minimize"></button>
12-
<button id="mac-maximize"></button>
9+
<div class="linux-controls">
10+
<button id="linux-close" (click)="winMinimize();"></button>
11+
<button id="linux-minimize" (click)="winMaximize();"></button>
12+
<button id="linux-maximize" (click)="winClose();"></button>
1313
</div>
1414
</div>
1515
<div class="device-bar">

‎src/app/app.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,6 @@ export class AppComponent implements OnInit {
595595
listType = this.playlistVideos[i];
596596
}
597597
if (list === 4) {
598-
console.log('antena 3 e aici');
599598
listType = this._shared.historyVideos[i];
600599
}
601600

‎src/assets/css/main.css

Lines changed: 46 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,60 +1094,76 @@ input[type="radio"]:checked + label .round-check:after {
10941094
color: rgba(255, 255, 255, 0.7);
10951095
}
10961096

1097-
.mac-controls {
1097+
.linux-controls {
10981098
display: none;
10991099
position: absolute;
11001100
left: 10px;
1101-
top: 10px;
1101+
top: 7px;
11021102
z-index: 9999;
11031103
}
11041104

1105-
.mac-controls button {
1105+
.linux-controls button {
11061106
background: transparent;
11071107
border: none;
11081108
outline: 0;
11091109
display: block;
11101110
height: 14px;
11111111
width: 14px;
11121112
padding: 0;
1113+
border-radius: 50%;
11131114
cursor: pointer;
11141115
}
11151116

1116-
.mac-controls button + button {
1117+
.linux-controls button + button {
11171118
margin-left: 5px;
11181119
}
11191120

1120-
#mac-close {
1121-
background-image: url("../img/ui/mac-sprites.png");
1122-
background-size: 62px auto;
1123-
background-position: 0 0;
1124-
background-repeat: no-repeat;
1121+
.app-mac #linux-close {
1122+
background-color: #fc5753;
11251123
}
11261124

1127-
#mac-close:active {
1128-
background-position: 0 -16px;
1125+
.app-mac #linux-close:active {
1126+
background-color: #F53B38;
11291127
}
11301128

1131-
#mac-minimize {
1132-
background-image: url("../img/ui/mac-sprites.png");
1133-
background-size: 62px auto;
1134-
background-position: -16px 0;
1135-
background-repeat: no-repeat;
1129+
.app-mac #linux-minimize {
1130+
background-color: #fdbc40;
11361131
}
11371132

1138-
#mac-minimize:active {
1139-
background-position: -16px -16px;
1133+
.app-mac #linux-minimize:active {
1134+
background-color: #FC9F00;
11401135
}
11411136

1142-
#mac-maximize {
1143-
background-image: url("../img/ui/mac-sprites.png");
1144-
background-size: 62px auto;
1145-
background-position: -32px 0;
1146-
background-repeat: no-repeat;
1137+
.app-mac #linux-maximize {
1138+
background-color: #33c748;
1139+
}
1140+
1141+
.app-mac #linux-maximize:active {
1142+
background-color: #23A134;
1143+
}
1144+
1145+
.app-linux #linux-close {
1146+
background-color: #fc5753;
1147+
}
1148+
1149+
.app-linux #linux-close:active {
1150+
background-color: #F53B38;
11471151
}
11481152

1149-
#mac-maximize:active {
1150-
background-position: -32px -16px;
1153+
.app-linux #linux-minimize {
1154+
background-color: #585869;
1155+
}
1156+
1157+
.app-linux #linux-minimize:active {
1158+
background-color: #464657;
1159+
}
1160+
1161+
.app-linux #linux-maximize {
1162+
background-color: #4f4f54;
1163+
}
1164+
1165+
.app-linux #linux-maximize:active {
1166+
background-color: #38383D;
11511167
}
11521168

11531169
.win-controls {
@@ -2440,3 +2456,8 @@ iframe {
24402456
.app-win .win-controls {
24412457
display: flex;
24422458
}
2459+
2460+
.app-linux .linux-controls,
2461+
.app-mac .linux-controls {
2462+
display: flex;
2463+
}

0 commit comments

Comments
 (0)