public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rendering text shadows on dark text much betterby using the lighter gradient color.

Browse source
This commit is contained in:
Samuel Clay 2012-05-21 14:58:25 -07:00
parent ac0ade9112
commit db7bfcaa08
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/js/newsblur/reader/reader.js
View file

@ -3828,7 +3828,7 @@
.css('background-image', NEWSBLUR.utils.generate_gradient(feed, 'moz')) .css('background-image', NEWSBLUR.utils.generate_gradient(feed, 'moz'))
.css('borderBottom', NEWSBLUR.utils.generate_gradient(feed, 'border')) .css('borderBottom', NEWSBLUR.utils.generate_gradient(feed, 'border'))
.css('borderTop', NEWSBLUR.utils.generate_gradient(feed, 'border')) .css('borderTop', NEWSBLUR.utils.generate_gradient(feed, 'border'))
.css('textShadow', '0 1px 0 ' + NEWSBLUR.utils.generate_gradient(feed, 'border-color')) .css('textShadow', '0 1px 0 ' + NEWSBLUR.utils.generate_gradient(feed, 'shadow'))
.toggleClass('NB-inverse', NEWSBLUR.utils.is_feed_floater_gradient_light(feed)), .toggleClass('NB-inverse', NEWSBLUR.utils.is_feed_floater_gradient_light(feed)),
$.make('div', { className: 'NB-feed-story-header-info' }, [ $.make('div', { className: 'NB-feed-story-header-info' }, [
(story.story_authors && (story.story_authors &&

18
media/js/newsblur/reader/reader_utils.js
View file

@ -25,7 +25,7 @@ NEWSBLUR.utils = {
var g = parseInt(color.substr(2, 2), 16); var g = parseInt(color.substr(2, 2), 16);
var b = parseInt(color.substr(4, 2), 16); var b = parseInt(color.substr(4, 2), 16);
if (type == 'border' || type == 'border-color') { if (type == 'border' || (type == 'shadow' && !this.is_feed_floater_gradient_light(feed))) {
return [ return [
(type == 'border' ? '1px solid ' : '') + 'rgb(', (type == 'border' ? '1px solid ' : '') + 'rgb(',
[ [
@ -35,6 +35,12 @@ NEWSBLUR.utils = {
].join(','), ].join(','),
')' ')'
].join(''); ].join('');
} else if (type == 'shadow') {
return [
'rgb(',
[r+35, g+35, b+35].join(','),
')'
].join('');
} else if (type == 'webkit') { } else if (type == 'webkit') {
return [ return [
'-webkit-gradient(', '-webkit-gradient(',
@ -82,6 +88,11 @@ NEWSBLUR.utils = {
is_feed_floater_gradient_light: function(feed) { is_feed_floater_gradient_light: function(feed) {
if (!feed) return false; if (!feed) return false;
var is_light = feed.get('is_light');
console.log(["is_feed_floater_gradient_light", is_light]);
if (!_.isUndefined(is_light)) {
return is_light;
}
var color = feed.get('favicon_color'); var color = feed.get('favicon_color');
if (!color) return false; if (!color) return false;
@ -89,7 +100,10 @@ NEWSBLUR.utils = {
var g = parseInt(color.substr(2, 2), 16) / 255.0; var g = parseInt(color.substr(2, 2), 16) / 255.0;
var b = parseInt(color.substr(4, 2), 16) / 255.0; var b = parseInt(color.substr(4, 2), 16) / 255.0;
return $.textColor({r: r, g: g, b: b}) != 'white'; is_light = $.textColor({r: r, g: g, b: b}) != 'white';
feed.set('is_light', is_light, {silent: true});
return is_light;
}, },
is_feed_social: function(feed_id) { is_feed_social: function(feed_id) {