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

Move compact NSFW badge to the title line & add boxy style.

Browse Source
This commit is contained in:
Max Goodman
2012-02-22 13:08:45 -08:00
parent f02fba990b
commit 15bbb8217e
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
r2/r2/public/static/css/compact.css
View File

@@ -213,7 +213,7 @@ body[orient="landscape"] > #topbar > h1 { margin-left: -125px; width: 250px; }
.link > .thing_options { font-size: x-small; margin: none; display: block; float: left; clear: left; margin: 2px 0px 0px 10px; }
.nsfw-warning { color: #ac3939; text-decoration: none; border: 0 none; }
.nsfw-warning { -moz-border-radius: 3px; -webkit-border-radius: 3px; -o-border-radius: 3px; -ms-border-radius: 3px; -khtml-border-radius: 3px; border-radius: 3px; color: #ac3939; text-decoration: none; font-weight: normal; font-size: 9px; margin-left: 5px; padding: 0 2px; border: 1px solid #d27979 !important; }
/* Comment count */
.commentcount { float: right; margin: 5px; width: 45px; text-align: right; }

7
r2/r2/public/static/css/compact.scss
View File

@@ -684,9 +684,14 @@ body[orient="landscape"] > #topbar > h1 {
}
.nsfw-warning {
@include border-radius(3px);
color: #ac3939;
text-decoration: none;
border: 0 none;
font-weight: normal;
font-size: 9px;
margin-left: 5px;
padding: 0 2px;
border: 1px solid #d27979 !important;
}
/* Comment count */

14
r2/r2/templates/link.compact
View File

@@ -75,6 +75,13 @@
(<a href="${thing.domain_path}">${thing.domain}</a>)
%endif
</span>
%if thing.nsfw:
<span class="nsfw-warning">
<acronym title="${_('Adult content: Not Safe For Work')}">
${_("NSFW")}
</acronym>
</span>
%endif
</p>
<%
video_hide = thing.link_child and thing.link_child.css_style.strip(' ') == 'video'
@@ -85,13 +92,6 @@
${thing.link_child.css_style}"></a>
%endif
<div class="tagline">
%if thing.nsfw:
<span class="nsfw-warning">
<acronym title="${_('Adult content: Not Safe For Work')}">
${_("NSFW")}
</acronym>
</span>
%endif
${tagline()}
</div>
</div>