From 6a4933c45330a307c9863a1ebb134946c0e20cd8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 19 Jan 2009 22:16:34 -0800 Subject: [PATCH] Fix #1626 (bad font size on "The New Yorker" recipe) --- src/calibre/web/feeds/news.py | 10 +++-- .../web/feeds/recipes/recipe_new_yorker.py | 8 ++++ src/calibre/web/feeds/templates.py | 38 +++++++++++++------ 3 files changed, 41 insertions(+), 15 deletions(-) diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py index 85ed39a16d..6da6383210 100644 --- a/src/calibre/web/feeds/news.py +++ b/src/calibre/web/feeds/news.py @@ -532,7 +532,9 @@ class BasicNewsRecipe(object, LoggingInterface): if body is not None: templ = self.navbar.generate(False, f, a, feed_len, not self.has_single_feed, - url, __appname__, center=self.center_navbar) + url, __appname__, + center=self.center_navbar, + extra_css=self.extra_css) elem = BeautifulSoup(templ.render(doctype='xhtml').decode('utf-8')).find('div') body.insert(0, elem) if self.remove_javascript: @@ -575,7 +577,8 @@ class BasicNewsRecipe(object, LoggingInterface): def feeds2index(self, feeds): templ = templates.IndexTemplate() - return templ.generate(self.title, self.timefmt, feeds).render(doctype='xhtml') + return templ.generate(self.title, self.timefmt, feeds, + extra_css=self.extra_css).render(doctype='xhtml') @classmethod def description_limiter(cls, src): @@ -626,7 +629,8 @@ class BasicNewsRecipe(object, LoggingInterface): templ = templates.FeedTemplate() - return templ.generate(feed, self.description_limiter).render(doctype='xhtml') + return templ.generate(feed, self.description_limiter, + extra_css=self.extra_css).render(doctype='xhtml') def create_logger(self, feed_number, article_number): diff --git a/src/calibre/web/feeds/recipes/recipe_new_yorker.py b/src/calibre/web/feeds/recipes/recipe_new_yorker.py index f5ce85b351..f8ef5bc8cc 100644 --- a/src/calibre/web/feeds/recipes/recipe_new_yorker.py +++ b/src/calibre/web/feeds/recipes/recipe_new_yorker.py @@ -16,6 +16,14 @@ class NewYorker(BasicNewsRecipe): max_articles_per_feed = 100 no_stylesheets = False use_embedded_content = False + extra_css = ''' + .calibre_feed_list {font-size:xx-small} + .calibre_article_list {font-size:xx-small} + .calibre_feed_title {font-size:normal} + .calibre_recipe_title {font-size:normal} + .calibre_feed_description {font-size:xx-small} + ''' + keep_only_tags = [ dict(name='div' , attrs={'id':'printbody' }) diff --git a/src/calibre/web/feeds/templates.py b/src/calibre/web/feeds/templates.py index b2b96bd9a4..1a6a574129 100644 --- a/src/calibre/web/feeds/templates.py +++ b/src/calibre/web/feeds/templates.py @@ -32,6 +32,11 @@ class NavBarTemplate(Template): xmlns:py="http://genshi.edgewall.org/" > + + +
@@ -60,14 +65,15 @@ class NavBarTemplate(Template): ''') def generate(self, bottom, feed, art, number_of_articles_in_feed, - two_levels, url, __appname__, prefix='', center=True): + two_levels, url, __appname__, prefix='', center=True, + extra_css=None): if prefix and not prefix.endswith('/'): prefix += '/' return Template.generate(self, bottom=bottom, art=art, feed=feed, num=number_of_articles_in_feed, two_levels=two_levels, url=url, __appname__=__appname__, prefix=prefix, - center=center) + center=center, extra_css=extra_css) class IndexTemplate(Template): @@ -88,11 +94,14 @@ class IndexTemplate(Template): + -

${title}

+

${title}

${date}

-