diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py index 72bc8436c..7857d6f93 100644 --- a/r2/r2/lib/app_globals.py +++ b/r2/r2/lib/app_globals.py @@ -118,7 +118,11 @@ class Globals(object): self.rec_cache = Memcache(self.rec_cache, pickleProtocol = 1) # set default time zone if one is not set - self.tz = pytz.timezone(global_conf.get('timezone')) + tz = global_conf.get('timezone') + dtz = global_conf.get('display_timezone', tz) + + self.tz = pytz.timezone(tz) + self.display_tz = pytz.timezone(dtz) #load the database info self.dbm = self.load_db_params(global_conf) diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py index 8315ed9ba..2102ff278 100644 --- a/r2/r2/models/link.py +++ b/r2/r2/models/link.py @@ -570,7 +570,7 @@ class Comment(Thing, Printable): if focal_comment == item._id36: - extra_css += 'border' + extra_css += " border" # don't collapse for admins, on profile pages, or if deleted diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css index 1f9b3b1c8..dc3a7ac5d 100644 --- a/r2/r2/public/static/css/reddit.css +++ b/r2/r2/public/static/css/reddit.css @@ -405,7 +405,7 @@ before enabling */ .infotable { margin-top: 5px; margin-bottom: 10px; } .infotable .small { font-size: smaller; } -.infotable td { padding-right: 3px; } +.infotable td { padding-right: 1em; } .infotable a:hover { text-decoration: underline } .infotable .state-button a { background-color: #F0F0F0; color: gray; } .infotable .bold { font-weight: bold; } @@ -1230,8 +1230,19 @@ textarea.gray { color: gray; } vertical-align: top; } +.ring { + font-weight:bold; + background-color:red; + color:white; + text-align:center; + padding-left: 3px; + padding-right: 4px !important; + cursor: pointer; +} + .vote-note { - max-width: 200px; + padding-left: 3px; + max-width: 170px; } .vote-a-notes { color: red; @@ -2161,11 +2172,12 @@ ul.tabmenu.formtab { background-color: #ffc; padding-left: 5px; } -/*admin see deleted comment*/ .usertext.grayed .usertext-body { color: gray; - background-color: #e0e0e0; + background-color: #f0f0f0; padding-left: 5px; + padding-right: 5px; + display: inline-block; } .usertext button {