Bugfixes.

This commit is contained in:
Zixaphir 2013-04-23 00:24:07 -07:00
parent de26c643b2
commit 235ecd1757
11 changed files with 65 additions and 76 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -735,8 +735,6 @@ http://iqdb.org/?url=%TURL
#//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/ #//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/
""" """
'Boards Navigation': 'sticky top'
'Custom CSS': false 'Custom CSS': false
'Boards Navigation': 'Sticky top' 'Boards Navigation': 'Sticky top'

View File

@ -78,7 +78,7 @@ body > a[style="cursor: pointer; float: right;"]::after {
#boardNavDesktopFoot { #boardNavDesktopFoot {
top: 16px !important; top: 16px !important;
} }
#{if _conf['Boards Navigation'] is 'top' or _conf['Boards Navigation'] is 'sticky top' then '#header-bar' else if _conf['Pagination'] is 'top' or _conf['Pagination'] is 'sticky top' then '.pagelist'} { #{if _conf['Boards Navigation'] is 'Top' or _conf['Boards Navigation'] is 'Sticky top' then '#header-bar' else if _conf['Pagination'] is 'top' or _conf['Pagination'] is 'sticky top' then '.pagelist'} {
#{if _conf['4chan SS Navigation'] #{if _conf['4chan SS Navigation']
"padding-#{align}: #{iconOffset}px;" "padding-#{align}: #{iconOffset}px;"
else else

View File

@ -78,7 +78,7 @@ div.navLinks > a:first-of-type::after {
width: #{233 + Style.sidebarOffset.W}px !important; width: #{233 + Style.sidebarOffset.W}px !important;
#{align}: 18px !important; #{align}: 18px !important;
} }
#{if _conf['Boards Navigation'] is 'top' or _conf['Boards Navigation'] is 'sticky top' then '#header-bar' else if _conf['Pagination'] is 'top' or _conf['Pagination'] is 'sticky top' then '.pagelist'} { #{if _conf['Boards Navigation'] is 'Top' or _conf['Boards Navigation'] is 'Sticky top' then '#header-bar' else if _conf['Pagination'] is 'top' or _conf['Pagination'] is 'sticky top' then '.pagelist'} {
#{if _conf['4chan SS Navigation'] #{if _conf['4chan SS Navigation']
"padding-#{align}: #{iconOffset}px;" "padding-#{align}: #{iconOffset}px;"
else else

View File

@ -198,30 +198,24 @@ else "
.fixed.bottom #header-bar.autohide:not(:hover) { .fixed.bottom #header-bar.autohide:not(:hover) {
#{agent}transform: translateY(100%); #{agent}transform: translateY(100%);
} }
#toggle-header-bar { #scroll-marker {
left: 0; left: 0;
right: 0; right: 0;
height: 10px; height: 10px;
position: absolute; position: absolute;
} }
#header-bar #toggle-header-bar { #header-bar #scroll-marker {
display: none; display: none;
} }
.fixed #header-bar #toggle-header-bar { .fixed #header-bar #scroll-marker {
display: block; display: block;
} }
.fixed #header-bar #toggle-header-bar { .fixed.top header-bar #scroll-marker {
cursor: n-resize;
}
.fixed.top header-bar #toggle-header-bar {
top: 100%; top: 100%;
} }
.fixed.bottom #header-bar #toggle-header-bar { .fixed.bottom #header-bar #scroll-marker {
bottom: 100%; bottom: 100%;
} }
.fixed #header-bar #header-bar.autohide #toggle-header-bar {
cursor: s-resize;
}
/* Notifications */ /* Notifications */
#notifications { #notifications {
position: fixed; position: fixed;

View File

@ -7,8 +7,8 @@ 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'] is "fixed") position = "#{if Conf['Mascot Position'] is 'bottom' or (Conf['Mascot Position'] is "default" and Conf['Post Form Style'] isnt "fixed")
0 + (if (g.VIEW isnt 'thread' or Conf['Boards Navigation'] is 'sticky bottom') and Conf['4chan SS Navigation'] then 1.6 else 0) 0 + (if (g.VIEW isnt 'thread' or Conf['Boards Navigation'] is 'Sticky bottom') and Conf['4chan SS Navigation'] then 1.6 else 0)
else else
20.3 + (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) 20.3 + (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)
}em" }em"

