diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2014-05-11 14:55:11 +0200 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2014-05-11 14:55:11 +0200 |
| commit | eb4e7ad92ea58e69529064cecf81808f71191453 (patch) | |
| tree | 7254b91b2583561e03a8e72d108aee37bb2e5529 | |
| parent | 2cf0019a0891c5be8a9db221ed2ffa94c1cd10c5 (diff) | |
| parent | c72c04a5ee09b8883b00bb1dba377f020a7a3cf8 (diff) | |
| download | playGraph-eb4e7ad92ea58e69529064cecf81808f71191453.tar.gz playGraph-eb4e7ad92ea58e69529064cecf81808f71191453.tar.bz2 playGraph-eb4e7ad92ea58e69529064cecf81808f71191453.zip | |
Merge branch 'master' of github.com:jodersky/playGraph
Conflicts:
app/index.html
| -rw-r--r-- | app/css/lbarman.css | 6 | ||||
| -rw-r--r-- | app/index.html | 4 | ||||
| -rw-r--r-- | app/js/yt_musicsearch.js | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/app/css/lbarman.css b/app/css/lbarman.css index eb636c6..f827057 100644 --- a/app/css/lbarman.css +++ b/app/css/lbarman.css @@ -107,6 +107,7 @@ a, a:hover } h1 { + margin-top:10px; color:#666; border-bottom:1px solid #999; padding-bottom:10px; @@ -122,6 +123,7 @@ input } fieldset { + padding:5px; margin-bottom:30px; padding-top:20px; padding-bottom:20px; @@ -151,4 +153,8 @@ fieldset { margin:5px; margin-bottom:10px; +} +body +{ + padding:30px; }
\ No newline at end of file diff --git a/app/index.html b/app/index.html index a23c6a5..53170e6 100644 --- a/app/index.html +++ b/app/index.html @@ -47,9 +47,7 @@ </ul> </fieldset> - <iframe id="ytplayer" type="text/html" width="100%" -src="https://www.youtube.com/embed/M7lc1UVf-VE?autoplay=1&modestbranding=1" -frameborder="0" allowfullscreen></iframe> + <iframe id="ytplayer" type="text/html" width="100%" src="" frameborder="0" allowfullscreen></iframe> </div> diff --git a/app/js/yt_musicsearch.js b/app/js/yt_musicsearch.js index 3e12f01..028ae6e 100644 --- a/app/js/yt_musicsearch.js +++ b/app/js/yt_musicsearch.js @@ -30,7 +30,6 @@ function changeSong() { - alert("Done"); clearInterval(musicTimer); } |