diff --git a/app/assets/images/artist_loader.gif b/app/assets/images/artist_loader.gif new file mode 100644 index 0000000..a3433bf Binary files /dev/null and b/app/assets/images/artist_loader.gif differ diff --git a/app/assets/javascripts/vkontakte.coffee b/app/assets/javascripts/vkontakte.coffee index a684c0c..a2f30cb 100644 --- a/app/assets/javascripts/vkontakte.coffee +++ b/app/assets/javascripts/vkontakte.coffee @@ -26,9 +26,6 @@ class window.Vkontakte _session = new Session(response.session) $('#vk_login, .auth-notice').hide() - $('#vk_logout').css display: 'block' - - $('#search_field').focus() if $('#search_field').length > 0 _session.query '/user/auth', {}, (ar) -> if ar.newbie diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 255138d..ac46600 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -3,7 +3,7 @@ *= require bootstrap *= require header -* require common +*= require common *= require misc *= require albums diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 634877e..5525a24 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,50 +1,23 @@ -* { - margin: 0; - padding: 0; - border: none; +@import "opacity"; + +.fullscreen { + position: fixed; + z-index: 999999; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: #ffffff; + @include opacity(0.9); + .inner { + position: relative; + top: 50%; + left: 50%; + margin: -32px 0 0 -32px; + } } -html, body { - overflow: hidden; -} - -body { - font-family: Helvetica Neue, Helvetica, Arial, sans-serif; - font-size: 14px; - -moz-user-select: none; - -khtml-user-select: none; - -webkit-user-select: none; - user-select: none; - cursor: default; - min-width: 1000px; - width: 100%; -} - -.header-container { - margin-right: 350px; -} -.player-container { - width: 350px; - height: 600px; - float: right; - background-color: #222; -} -.data-container { - width: auto; - margin-right: 350px; - overflow-y: auto; - min-width: 650px; -} - -.player { - width: 100%; - height: 120px; -} -.playlist { - width: 100%; - overflow-y: auto; -} - -.subpages { - display: none; +.artist-loader { + float: right; + margin: -26px 0 0 10px; } \ No newline at end of file diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index d7a89a0..5ef8d6e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -23,6 +23,8 @@ %a.about{ :href => "#/about/" } About %form{ :action => "" } %input#search{ :type => "text", :placeholder => "Search" } + .artist-loader + = image_tag "artist_loader.gif" %ul.nav.secondary-nav %li.dropdown %a.dropdown-toggle{ :href => "#" } chez @@ -81,7 +83,9 @@ .fullscreen .inner - = image_tag "loader" + = image_tag "loader.gif" + + #vk_api_transport