View File

@ -317,7 +317,7 @@ Style =
if Style.padding.pages and (_conf["Pagination"] is "sticky top" or _conf["Pagination"] is "sticky bottom") if Style.padding.pages and (_conf["Pagination"] is "sticky top" or _conf["Pagination"] is "sticky bottom")
css += " #{Style.padding.pages.property}: #{Style.padding.pages.offsetHeight}px !important;\n" css += " #{Style.padding.pages.property}: #{Style.padding.pages.offsetHeight}px !important;\n"
if _conf["Boards Navigation"] is "sticky top" or _conf["Boards Navigation"] is "sticky bottom" if _conf["Boards Navigation"] is "Sticky top" or _conf["Boards Navigation"] is "Sticky bottom"
css += " #{Style.padding.nav.property}: #{Style.padding.nav.offsetHeight}px !important;\n" css += " #{Style.padding.nav.property}: #{Style.padding.nav.offsetHeight}px !important;\n"
css += """ css += """
@ -329,7 +329,7 @@ body {
if Style.padding.pages? and (_conf["Pagination"] is "sticky top" or _conf["Pagination"] is "sticky bottom" or _conf["Pagination"] is "top") if Style.padding.pages? and (_conf["Pagination"] is "sticky top" or _conf["Pagination"] is "sticky bottom" or _conf["Pagination"] is "top")
css += " padding-#{Style.padding.pages.property}: #{Style.padding.pages.offsetHeight}px;\n" css += " padding-#{Style.padding.pages.property}: #{Style.padding.pages.offsetHeight}px;\n"
unless _conf["Boards Navigation"] is "hide" unless _conf["Boards Navigation"] is "Hide"
css += " padding-#{Style.padding.nav.property}: #{Style.padding.nav.offsetHeight}px;\n" css += " padding-#{Style.padding.nav.property}: #{Style.padding.nav.offsetHeight}px;\n"
css += "}" css += "}"

View File

@ -71,7 +71,7 @@ Settings =
innerHTML: """ innerHTML: """
<nav> <nav>
<div class=sections-list></div> <div class=sections-list></div>
<p class='imp-exp-result warning'></p> <span class='imp-exp-result warning'></span>
<div class=credits> <div class=credits>
<a class=export>Export</a> | <a class=export>Export</a> |
<a class=import>Import</a> | <a class=import>Import</a> |
@ -88,9 +88,9 @@ Settings =
Settings.overlay = overlay = $.el 'div', Settings.overlay = overlay = $.el 'div',
id: 'overlay' id: 'overlay'
$.on $('.export', Settings.dialog), 'click', Settings.export $.on $('.export', dialog), 'click', Settings.export
$.on $('.import', Settings.dialog), 'click', Settings.import $.on $('.import', dialog), 'click', Settings.import
$.on $('input', Settings.dialog), 'change', Settings.onImport $.on $('input', dialog), 'change', Settings.onImport
links = [] links = []
for section in Settings.sections for section in Settings.sections
@ -205,14 +205,14 @@ Settings =
download: "<%= meta.name %> v#{g.VERSION}-#{now}.json" download: "<%= meta.name %> v#{g.VERSION}-#{now}.json"
href: "data:application/json;base64,#{btoa unescape encodeURIComponent JSON.stringify data, null, 2}" href: "data:application/json;base64,#{btoa unescape encodeURIComponent JSON.stringify data, null, 2}"
target: '_blank' target: '_blank'
<% if (type !== 'userjs') { %> <% if (type !== 'userscript') { %>
a.click() a.click()
return return
<% } %> <% } %>
# XXX Firefox won't let us download automatically. # XXX Firefox won't let us download automatically.
p = $ '.imp-exp-result', Settings.dialog span = $ '.imp-exp-result', Settings.dialog
$.rmAll p $.rmAll span
$.add p, a $.add span, a
import: -> import: ->
@nextElementSibling.click() @nextElementSibling.click()