github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-26 15:28:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use the default subreddit's header size for the main logo.

Browse Source
This commit is contained in:
Max Goodman
2011-11-11 03:05:52 -08:00
parent 9c5d73f3df
commit 1945c6b838
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
r2/r2/models/subreddit.py
View File

@@ -819,11 +819,14 @@ class DefaultSR(_DefaultSR):
def header(self):
return (self._base and self._base.header) or _DefaultSR.header
@property
def header_title(self):
return (self._base and self._base.header_title) or ""
@property
def header_size(self):
return (self._base and self._base.header_size) or None
@property
def stylesheet_contents(self):
return self._base.stylesheet_contents if self._base else ""

2
r2/r2/templates/redditheader.html
View File

@@ -39,8 +39,8 @@
header_img = c.site.header
header_size = c.site.header_size
else:
header_size = None
header_img = d.header
header_size = d.header_size
header_title = d.header_title
if header_size is None and header_img == d.header:
header_size = (120, 40)