Oh lawd, is that a commit?

This commit is contained in:
Zixaphir 2013-06-20 17:09:20 -07:00
parent 07bfadf19a
commit 2c7900442c
10 changed files with 105 additions and 101 deletions

View File

@ -1,5 +1,5 @@
/*
* appchan x - Version 2.1.3 - 2013-06-07
* appchan x - Version 2.1.3 - 2013-06-20
*
* 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

@ -640,6 +640,10 @@ Config =
false
'Do not show mascots on the official catalog pages.'
]
'Silhouettize Mascots': [
false
'Apply a filter to mascots to try to turn them into silhouettes.'
]
Navigation:
'Navigation Alignment': [

View File

@ -2507,10 +2507,9 @@ textarea,
box-shadow: rgba(0,0,0,.8) 0 0 10px;
}
div.reply.post {
background-image: -moz-repeating-linear-gradient(45deg, #303030, #292929, #303030, #303030 3px) !important;
background-image: -o-repeating-linear-gradient(45deg, #303030, #292929, #303030, #303030 3px) !important;
background-image: -webkit-repeating-linear-gradient(45deg, #303030, #292929, #303030, #303030 3px) !important;
border-bottom:#1f1f1f!important;
background-image: linear-gradient(45deg, #303030, #303030 45%, #222222 45%, #222222 55%, #303030 55%, #303030) !important;
background-size: 3px 3px;
border-bottom: #1f1f1f !important;
}
.board .thread:not(.stub) {
background: 0 !important

View File

@ -1658,14 +1658,10 @@ a:only-of-type > .remove {
line-height: 0;
cursor: pointer;
}
.mascot-position-above-post-form.post-form-style-fixed #qr #mascot {
position: absolute;
bottom: 100%;
}
.mascot-position-above-post-form.post-form-style-fixed #qr #mascot img {
.mascot-position-above-post-form.post-form-style-fixed #qr ~ #mascot img {
margin-bottom: -2px;
}
.mascot-position-above-post-form.post-form-style-fixed.post-form-decorations #qr #mascot img {
.mascot-position-above-post-form.post-form-style-fixed.post-form-decorations #qr ~ #mascot img {
margin-bottom: 1px;
}
.mascots #mascot {
@ -1707,6 +1703,9 @@ a:only-of-type > .remove {
.grayscale-mascot #mascot {
<%= filter %>: url('#grayscale');
}
.silhouette-filter #mascot img {
<%= filter %>: url('#mascot-filter');
}
/* Options */
#overlay {
position: fixed;

View File

@ -1,47 +1,45 @@
<div class=qr-wrapper>
<div id=qrtab class=move>
<input type=checkbox id=autohide title=Auto-hide>
<div id=qr-thread-select>
<select data-name=thread title='Create a new thread / Reply'>
<option value=new>New thread</option>
</select>
</div>
<a href=javascript:; class=close title=Close></a>
<div id=qrtab class=move>
<input type=checkbox id=autohide title=Auto-hide>
<div id=qr-thread-select>
<select data-name=thread title='Create a new thread / Reply'>
<option value=new>New thread</option>
</select>
</div>
<form>
<div class=persona>
<input name=name data-name=name list="list-name" placeholder=Name class=field size=1 tabindex=10>
<input name=email data-name=email list="list-email" placeholder=E-mail class=field size=1 tabindex=20>
<input name=sub data-name=sub list="list-sub" placeholder=Subject class=field size=1 tabindex=30>
</div>
<div class=textarea>
<textarea data-name=com placeholder=Comment class=field tabindex=40></textarea>
<span id=char-count></span>
</div>
<div id=dump-list-container>
<div id=dump-list></div>
<a id=add-post href=javascript:; title="Add a post" tabindex=50>+</a>
</div>
<div id=file-n-submit>
<span id=qr-filename-container class=field tabindex=60>
<span id=qr-no-file>No selected file</span>
<span id=qr-filename></span>
<span id=qr-extras-container>
<label id=qr-spoiler-label>
<input type=checkbox id=qr-file-spoiler title='Spoiler image' tabindex=70>
</label>
<span class=description>Spoiler</span>
<a id=dump-button title='Dump list'>+</a>
<span class=description>Dump</span>
<a id=qr-filerm href=javascript:; title='Remove file'></a>
<span class=description>Remove File</span>
</span>
</span>
<input type=submit tabindex=80>
</div>
<input type=file multiple>
</form>
<a href=javascript:; class=close title=Close></a>
</div>
<form>
<div class=persona>
<input name=name data-name=name list="list-name" placeholder=Name class=field size=1 tabindex=10>
<input name=email data-name=email list="list-email" placeholder=E-mail class=field size=1 tabindex=20>
<input name=sub data-name=sub list="list-sub" placeholder=Subject class=field size=1 tabindex=30>
</div>
<div class=textarea>
<textarea data-name=com placeholder=Comment class=field tabindex=40></textarea>
<span id=char-count></span>
</div>
<div id=dump-list-container>
<div id=dump-list></div>
<a id=add-post href=javascript:; title="Add a post" tabindex=50>+</a>
</div>
<div id=file-n-submit>
<span id=qr-filename-container class=field tabindex=60>
<span id=qr-no-file>No selected file</span>
<span id=qr-filename></span>
<span id=qr-extras-container>
<label id=qr-spoiler-label>
<input type=checkbox id=qr-file-spoiler title='Spoiler image' tabindex=70>
</label>
<span class=description>Spoiler</span>
<a id=dump-button title='Dump list'>+</a>
<span class=description>Dump</span>
<a id=qr-filerm href=javascript:; title='Remove file'></a>
<span class=description>Remove File</span>
</span>
</span>
<input type=submit tabindex=80>
</div>
<input type=file multiple>
</form>
<datalist id="list-name"></datalist>
<datalist id="list-email"></datalist>
<datalist id="list-sub"></datalist>

