Merge branch 'master' of git://github.com/vampiricwulf/appchan-x

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-02-23 08:05:27 -07:00
commit 56ed876be8
6 changed files with 101 additions and 8 deletions

View File

@ -1,5 +1,5 @@
/*
* appchan x - Version 2.8.13 - 2014-02-20
* appchan x - Version 2.8.13 - 2014-02-23
*
* Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -409,4 +409,41 @@ a .name {
.quote-shadows #qr {
box-shadow: 5px 5px 5px #{theme['Shadow Color']};
}
/* /f/ */
.mobile.center {
display:none!important;
}
.postblock {
color: #{theme["Text"]};
font-weight: bold;
font-size: 10pt;
}
tbody > tr:nth-of-type(2n+1){
background: #{theme["Reply Background"]} !important;
}
table.flashListing {
margin: auto !important;
border-spacing: 1px !important;
}
table.flashListing .highlightPost::after {
content: '●';
color: #{theme["Text"]};
position: relative;
left: 12px;
margin-left: -10px;
}
.flashListing > tbody {
background: url('/image/fade.png') repeat-x scroll center top #{backgroundC} !important;
padding-top: 200px;
}
.flashListing td {
padding-left: 4px !important;
padding-right: 4px !important;
text-align: center !important;
}
#delform[action='https://sys.4chan.org/f/up.php'], #delform[action='https://sys.4chan.org/f/up.php'] .postblock {
background: none !important;
border: none !important;
box-shadow: none !important;
}
#{theme["Custom CSS"].replace(/\s+/g, ' ').trim()}

View File

@ -1,6 +1,6 @@
FappeTyme =
init: ->
return if !(Conf['Fappe Tyme'] or Conf['Werk Tyme']) or g.VIEW is 'catalog' or g.BOARD is 'f'
return if !(Conf['Fappe Tyme'] or Conf['Werk Tyme']) or g.VIEW is 'catalog' or g.BOARD.ID is 'f'
for type in ["Fappe", "Werk"] when Conf["#{type} Tyme"]
lc = type.toLowerCase()

View File

@ -22,6 +22,22 @@ Style =
while item = items[i++]
Style.sheets[item[0]] = $.addStyle item[1], item[0]
if g.BOARD.ID is 'f'
$.ready ->
$.globalEval 'SWFEmbed.init()'
if g.VIEW is 'thread'
sauceLink = d.createElement 'a'
swfName = $ '.fileText > a'
badLink = $ '.navLinks'
i = 0
while i < 3
badLink.removeChild badLink.firstChild
i++
sauceLink.textContent = 'Check Sauce on SWFCHAN'
sauceLink.href = 'http://eye.swfchan.com/search/?q=' + swfName.textContent
badLink.appendChild(sauceLink)
badLink.removeChild badLink.firstChild.nextSibling
# Non-customizable
$.addStyle JSColor.css(), 'jsColor'