decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
j 2011-08-27 10:46:12 +02:00
commit cbb6aa124b
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
static/js/pandora.js
View file

@ -30,7 +30,7 @@ Ox.load('Geo', function() {
loadResources('/static/json/pandora.json', function() { loadResources('/static/json/pandora.json', function() {
Ox.print('Ox.App load', data); Ox.print('Ox.App load', data);
Ox.UI.hideLoadingScreen(); // Ox.UI.hideLoadingScreen();
Ox.extend(pandora, { Ox.extend(pandora, {
$ui: { $ui: {
@ -95,6 +95,8 @@ Ox.load('Geo', function() {
pandora.URL.update(); pandora.URL.update();
}; };
Ox.UI.hideLoadingScreen();
Ox.Theme(pandora.user.ui.theme); Ox.Theme(pandora.user.ui.theme);
pandora.$ui.appPanel = pandora.ui.appPanel().display(); pandora.$ui.appPanel = pandora.ui.appPanel().display();

5
static/js/pandora/ui/home.js
View file

@ -37,6 +37,11 @@ pandora.ui.home = function() {
width: '320px', width: '320px',
height: '160px', height: '160px',
margin: 'auto', margin: 'auto',
})
.css({
backgroundImage: '-moz-linear-gradient(top, rgba(32, 32, 32, 0.8), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))'
})
.css({
backgroundImage: '-webkit-linear-gradient(top, rgba(32, 32, 32, 0.8), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))' backgroundImage: '-webkit-linear-gradient(top, rgba(32, 32, 32, 0.8), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))'
}) })
.appendTo(that), .appendTo(that),

2
static/js/pandora/ui/item.js
View file

@ -361,7 +361,7 @@ pandora.ui.item = function() {
videoSize: pandora.user.ui.videoSize, videoSize: pandora.user.ui.videoSize,
width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1 width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1
}).bindEvent({ }).bindEvent({
resize: function(data) { resize: function(event, data) {
pandora.$ui.editor.options({ pandora.$ui.editor.options({
height: data height: data
}); });