View File

@ -84,9 +84,6 @@ QR =
Main.handleErrors
message: 'Quick Reply dialog creation crashed.'
error: err
if MascotTools.el and ['default', 'above post form'].contains(Conf['Mascot Position']) and
Conf['Post Form Style'] is 'fixed'
$.add QR.nodes.el, MascotTools.el
close: ->
if QR.req
@ -104,8 +101,6 @@ QR =
QR.posts[0].rm()
QR.cooldown.auto = false
QR.status()
if MascotTools.el
$.add d.body, MascotTools.el
focusin: ->
$.addClass QR.nodes.el, 'has-focus'

View File

@ -1,6 +1,6 @@
MascotTools =
init: (mascot) ->
unless mascot and mascot.image?
unless mascot and mascot.image
return unless Conf[g.MASCOTSTRING].length
name = Conf[g.MASCOTSTRING][Math.floor(Math.random() * Conf[g.MASCOTSTRING].length)]
mascot = Mascots[name]
@ -9,6 +9,9 @@ MascotTools =
unless @el
@el = $.el 'div',
id: "mascot"
# ><img>
# >not <img />
# >HTML5
innerHTML: "<img>"
$.on @el, 'mousedown', MascotTools.click
@ -31,6 +34,11 @@ MascotTools =
else
$.addClass doc, 'mascot-position-above-post-form'
if mascot.silhouette and not Conf['Silhouette Filter']
$.addClass doc, 'silhouette-filter'
else unless Conf['Silhouette Filter']
$.rmClass doc, 'silhouette-filter'
unless mascot
if name and not mascot = Mascots[name]
if el then el.src = "" else null

View File

@ -141,12 +141,12 @@ Style =
$.rm node
return
filter: (text, background) ->
filter: (foreground, background) ->
matrix = (fg, bg) -> "#{bg.r} #{-fg.r} 0 0 #{fg.r} #{bg.g} #{-fg.g} 0 0 #{fg.g} #{bg.b} #{-fg.b} 0 0 #{fg.b}"
fgHex = Style.colorToHex(text)
bgHex = Style.colorToHex(background)
fgHex = Style.colorToHex foreground
bgHex = Style.colorToHex background
matrix {
r: parseInt(fgHex.substr(0, 2), 16) / 255
@ -159,7 +159,7 @@ Style =
}
layout: """<%= grunt.file.read('src/General/css/layout.css') %>"""
dynamic: ->
_conf = Conf
@ -187,6 +187,7 @@ Style =
Style.svg.innerHTML = """
<svg xmlns='http://www.w3.org/2000/svg' height=0><filter id='captcha-filter' color-interpolation-filters='sRGB'><feColorMatrix values='#{Style.filter theme["Text"], theme["Input Background"]} 0 0 0 1 0' /></filter></svg>
<svg xmlns='http://www.w3.org/2000/svg' height=0><filter id='mascot-filter' color-interpolation-filters='sRGB'><feColorMatrix values='#{Style.filter theme["Reply Background"], theme["Reply Background"]} 0 0 0 1 0' /></filter></svg>
<svg xmlns='http://www.w3.org/2000/svg' height=0><filter id="grayscale"><feColorMatrix id="color" type="saturate" values="0" /></filter></svg>
<svg xmlns='http://www.w3.org/2000/svg' height=0><filter id="icons-filter" color-interpolation-filters='sRGB'><feColorMatrix values='-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0' /></filter></svg>
"""