Sass integrated

This commit is contained in:
magnolia-fan
2011-06-27 15:14:14 +04:00
parent c95fb3514a
commit ab63697594
28 changed files with 1427 additions and 764 deletions
+1 -1
View File
@@ -46,7 +46,7 @@ var Ajax = {
load404Page: function() {
$.get('/404.html', function(data){
$('#data-container .inner').html(data);
$('.data-container .inner').html(data);
beathaven.redrawScrollbar();
})
},
+8 -8
View File
@@ -20,12 +20,12 @@ var beathaven = {
},
adjustSizes: function() {
$('#data-container').height($(window).height() - $('#header-container').height());
$('#data-container').width($(window).width() - $('#player').width()).scrollbar();
$('#player-container').height($(window).height());
$('#playlist').height($(window).height() - $('#player').height() - $('#player-container .additional-controls').height());
$('.data-container').height($(window).height() - $('.header-container').height());
$('.data-container').width($(window).width() - $('.player').width()).scrollbar();
$('.player-container').height($(window).height());
$('.playlist').height($(window).height() - $('.player').height() - $('.player-container .additional-controls').height());
$('#playlist').scrollbar();
$('.playlist').scrollbar();
},
checkRedrawScrollbar: function() {
@@ -33,7 +33,7 @@ var beathaven = {
if (typeof document.activeElement.id !== 'undefined') {
focused_id = document.activeElement.id;
}
var outer_height = $('#data-container > div').outerHeight();
var outer_height = $('.data-container > div').outerHeight();
if (outer_height > 300 && outer_height != beathaven.last_height) {
beathaven.last_height = outer_height;
beathaven.redrawScrollbar();
@@ -46,8 +46,8 @@ var beathaven = {
},
redrawScrollbar: function() {
$('#data-container').html($('#data-container').find('.inner').first());
$('#data-container').scrollbar();
$('.data-container').html($('.data-container').find('.inner').first());
$('.data-container').scrollbar();
}
}
+10 -10
View File
@@ -53,21 +53,21 @@ var Pages = {
}
})
$('#data-container').css('backgroundImage', 'none');
$('#data-container .inner').html('').append(artist_info).append(albums_info);
$('.data-container').css('backgroundImage', 'none');
$('.data-container .inner').html('').append(artist_info).append(albums_info);
yaCounter7596904.hit(Ajax.getAnchor(), data.artist.name, Ajax.referer);
Ajax.setTitle(data.artist.name);
},
renderSearch: function(data) {
$('#data-container').css('background', 'url(/images/concrete_wall_2.png) 0 -30px repeat');
$('#data-container .inner').html(data);
$('.data-container').css('background', 'url(/images/concrete_wall_2.png) 0 -30px repeat');
$('.data-container .inner').html(data);
$('#search-container')
.css('marginLeft', ($('#data-container').width() - 425) / 2 + 'px')
.css('marginTop', ($('#data-container').height() / 2 - 230) +'px')
.height(($('#data-container').height() - $('#search_form').height()) / 2);
$('.search-container')
.css('marginLeft', ($('.data-container').width() - 425) / 2 + 'px')
.css('marginTop', ($('.data-container').height() / 2 - 230) +'px')
.height(($('.data-container').height() - $('#search_form').height()) / 2);
setTimeout(function(){
$('#search_field').bh_autocomplete({
@@ -88,8 +88,8 @@ var Pages = {
},
renderSettings: function(data) {
$('#data-container').css('background', 'none');
$('#data-container .inner').html(data);
$('.data-container').css('background', 'none');
$('.data-container .inner').html(data);
yaCounter7596904.hit(Ajax.getAnchor(), 'Settings', Ajax.referer);
Ajax.setTitle('Settings');
$('.settings-container .tabs .tab').first().trigger('click');
+5 -5
View File
@@ -3,17 +3,17 @@ var Search = {
pics: [],
showSpinner: function() {
$('#search-container input').attr('disabled', 'disabled').blur();
$('#search-container img').show();
$('.search-container input').attr('disabled', 'disabled').blur();
$('.search-container img').show();
$('.autocomplete-container').hide();
$('.artist_loading.failed').hide();
Search.hideSuggestions();
},
hideSpinner: function() {
$('#search-container input').removeAttr('disabled');
$('#search_field').focus();
$('#search-container img').hide();
$('.search-container input').removeAttr('disabled');
$('.search_field').focus();
$('.search-container img').hide();
},
showSuggestions: function(values) {