diff options
| author | Nicolas Bornand <nicolas74@gmail.com> | 2014-05-11 14:55:52 +0200 |
|---|---|---|
| committer | Nicolas Bornand <nicolas74@gmail.com> | 2014-05-11 14:55:52 +0200 |
| commit | da73f10c8af0b97f3ed63ecd4bd68ec3e2c0b040 (patch) | |
| tree | fc962a5fe9bf9cf2b444b4a183d17beb39e0f1db | |
| parent | 65dc43b8517de71eba3c9d8f8f5d47950dd7b7b0 (diff) | |
| parent | c72c04a5ee09b8883b00bb1dba377f020a7a3cf8 (diff) | |
| download | playGraph-da73f10c8af0b97f3ed63ecd4bd68ec3e2c0b040.tar.gz playGraph-da73f10c8af0b97f3ed63ecd4bd68ec3e2c0b040.tar.bz2 playGraph-da73f10c8af0b97f3ed63ecd4bd68ec3e2c0b040.zip | |
Merge origin/master
| -rw-r--r-- | app/css/lbarman.css | 6 | ||||
| -rw-r--r-- | app/index.html | 2 | ||||
| -rw-r--r-- | app/js/yt_musicsearch.js | 1 |
3 files changed, 7 insertions, 2 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 825ccdd..067d314 100644 --- a/app/index.html +++ b/app/index.html @@ -48,7 +48,7 @@ </fieldset> <iframe id="ytplayer" type="text/html" width="640" height="360" -src="https://www.youtube.com/embed/M7lc1UVf-VE?autoplay=1&modestbranding=1" +src="" frameborder="0" allowfullscreen></iframe> 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); } |