don't load theme stylesheets, they get imported by ui stylesheet
This commit is contained in:
parent
fd58906e04
commit
d4050526c5
4 changed files with 9 additions and 7 deletions
|
@ -79,7 +79,7 @@ Ox.App = (function() {
|
|||
};
|
||||
});
|
||||
that.api.init(getUserData(), function(result) {
|
||||
Ox.UI.hideLoadingScreen();
|
||||
//Ox.UI.hideLoadingScreen();
|
||||
that.triggerEvent({
|
||||
load: result.data
|
||||
});
|
||||
|
|
|
@ -22,6 +22,7 @@ Ox.Theme = function(theme) {
|
|||
return false;
|
||||
}
|
||||
});
|
||||
Ox.print('getTheme', theme)
|
||||
return theme;
|
||||
}
|
||||
|
||||
|
@ -35,11 +36,11 @@ Ox.Theme = function(theme) {
|
|||
var $this = $(this);
|
||||
$this.attr({
|
||||
src: $this.attr('src')
|
||||
.replace('Ox.UI.' + currentTheme, 'Ox.UI.' + theme)
|
||||
.replace('/Ox.UI.' + currentTheme, '/Ox.UI.' + theme)
|
||||
});
|
||||
});
|
||||
}
|
||||
return currentTheme;
|
||||
return theme;
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
@ -43,7 +43,8 @@ Ox.load.UI = function(options, callback) {
|
|||
|
||||
function showScreen() {
|
||||
|
||||
var body = Ox.element('body'),
|
||||
var body = Ox.element('body')
|
||||
.addClass('OxTheme' + Ox.toTitleCase(options.theme)),
|
||||
css = {
|
||||
position: 'absolute',
|
||||
left: 0,
|
||||
|
@ -170,7 +171,6 @@ Ox.load.UI = function(options, callback) {
|
|||
.done(function() {
|
||||
Ox.print('promises done')
|
||||
$(function() {
|
||||
Ox.Theme(options.theme);
|
||||
if (options.showScreen && options.hideScreen) {
|
||||
Ox.UI.hideLoadingScreen();
|
||||
}
|
||||
|
|
|
@ -57,7 +57,8 @@ for path, dirnames, filenames in os.walk(source_path + 'css/'):
|
|||
for filename in filenames:
|
||||
source = os.path.join(path, filename)
|
||||
target = source.replace(source_path, build_path)
|
||||
copy_file(source, target)
|
||||
write_link(source, target)
|
||||
if filename == 'Ox.UI.css':
|
||||
append_file(target.replace(build_path, ''))
|
||||
|
||||
# js
|
||||
|
|
Loading…
Reference in a new issue