Remove newswire moderation color

merge-requests/30/head
Bob Mottram 2020-10-06 15:11:38 +01:00
parent a91f7bbb75
commit ef94e153ea
2 changed files with 2 additions and 21 deletions

View File

@ -67,7 +67,6 @@
--quote-font-size: 120%; --quote-font-size: 120%;
--line-spacing: 130%; --line-spacing: 130%;
--line-spacing-newswire: 100%; --line-spacing-newswire: 100%;
--newswire-moderate-color: yellow;
--column-left-width: 10vw; --column-left-width: 10vw;
--column-center-width: 80vw; --column-center-width: 80vw;
--column-right-width: 10vw; --column-right-width: 10vw;
@ -232,13 +231,6 @@ a:focus {
line-height: var(--line-spacing-newswire); line-height: var(--line-spacing-newswire);
} }
.newswireItemModerate {
font-size: var(--font-size-newswire);
color: var(--newswire-moderate-color);
font-weight: bold;
line-height: var(--line-spacing-newswire);
}
.newswireDate { .newswireDate {
font-size: var(--font-size-newswire); font-size: var(--font-size-newswire);
color: var(--newswire-date-color); color: var(--newswire-date-color);

View File

@ -5358,19 +5358,8 @@ def htmlNewswire(newswire: str) -> str:
""" """
htmlStr = '' htmlStr = ''
for dateStr, item in newswire.items(): for dateStr, item in newswire.items():
# if the item is to be moderated then show it in a different style htmlStr += '<p class="newswireItem">' + \
shown = False '<a href="' + item[1] + '">' + item[0] + '</a>'
if len(item) > 2:
if item[2].startswith('moderate'):
moderationUrl = '/moderate?' + item[1]
htmlStr += '<p class="newswireItemModerate">' + \
'<a href="' + moderationUrl + '">' + item[0] + '</a>'
shown = True
if not shown:
# unmoderated item
htmlStr += '<p class="newswireItem">' + \
'<a href="' + item[1] + '">' + item[0] + '</a>'
htmlStr += ' <label class="newswireDate">' htmlStr += ' <label class="newswireDate">'
htmlStr += dateStr.replace('+00:00', '') + '</label></p>' htmlStr += dateStr.replace('+00:00', '') + '</label></p>'
return htmlStr return htmlStr