Get rid of more Catalog stuff

This commit is contained in:
Zixaphir 2014-03-07 17:12:43 -07:00
parent 7301f43289
commit 19cd95cf78
7 changed files with 72 additions and 681 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,57 +1,57 @@
"""#{if Style.lightTheme then " """#{if Style.lightTheme then "
.prettyprint { .prettyprint {
background-color: #e7e7e7; background-color: #e7e7e7 !important;
border: 1px solid #dcdcdc; border: 1px solid #dcdcdc !important;
} }
.com { .com {
color: #dd0000; color: #dd0000 !important;
} }
.str, .str,
.atv { .atv {
color: #7fa61b; color: #7fa61b !important;
} }
.pun { .pun {
color: #61663a; color: #61663a !important;
} }
.tag { .tag {
color: #117743; color: #117743 !important;
} }
.kwd { .kwd {
color: #5a6F9e; color: #5a6F9e !important;
} }
.typ, .typ,
.atn { .atn {
color: #9474bd; color: #9474bd !important;
} }
.lit { .lit {
color: #368c72; color: #368c72 !important;
} }
" else " " else "
.prettyprint { .prettyprint {
background-color: rgba(0,0,0,.1); background-color: rgba(0,0,0,.1) !important;
border: 1px solid rgba(0,0,0,0.5); border: 1px solid rgba(0,0,0,0.5) !important;
} }
.tag { .tag {
color: #96562c; color: #96562c !important;
} }
.pun { .pun {
color: #5b6f2a; color: #5b6f2a !important;
} }
.com { .com {
color: #a34443; color: #a34443 !important;
} }
.str, .str,
.atv { .atv {
color: #8ba446; color: #8ba446 !important;
} }
.kwd { .kwd {
color: #987d3e; color: #987d3e !important;
} }
.typ, .typ,
.atn { .atn {
color: #897399; color: #897399 !important;
} }
.lit { .lit {
color: #558773; color: #558773 !important;
} }
"}""" "}"""

View File

@ -8,7 +8,4 @@
<a> <a>
&gt; &gt;
</a> </a>
</div> </div>
<div class="pages cataloglink">
<a href="./" data-index-mode="catalog">Catalog</a>
</div>

View File

@ -1,6 +1,5 @@
CatalogLinks = CatalogLinks =
init: -> init: ->
$.ready @ready
return unless Conf['Catalog Links'] return unless Conf['Catalog Links']
CatalogLinks.el = el = $.el 'label', CatalogLinks.el = el = $.el 'label',
id: 'toggleCatalog' id: 'toggleCatalog'
@ -52,10 +51,3 @@ CatalogLinks =
"http://4index.gropes.us/#{board}" "http://4index.gropes.us/#{board}"
else else
"/#{board}/catalog" "/#{board}/catalog"
ready: ->
if catalogLink = ($('.pages.cataloglink a', d.body) or $ '[href=".././catalog"]', d.body)
catalogLink.textContent = ''
catalogLink.className = 'a-icon'
Header.addShortcut catalogLink, true
catalogLink.id = 'catalog'

View File

@ -1,6 +1,6 @@
QuoteYou = QuoteYou =
init: -> init: ->
return if g.VIEW is 'catalog' or !Conf['Mark Quotes of You'] return if !Conf['Mark Quotes of You']
if Conf['Highlight Own Posts'] if Conf['Highlight Own Posts']
$.addClass doc, 'highlight-own' $.addClass doc, 'highlight-own'
@ -27,9 +27,9 @@ QuoteYou =
return unless @quotes.length return unless @quotes.length
for quotelink in @nodes.quotelinks when QR.db.get Get.postDataFromLink quotelink for quotelink in @nodes.quotelinks when QR.db.get Get.postDataFromLink quotelink
$.add quotelink, $.tn QuoteYou.text $.add quotelink, $.tn QuoteYou.text
$.addClass quotelink, 'you' $.addClass quotelink, 'you'
$.addClass @nodes.root, 'quotesYou' $.addClass @nodes.root, 'quotesYou'
return return
cb: cb:

View File

