Skip to content

Commit 806b281

Browse files
authored
Merge pull request #6 from quead/1.x-develop
1.4 - Adding history of your watched content
2 parents 7ba6621 + fa7c09a commit 806b281

21 files changed

+64562
-63674
lines changed

README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</p>
55

66
# About Player
7-
[![Version](https://img.shields.io/badge/Current%20version-v1.3-brightgreen.svg?style=flat)](https://github.com/quead/angular2-yt-player)
7+
[![Version](https://img.shields.io/badge/Current%20version-v1.4`-brightgreen.svg?style=flat)](https://github.com/quead/angular2-yt-player)
88

99
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/quead/angular2-yt-player/master/LICENSE)
1010
[![GitHub forks](https://img.shields.io/github/forks/quead/angular2-yt-player.svg)](https://github.com/quead/angular2-yt-player/network)
@@ -28,7 +28,7 @@ This player is compatible only with Chrome/webkit browsers because in future I w
2828

2929
`npm install` in root folder
3030

31-
4. Run the player by
31+
4. Run the player by`
3232

3333
`npm start` in root folder
3434

@@ -58,6 +58,11 @@ Just take files from ***dist*** folder
5858

5959
## Changelog
6060

61+
62+
Angular2 YT Player v1.4
63+
- History of your watched videos
64+
- Small fixes
65+
6166
Angular2 YT Player v1.3
6267
- Show/hide video player
6368
- Repeat video
@@ -113,6 +118,9 @@ Angular2 YT Player v1.0.0
113118
- Next/prev video from your playlist **(in v1.9)**
114119
- Adding support for NW.js to export the app for desktop compatible: Windows/Mac OS X/Linux **(in v2.0)**
115120
- Hotkeys for application in desktop (play/pause/next/prev) **(in v2.0)**
121+
- Save your playlists **(unversioned)**
122+
- **Settings**
123+
- *Save your settings **(unversioned)***
116124

117125
#### Roadmap to 3.0
118126
- **Rooms**

dist/assets/css/main.css

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -815,6 +815,11 @@ nav a.is-active:hover {
815815
overflow-y: auto;
816816
}
817817

818+
.video-list-info {
819+
text-align: center;
820+
margin: 5px;
821+
}
822+
818823
#search-video-list {
819824
z-index: 10;
820825
max-height: 430px;
@@ -944,6 +949,65 @@ iframe {
944949
transition: height 0.1s ease-out 0s;
945950
}
946951

952+
#history-video-list {
953+
display: flex;
954+
flex-wrap: wrap;
955+
top: inherit;
956+
bottom: 0;
957+
max-height: none;
958+
height: calc(100% - 150px);
959+
width: 100%;
960+
transition: height 0.1s ease-out 0.1s;
961+
}
962+
963+
#history-video-list .video-item-head {
964+
background-color: #191919;
965+
}
966+
967+
#history-video-list .video-item {
968+
display: flex;
969+
background-color: transparent;
970+
flex-wrap: nowrap;
971+
border-bottom: none;
972+
transition: box-shadow 0.1s ease-out;
973+
padding: 5px;
974+
}
975+
976+
#history-video-list .video-item-image {
977+
flex: inherit;
978+
margin: 0 10px 0 0;
979+
position: relative;
980+
}
981+
982+
#history-video-list .video-item-image img {
983+
width: 60px;
984+
height: auto;
985+
}
986+
987+
#history-video-list .history-video-content {
988+
position: absolute;
989+
bottom: 0;
990+
height: calc(100% - 39px);
991+
width: 100%;
992+
overflow: auto;
993+
background-color: #111111;
994+
color: #ffffff;
995+
}
996+
997+
#history-video-list .history-video-content::-webkit-scrollbar-track {
998+
border-radius: 2px;
999+
}
1000+
1001+
#history-video-list .history-video-content::-webkit-scrollbar {
1002+
width: 5px;
1003+
background-color: transparent;
1004+
}
1005+
1006+
#history-video-list .history-video-content::-webkit-scrollbar-thumb {
1007+
border-radius: 20px;
1008+
background-color: rgba(255, 255, 255, 0.3);
1009+
}
1010+
9471011
#feed-video-list {
9481012
top: inherit;
9491013
bottom: 0;

dist/assets/scss/_videos.scss

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
overflow-y: auto;
66
}
77

8+
.video-list-info {
9+
text-align: center;
10+
margin: 5px;
11+
}
12+
813
#search-video-list {
914
z-index: 10;
1015
max-height: 430px;
@@ -122,6 +127,59 @@ iframe {
122127
}
123128
}
124129

130+
#history-video-list {
131+
display: flex;
132+
flex-wrap: wrap;
133+
top: inherit;
134+
bottom: 0;
135+
max-height: none;
136+
height: calc(100% - 150px);
137+
width: 100%;
138+
transition: height 0.1s ease-out 0.1s;
139+
.video-item-head {
140+
background-color: lighten($c-gray, 3%);
141+
}
142+
.video-item {
143+
display: flex;
144+
background-color: transparent;
145+
flex-wrap: nowrap;
146+
border-bottom: none;
147+
transition: box-shadow 0.1s ease-out;
148+
padding: 5px;
149+
}
150+
.video-item-image {
151+
flex: inherit;
152+
margin: 0 10px 0 0;
153+
position: relative;
154+
img {
155+
width: 60px;
156+
height: auto;
157+
}
158+
}
159+
.history-video-content {
160+
position: absolute;
161+
bottom: 0;
162+
height: calc(100% - 39px);
163+
width: 100%;
164+
overflow: auto;
165+
background-color: $c-gray;
166+
color: $c-white;
167+
&::-webkit-scrollbar-track {
168+
border-radius: 2px;
169+
}
170+
171+
&::-webkit-scrollbar {
172+
width: 5px;
173+
background-color: transparent;
174+
}
175+
176+
&::-webkit-scrollbar-thumb {
177+
border-radius: 20px;
178+
background-color: rgba($c-white, 0.3);
179+
}
180+
}
181+
}
182+
125183
#feed-video-list {
126184
top: inherit;
127185
bottom: 0;

dist/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<base href="/">
5-
<title>YouTube Player v1.3</title>
5+
<title>YouTube Player v1.4</title>
66
<link rel="icon" href="favicon.ico">
77
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,400i,700,900" rel="stylesheet">
88
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
@@ -39,7 +39,7 @@
3939
win.minimize();
4040
};
4141
42-
document.getElementById('win-maximize').onclick = function(){
42+
document.getElementById('win-maximize').o`nclick = function(){
4343
win.maximize();
4444
};
4545

dist/inline.bundle.js

Lines changed: 20 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/inline.bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)