0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

remove hardcoded references to classic theme

Browse source
This commit is contained in:
rolux 2013-02-10 18:08:39 +05:30
parent 8809caac28
commit 3d84bc7d0b
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
static/js/pandora.js
View file

@ -119,7 +119,6 @@ appPanel
gradient.style.background = theme == 'oxlight' ? '-webkit-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))' gradient.style.background = theme == 'oxlight' ? '-webkit-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))'
: theme == 'oxmedium' ? '-webkit-linear-gradient(top, rgba(144, 144, 144, 0.75), rgba(144, 144, 144, 1), rgba(144, 144, 144, 1))' : theme == 'oxmedium' ? '-webkit-linear-gradient(top, rgba(144, 144, 144, 0.75), rgba(144, 144, 144, 1), rgba(144, 144, 144, 1))'
: '-webkit-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))'; : '-webkit-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))';
} }
var loadingScreen = document.createElement('div'); var loadingScreen = document.createElement('div');
loadingScreen.setAttribute('id', 'loadingScreen'); loadingScreen.setAttribute('id', 'loadingScreen');

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

@ -261,8 +261,9 @@ pandora.ui.home = function() {
}, function(result) { }, function(result) {
var lists = result.data.items, var lists = result.data.items,
counter = 0, items = 8, mouse = false, position = 0, selected = 0, counter = 0, items = 8, mouse = false, position = 0, selected = 0,
color = Ox.Theme() == 'classic' color = Ox.Theme() == 'oxlight' ? 'rgb(32, 32, 32)'
? 'rgb(32, 32, 32)' : 'rgb(224, 224, 224)', : Ox.Theme() == 'oxmedium' ? 'rgb(144, 144, 144)'
: 'rgb(224, 224, 224)',
$label, $icon, $text, $label, $icon, $text,
$listsBox, $listsContainer, $listsContent, $listsBox, $listsContainer, $listsContent,
$listBox = [], $listIcon = [], $listBox = [], $listIcon = [],

4
static/js/pandora/news.js
View file

@ -9,8 +9,8 @@ pandora.ui.news = function(width, height) {
$right = $('<div>') $right = $('<div>')
.css({position: 'absolute', top: '16px', right: '16px', width: '192px'}) .css({position: 'absolute', top: '16px', right: '16px', width: '192px'})
.appendTo(that), .appendTo(that),
backgroundColor = Ox.Theme() == 'classic' backgroundColor = Ox.Theme() == 'oxlight' ? 'rgb(224, 224, 224)'
? 'rgb(224, 224, 224)' : 'rgb(32, 32, 32)', : Ox.Theme() == 'oxmedium' ? 'rgb(128, 128, 128)' : 'rgb(32, 32, 32)',
isEditable = pandora.site.capabilities.canEditSitePages[pandora.user.level], isEditable = pandora.site.capabilities.canEditSitePages[pandora.user.level],
items = [], items = [],
selected, selected,

12
static/js/pandora/statisticsDialog.js
View file

@ -290,8 +290,8 @@ pandora.ui.statisticsDialog = function() {
.css({ .css({
padding: '16px', padding: '16px',
overflowY: 'auto', overflowY: 'auto',
background: pandora.user.ui.theme == 'classic' background: pandora.user.ui.theme == 'oxlight' ? 'rgb(240, 240, 240)'
? 'rgb(240, 240, 240)' : pandora.user.ui.theme == 'oxmedium' ? 'rgb(160, 160, 160)'
: 'rgb(16, 16, 16)' : 'rgb(16, 16, 16)'
}); });
if (id == 'seen') { if (id == 'seen') {
@ -306,7 +306,7 @@ pandora.ui.statisticsDialog = function() {
) : Ox.rgb( ) : Ox.rgb(
(Math.abs(11.5 - parseInt(split[0], 10)) - 0.5) * -11, 1, 0.5 (Math.abs(11.5 - parseInt(split[0], 10)) - 0.5) * -11, 1, 0.5
); );
if (pandora.user.ui.theme == 'classic') { if (pandora.user.ui.theme == 'oxlight') {
color = getColor(color); color = getColor(color);
} }
return color; return color;
@ -359,7 +359,7 @@ pandora.ui.statisticsDialog = function() {
var color = Ox.getGeoColor( var color = Ox.getGeoColor(
key == 'continent' ? value : value.split(', ')[1] key == 'continent' ? value : value.split(', ')[1]
); );
if (pandora.user.ui.theme == 'classic') { if (pandora.user.ui.theme == 'oxlight') {
color = getColor(color); color = getColor(color);
} }
return color; return color;
@ -448,7 +448,7 @@ pandora.ui.statisticsDialog = function() {
color: function(value) { color: function(value) {
var name = version ? getName(key, value) : value, var name = version ? getName(key, value) : value,
color = colors[key][name]; color = colors[key][name];
if (pandora.user.ui.theme == 'classic') { if (pandora.user.ui.theme == 'oxlight') {
color = getColor(color); color = getColor(color);
} }
return color; return color;
@ -516,7 +516,7 @@ pandora.ui.statisticsDialog = function() {
})).map(function(c) { })).map(function(c) {
return Math.round(Ox.sum(c) / 2); return Math.round(Ox.sum(c) / 2);
}); });
if (pandora.user.ui.theme == 'classic') { if (pandora.user.ui.theme == 'oxlight') {
color = getColor(color); color = getColor(color);
} }
return color; return color;