Skip to content

Commit 1e0f8a6

Browse files
committed
Merge branch '1.x-develop' of https://github.com/quead/angular2-yt-player into 1.x-develop
# Conflicts: # .angular-cli.json # dist/assets/css/normalize.css # dist/index.html # dist/inline.bundle.js.map # dist/main.bundle.js # dist/main.bundle.js.map # dist/styles.bundle.js # dist/styles.bundle.js.map # dist/vendor.bundle.js # src/app/shared/lists.service.ts # src/assets/css/normalize.css # src/index.html
2 parents f3eb509 + 852be1d commit 1e0f8a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2673
-38
lines changed

README.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<p align="center">
2-
<a href="https://quead.github.io/demo/" title="YouTube Player Demo">View Demo</a>
3-
<img alt="Angular YouTube Player Logo" src="https://i.imgur.com/GmAP7ip.png" style="height: auto; max-width:100%;" />
2+
Check
3+
<a href="https://quead.github.io/demo/" title="YouTube Player Demo">Demo</a>
4+
or
5+
<a href="https://youtu.be/KB803dWQM-o/" title="Video Presentation">Video Presentation</a>
6+
<img alt="Angular YouTube Player Logo" src="https://i.imgur.com/GyNXPTg.png" style="height: auto; max-width:100%;" />
47
</p>
58

69
# About Player
@@ -37,13 +40,12 @@ This player is compatible only with Chrome/webkit browsers.
3740
**For SASS development**
3841

3942
1. Install [Sass](http://sass-lang.com/install "Sass website")
40-
2. Install [Gulp](https://github.com/gulpjs/gulp "Gulp download")
4143

42-
`npm install -g gulp`
44+
2. Start project by
4345

44-
3. Start compiling the SCSS files by
46+
`npm start`
4547

46-
`gulp sw` in root folder
48+
3. Edit files from src/assets/scss
4749

4850
------
4951

@@ -70,7 +72,10 @@ This player is compatible only with Chrome/webkit browsers.
7072

7173
Just take files from ***dist*** folder
7274

73-
<a href="https://quead.github.io/demo/" title="YouTube Player Demo">View Demo</a>
75+
Check
76+
<a href="https://quead.github.io/demo/" title="YouTube Player Demo">Demo</a>
77+
or
78+
<a href="https://youtu.be/KB803dWQM-o/" title="Video Presentation">Video Presentation</a>
7479

7580
## Changelog
7681
Angular2 YT Player v2.0
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)