From 2a54f2b6b6af830d422bdbbf0128a01fd7e0ed21 Mon Sep 17 00:00:00 2001 From: magnolia-fan Date: Fri, 9 Sep 2011 11:41:45 +0400 Subject: [PATCH] Main preloader --- app/assets/images/artist_loader.gif | Bin 0 -> 2765 bytes app/assets/javascripts/vkontakte.coffee | 3 -- app/assets/stylesheets/application.css | 2 +- app/assets/stylesheets/common.scss | 67 +++++++----------------- app/views/layouts/application.html.haml | 6 ++- 5 files changed, 26 insertions(+), 52 deletions(-) create mode 100644 app/assets/images/artist_loader.gif diff --git a/app/assets/images/artist_loader.gif b/app/assets/images/artist_loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..a3433bfd7b81eaa895e11e39eccbc0034863bfc5 GIT binary patch literal 2765 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 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