@ -1,7 +1,7 @@
Style = Style =
sheets: {} sheets: {}
init: -> init: ->
Style.svgs = { Style.svgs = {
<% if (type === 'crx') { %> <% if (type === 'crx') { %>
el: $.el 'div', el: $.el 'div',
id: 'svg_filters' id: 'svg_filters'
@ -29,7 +29,7 @@ Style =
$.asap (-> Header.bar.parentElement), Style.padding $.asap (-> Header.bar.parentElement), Style.padding
$.on window, "resize", Style.padding $.on window, "resize", Style.padding
$.ready @readyInit $.ready @readyInit
asapInit: -> asapInit: ->
<% if (type === 'crx') { %> <% if (type === 'crx') { %>
$.addClass doc, 'blink' $.addClass doc, 'blink'
@ -113,7 +113,7 @@ Style =
right: 0 right: 0
"""<%= grunt.file.read('src/General/css/dynamic.css').replace(/\s+/g, ' ').trim() %>""" """<%= grunt.file.read('src/General/css/dynamic.css').replace(/\s+/g, ' ').trim() %>"""
setTheme: (theme) -> Style.sheets.theme.textContent = Style.theme theme setTheme: (theme) -> Style.sheets.theme.textContent = Style.theme theme
theme: (theme) -> theme: (theme) ->
@ -122,14 +122,14 @@ Style =
replyRGB = "rgb(#{replybg.shiftRGB parseInt(Conf['Silhouette Contrast'], 10), true})" replyRGB = "rgb(#{replybg.shiftRGB parseInt(Conf['Silhouette Contrast'], 10), true})"
Style.lightTheme = bgColor.isLight() Style.lightTheme = bgColor.isLight()
svgs = [ svgs = [
['captcha-filter', "values='#{Style.filter Style.matrix theme["Text"], theme["Input Background"]} 0 0 0 1 0'"] ['captcha-filter', "values='#{Style.filter Style.matrix theme["Text"], theme["Input Background"]} 0 0 0 1 0'"]
['mascot-filter', "values='#{Style.silhouette Style.matrix replyRGB} 0 0 0 1 0'"] ['mascot-filter', "values='#{Style.silhouette Style.matrix replyRGB} 0 0 0 1 0'"]
['grayscale', 'id="color" type="saturate" values="0"'] ['grayscale', 'id="color" type="saturate" values="0"']
['icons-filter', "values='-.6 0 0 0 1 0 -.6 0 0 1 0 0 -.6 0 1 0 0 0 1 0'"] ['icons-filter', "values='-.6 0 0 0 1 0 -.6 0 0 1 0 0 -.6 0 1 0 0 0 1 0'"]
] ]
for svg, i in svgs for svg, i in svgs
<% if (type === 'crx') { %> <% if (type === 'crx') { %>
svgs[i] <% } else { %> svgs[i] <% } else { %>
@ -146,19 +146,17 @@ Style =
slideNav = $.el 'span', slideNav = $.el 'span',
id: 'so-nav' id: 'so-nav'
innerHTML: '<i class=a-icon></a>' innerHTML: '<i class=a-icon></a>'
exec = -> if g.VIEW is 'catalog' then $ '#threads .thread' else true $.add slideNav, $.id('boardNavDesktopFoot')
$.asap exec, -> Header.addShortcut slideNav, true
$.add slideNav, $.id('boardNavDesktopFoot')
Header.addShortcut slideNav, true
# Announcements # Announcements
if Conf['Announcements'] is 'slideout' if Conf['Announcements'] is 'slideout'
if (psa = $.id 'globalMessage') and !psa.hidden if (psa = $.id 'globalMessage') and !psa.hidden
psaIcon = $.el 'i', psaIcon = $.el 'i',
id: 'so-psa' id: 'so-psa'
innerHTML: '<i class=a-icon></a>' innerHTML: '<i class=a-icon></a>'
$.add psaIcon, psa $.add psaIcon, psa
Header.addShortcut psaIcon, true Header.addShortcut psaIcon, true
if g.VIEW is 'thread' if g.VIEW is 'thread'
el = $('body > div.navLinks > a') el = $('body > div.navLinks > a')