diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index d8bef5b..0dc7d61 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -8,6 +8,7 @@ @import "artist"; @import "album-track"; @import "player"; +@import "playlist"; @import "auth"; @import "popup"; @import "tour"; diff --git a/app/assets/stylesheets/player.css.scss b/app/assets/stylesheets/player.css.scss index 8a139ab..4dbb0a0 100644 --- a/app/assets/stylesheets/player.css.scss +++ b/app/assets/stylesheets/player.css.scss @@ -3,11 +3,11 @@ .controls { float: left; - margin: 3px 0 0 -86px; + margin: 3px 0 0 -96px; a { @include inline-block; - margin: 11px 5px 0 0; + margin: 11px 2px 0 0; font-size: 22px; color: #e0e0e0; text-shadow: 0 0 2px rgba(255, 255, 255, .6); diff --git a/app/assets/stylesheets/playlist.css.scss b/app/assets/stylesheets/playlist.css.scss new file mode 100644 index 0000000..2709720 --- /dev/null +++ b/app/assets/stylesheets/playlist.css.scss @@ -0,0 +1,33 @@ +.playlist { + display: block; + position: absolute; + top: 50px; + right: 50%; + width: 618px; + margin-right: -430px; + padding: 5px 0; + background-color: red; + + li { + display: block; + overflow: hidden; + + .inner { + width: 10000px; + margin-left: 5px; + height: 20px; + position: relative; + + .artists { + + &:after { + content: " — " + } + } + .length { + position: absolute; + left: 580px; + } + } + } +} diff --git a/app/views/application/_player.html.haml b/app/views/application/_player.html.haml index 1e01242..893ceb9 100644 --- a/app/views/application/_player.html.haml +++ b/app/views/application/_player.html.haml @@ -4,6 +4,7 @@ %a.icon-play.play{ "href" => "", "data-translate-title" => "header.player.play" } %a.icon-pause.pause{ "href" => "", "data-translate-title" => "header.player.pause" } %a.icon-forward.next{ "href" => "", "data-translate-title" => "header.player.next" } + %a.icon-list.playlist-toggle{ "href" => "", "data-translate-title" => "header.player.playlist" } .progress-bar .bar .title{ "data-translate-contents" => "header.player.waiting" } diff --git a/app/views/application/_playlist.html.haml b/app/views/application/_playlist.html.haml new file mode 100644 index 0000000..8b4bcb7 --- /dev/null +++ b/app/views/application/_playlist.html.haml @@ -0,0 +1,61 @@ +%ul.playlist + %li + .inner + %span.artists Foo Fighters + %span.title This Is a Call + %span.length 3:53 + %li + .inner + %span.artists Foo Fighters + %span.title I'll Stick Around + %span.length 3:53 + %li + .inner + %span.artists Foo Fighters + %span.title Big Me + %span.length 2:12 + %li + .inner + %span.artists Foo Fighters + %span.title Alone + Easy Target + %span.length 4:05 + %li + .inner + %span.artists Foo Fighters + %span.title Good Grief + %span.length 4:01 + %li + .inner + %span.artists Foo Fighters + %span.title Floaty + %span.length 4:30 + %li + .inner + %span.artists Foo Fighters + %span.title Weenie Beenie + %span.length 2:45 + %li + .inner + %span.artists Foo Fighters + %span.title Oh, George + %span.length 3:00 + %li + .inner + %span.artists Foo Fighters + %span.title For All the Cows + %span.length 4:13 + %li + .inner + %span.artists Foo Fighters + %span.title X-Static + %span.length 4:01 + %li + .inner + %span.artists Foo Fighters + %span.title Wattershed + %span.length 2:15 + %li + .inner + %span.artists Foo Fighters + %span.title Exhausted + %span.length 5:47 diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 730e148..8d07c90 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -20,6 +20,7 @@ .preferences %a.icon-cog.toggle-button{ "href" => "/preferences", "data-translate-title" => "header.preferences" } = render partial: "player" + = render partial: "playlist" .container#main You can't steal what's free .fullscreen diff --git a/vendor/assets/javascripts/jquery.autocomplete.js b/vendor/assets/javascripts/jquery.autocomplete.js index da94f65..b69dbbe 100644 --- a/vendor/assets/javascripts/jquery.autocomplete.js +++ b/vendor/assets/javascripts/jquery.autocomplete.js @@ -89,7 +89,7 @@ if (!this.options.width) { this.options.width = this.el.width(); } this.mainContainerId = 'AutocompleteContainter_' + uid; - $('
').appendTo('body'); + $('
').appendTo('body'); this.container = $('#' + autocompleteElId); this.fixPosition();