Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tighten up mascot positions.

Browse Source
This commit is contained in:
Zixaphir 2013-05-09 02:26:15 -07:00
parent 94124f953b
commit 38a053a2fc
7 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@ zixaphir
- Fix Board Subtitle option - Fix Board Subtitle option
- Revert to Mayhem-style notifications - Revert to Mayhem-style notifications
- Add options for adding QR Shortcuts to the header or page - Add options for adding QR Shortcuts to the header or page
- Try to tighten up mascot positions in relation to the post form
### 2.0.1 - 2013-05-08 ### 2.0.1 - 2013-05-08
seaweed seaweed

2
builds/appchan-x.js
View File

@ -10505,7 +10505,7 @@
return null; return null;
} }
} }
position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 19.6 + (g.VIEW !== 'thread' || !!$('#postForm input[name=spoiler]') ? 1.4 : 0) + (Conf['Show Post Form Header'] ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em"; position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 20.1 + (Conf['Show Post Form Header'] && ['fixed', 'transparent fade', 'slideout'].contains(Conf['Post Form Style']) ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em";
if (Conf['editMode']) { if (Conf['editMode']) {
if (!(mascot = editMascot || (mascot = Mascots[Conf["mascot"]]))) { if (!(mascot = editMascot || (mascot = Mascots[Conf["mascot"]]))) {
return; return;

2
builds/appchan-x.user.js
View File

@ -10526,7 +10526,7 @@
return null; return null;
} }
} }
position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 19.6 + (g.VIEW !== 'thread' || !!$('#postForm input[name=spoiler]') ? 1.4 : 0) + (Conf['Show Post Form Header'] ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em"; position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 20.1 + (Conf['Show Post Form Header'] && ['fixed', 'transparent fade', 'slideout'].contains(Conf['Post Form Style']) ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em";
if (Conf['editMode']) { if (Conf['editMode']) {
if (!(mascot = editMascot || (mascot = Mascots[Conf["mascot"]]))) { if (!(mascot = editMascot || (mascot = Mascots[Conf["mascot"]]))) {
return; return;

BIN
builds/crx.crx
View File

Binary file not shown.

2
builds/crx/script.js
View File

@ -10509,7 +10509,7 @@
return null; return null;
} }
} }
position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 19.6 + (g.VIEW !== 'thread' || !!$('#postForm input[name=spoiler]') ? 1.4 : 0) + (Conf['Show Post Form Header'] ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em"; position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 20.1 + (Conf['Show Post Form Header'] && ['fixed', 'transparent fade', 'slideout'].contains(Conf['Post Form Style']) ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em";
if (Conf['editMode']) { if (Conf['editMode']) {
if (!(mascot = editMascot || (mascot = Mascots[Conf["mascot"]]))) { if (!(mascot = editMascot || (mascot = Mascots[Conf["mascot"]]))) {
return; return;

2
src/General/css/layout.css
View File

@ -1276,7 +1276,7 @@ if _conf['Compact Post Form Inputs'] then "
margin: 0 0 0 0.4%; margin: 0 0 0 0.4%;
} }
#qr textarea.field { #qr textarea.field {
height: 14.8em; height: 14.9em;
min-height: 9em; min-height: 9em;
} }
#qr.has-captcha textarea.field { #qr.has-captcha textarea.field {

18
src/Theming/Mascots.coffee
View File

@ -7,10 +7,20 @@ MascotTools =
if !Conf['Mascots'] or (g.CATALOG and Conf['Hide Mascots on Catalog']) if !Conf['Mascots'] or (g.CATALOG and Conf['Hide Mascots on Catalog'])
return if el then el.src = "" else null return if el then el.src = "" else null
position = "#{if Conf['Mascot Position'] is 'bottom' or (Conf['Mascot Position'] is "default" and Conf['Post Form Style'] isnt "fixed") position = "#{
0 + Style.pfOffset if Conf['Mascot Position'] is 'bottom' or (Conf['Mascot Position'] is "default" and Conf['Post Form Style'] isnt "fixed")
else 0 + Style.pfOffset
19.6 + (if g.VIEW isnt 'thread' or !!$ '#postForm input[name=spoiler]' then 1.4 else 0) + (if Conf['Show Post Form Header'] then 1.5 else 0) + (if Conf['Post Form Decorations'] then 0.2 else 0) + Style.pfOffset else
20.1 + (
if Conf['Show Post Form Header'] and ['fixed', 'transparent fade', 'slideout'].contains Conf['Post Form Style']
1.5
else 0
) + (
if Conf['Post Form Decorations']
0.2
else
0
) + Style.pfOffset
}em" }em"
# If we're editting anything, let's not change mascots any time we change a value. # If we're editting anything, let's not change mascots any time we change a value.