merge
This commit is contained in:
commit
cbb6aa124b
3 changed files with 9 additions and 2 deletions
|
@ -30,7 +30,7 @@ Ox.load('Geo', function() {
|
|||
loadResources('/static/json/pandora.json', function() {
|
||||
Ox.print('Ox.App load', data);
|
||||
|
||||
Ox.UI.hideLoadingScreen();
|
||||
// Ox.UI.hideLoadingScreen();
|
||||
|
||||
Ox.extend(pandora, {
|
||||
$ui: {
|
||||
|
@ -95,6 +95,8 @@ Ox.load('Geo', function() {
|
|||
pandora.URL.update();
|
||||
};
|
||||
|
||||
Ox.UI.hideLoadingScreen();
|
||||
|
||||
Ox.Theme(pandora.user.ui.theme);
|
||||
pandora.$ui.appPanel = pandora.ui.appPanel().display();
|
||||
|
||||
|
|
|
@ -37,6 +37,11 @@ pandora.ui.home = function() {
|
|||
width: '320px',
|
||||
height: '160px',
|
||||
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))'
|
||||
})
|
||||
.appendTo(that),
|
||||
|
|
|
@ -361,7 +361,7 @@ pandora.ui.item = function() {
|
|||
videoSize: pandora.user.ui.videoSize,
|
||||
width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1
|
||||
}).bindEvent({
|
||||
resize: function(data) {
|
||||
resize: function(event, data) {
|
||||
pandora.$ui.editor.options({
|
||||
height: data
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue