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

Fix image expansion icon

Browse Source 
Make menu an icon too.
This commit is contained in:
Zixaphir 2013-04-08 15:01:11 -07:00
parent c1ad36e972
commit 46af845baa
8 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
appchan-x.user.js
View File

File diff suppressed because one or more lines are too long

22
css/icons.base.css
View File

@ -6,7 +6,9 @@ body > div.navLinks > a:first-of-type::after,
#{if Conf['Announcements'] is 'slideout' then '#globalMessage::after,' else ''} #{if Conf['Announcements'] is 'slideout' then '#globalMessage::after,' else ''}
#boardNavDesktopFoot::after, #boardNavDesktopFoot::after,
body > a[style="cursor: pointer; float: right;"]::after, body > a[style="cursor: pointer; float: right;"]::after,
#imgControls label:first-of-type::after, #imgControls .expand-all-shortcut,
#imgControls .contract-all-shortcut,
#imgControls .menu-button,
#catalog::after, #catalog::after,
#fappeTyme { #fappeTyme {
z-index: 18; z-index: 18;
@ -15,7 +17,6 @@ body > a[style="cursor: pointer; float: right;"]::after,
width: 15px; width: 15px;
height: 15px; height: 15px;
content: ""; content: "";
overflow: hidden;
opacity: #{if Conf['Invisible Icons'] then 0 else 0.5}; opacity: #{if Conf['Invisible Icons'] then 0 else 0.5};
} }
#navtopright .exlinksOptionsLink, #navtopright .exlinksOptionsLink,
@ -33,15 +34,12 @@ body > div.navLinks > a:first-of-type:hover,
#{if Conf['Announcements'] is 'slideout' then '#globalMessage:hover,' else ''} #{if Conf['Announcements'] is 'slideout' then '#globalMessage:hover,' else ''}
#boardNavDesktopFoot:hover, #boardNavDesktopFoot:hover,
body > a[style="cursor: pointer; float: right;"]:hover, body > a[style="cursor: pointer; float: right;"]:hover,
#imgControls .expand-all-shortcut,
#imgControls .contract-all-shortcut,
#imgControls .menu-button,
#catalog:hover { #catalog:hover {
z-index: 17; z-index: 17;
} }
#imgControls {
z-index: 19;
}
#imgControls {
position: fixed;
}
#appchanOptions { #appchanOptions {
visibility: visible; visibility: visible;
background-position: 0 0; background-position: 0 0;
@ -64,8 +62,8 @@ body > a[style="cursor: pointer; float: right;"]::after {
cursor: pointer; cursor: pointer;
background-position: 0 -75px; background-position: 0 -75px;
} }
#imgControls label:first-of-type::after { #imgControls .expand-all-shortcut,
position: static; #imgControls .contract-all-shortcut {
background-position: 0 -90px; background-position: 0 -90px;
} }
#navtopright .exlinksOptionsLink::after { #navtopright .exlinksOptionsLink::after {
@ -80,7 +78,9 @@ body > a[style="cursor: pointer; float: right;"]::after {
} }
#boardNavDesktopFoot:hover::after, #boardNavDesktopFoot:hover::after,
#globalMessage:hover::after, #globalMessage:hover::after,
#imgControls label:hover:first-of-type::after, #imgControls .expand-all-shortcut:hover,
#imgControls .contract-all-shortcut:hover,
#imgControls .menu-button:hover,
#navlinks a:hover, #navlinks a:hover,
#appchanOptions:hover, #appchanOptions:hover,
#navtopright .exlinksOptionsLink:hover::after, #navtopright .exlinksOptionsLink:hover::after,

11
css/icons.horz.css
View File

@ -24,7 +24,12 @@ body > a[style="cursor: pointer; float: right;"]::after {
#{align}: #{position[i++]}px; #{align}: #{position[i++]}px;
} }
/* Expand Images */ /* Expand Images */
#imgControls { #imgControls .expand-all-shortcut,
#imgControls .contract-all-shortcut {
#{align}: #{position[i++]}px;
}
/* Expand Images Menu */
#imgControls .menu-button {
#{align}: #{position[i++]}px; #{align}: #{position[i++]}px;
} }
/* 4chan Catalog */ /* 4chan Catalog */
@ -61,7 +66,9 @@ div.navLinks > a:first-of-type::after {
#appchanOptions, #appchanOptions,
#watcher::after, #watcher::after,
#globalMessage::after, #globalMessage::after,
#imgControls, #imgControls .expand-all-shortcut,
#imgControls .contract-all-shortcut,
#imgControls .menu-button,
#fappeTyme, #fappeTyme,
div.navLinks > a:first-of-type::after, div.navLinks > a:first-of-type::after,
#catalog::after, #catalog::after,

13
css/icons.vert.css
View File

@ -1,6 +1,11 @@
/* Image Expansion */ /* Expand Images */
#imgControls { #imgControls .expand-all-shortcut,
#imgControls .contract-all-shortcut {
top: #{position[i++]}px;
}
/* Expand Images Menu */
#imgControls .menu-button {
top: #{position[i++]}px; top: #{position[i++]}px;
} }
/* 4chan X Options */ /* 4chan X Options */
@ -59,7 +64,9 @@ div.navLinks > a:first-of-type::after {
#appchanOptions, #appchanOptions,
#boardNavDesktopFoot::after, #boardNavDesktopFoot::after,
#globalMessage::after, #globalMessage::after,
#imgControls, #imgControls .expand-all-shortcut,
#imgControls .contract-all-shortcut,
#imgControls .menu-button,
#fappeTyme, #fappeTyme,
#{if _conf["Slideout Watcher"] then "#watcher::after," else ""} #{if _conf["Slideout Watcher"] then "#watcher::after," else ""}
body > a[style="cursor: pointer; float: right;"]::after, body > a[style="cursor: pointer; float: right;"]::after,

28
css/layout.css
View File

@ -440,33 +440,19 @@ else "
#{if _conf["Rounded Edges"] then "border-radius: 3px;" else ""} #{if _conf["Rounded Edges"] then "border-radius: 3px;" else ""}
} }
/* Image Expansion */ /* Image Expansion */
#imgControls .rice { #imgControls .menu-button {
display: none; margin: 0;
} }
#imgControls { #imgControls .dropmarker {
width: 15px; margin: 1px;
overflow-x: hidden; border-top-width: 13px;
overflow-y: visible; border-right-width: 7px;
} border-left-width: 7px;
#imgContainer {
float: #{Style.sidebarLocation[0]};
}
#imgContainer,
#imgControls:hover {
width: 110px;
}
#imgControls label {
float: #{Style.sidebarLocation[0]};
}
#imgControls .selectrice {
float: #{Style.sidebarLocation[1]};
width: 90px;
} }
.fitwidth .fullSize { .fitwidth .fullSize {
max-width: 100%; max-width: 100%;
width: 100%; width: 100%;
} }
#{if _conf['Images Overlap Post Form'] then " #{if _conf['Images Overlap Post Form'] then "
.fullSize { .fullSize {
position: relative; position: relative;

12
css/theme.css
View File

@ -207,10 +207,14 @@ a[style="cursor: pointer; float: right;"] ~ div[style^="width: 100%;"] > table {
color: #{theme["Warnings"]}; color: #{theme["Warnings"]};
} }
#navlinks a:first-of-type { #navlinks a:first-of-type {
border-bottom: 11px solid rgb(#{if Style.lightTheme then "130,130,130" else "152,152,152"}); border-bottom: 11px solid rgb(130,130,130);
} }
#navlinks a:last-of-type { #navlinks a:last-of-type {
border-top: 11px solid rgb(#{if Style.lightTheme then "130,130,130" else "152,152,152"}); border-top: 11px solid rgb(130,130,130);
}
#imgControls .dropmarker,
#imgControls .dropmarker:hover {
border-top-color: rgb(130,130,130);
} }
#charCount { #charCount {
color: #{(if Style.lightTheme then "rgba(0,0,0,0.7)" else "rgba(255,255,255,0.7)")}; color: #{(if Style.lightTheme then "rgba(0,0,0,0.7)" else "rgba(255,255,255,0.7)")};
@ -226,7 +230,6 @@ a[style="cursor: pointer; float: right;"] ~ div[style^="width: 100%;"] > table {
color: #{theme["Timestamps"]} !important; color: #{theme["Timestamps"]} !important;
} }
#fs_status a, #fs_status a,
#imgControls label::after,
#updater #count:not(.new)::after, #updater #count:not(.new)::after,
#showQR, #showQR,
#updater, #updater,
@ -381,7 +384,8 @@ a .name {
#globalMessage::after, #globalMessage::after,
#boardNavDesktopFoot::after, #boardNavDesktopFoot::after,
a[style="cursor: pointer; float: right;"]::after, a[style="cursor: pointer; float: right;"]::after,
#imgControls label:first-of-type::after, #imgControls .expand-all-shortcut,
#imgControls .contract-all-shortcut,
#catalog::after, #catalog::after,
#fappeTyme { #fappeTyme {
background-image: url('#{icons}'); background-image: url('#{icons}');

2
src/appchan.coffee
View File

@ -237,6 +237,7 @@ Style =
$ '#navtopright .exlinksOptionsLink', d.body $ '#navtopright .exlinksOptionsLink', d.body
notCatalog and $ 'body > a[style="cursor: pointer; float: right;"]', d.body notCatalog and $ 'body > a[style="cursor: pointer; float: right;"]', d.body
notEither and _conf['Image Expansion'] notEither and _conf['Image Expansion']
notEither and _conf['Image Expansion']
notEither notEither
g.REPLY g.REPLY
notEither and _conf['Fappe Tyme'] notEither and _conf['Fappe Tyme']
@ -261,6 +262,7 @@ Style =
position = aligner( position = aligner(
2 + (if _conf["4chan Banner"] is "at sidebar top" then (Style.logoOffset + 19) else 0) 2 + (if _conf["4chan Banner"] is "at sidebar top" then (Style.logoOffset + 19) else 0)
[ [
notEither and _conf['Image Expansion']
notEither and _conf['Image Expansion'] notEither and _conf['Image Expansion']
notCatalog notCatalog
_conf['Slideout Navigation'] isnt 'hide' _conf['Slideout Navigation'] isnt 'hide'

4
src/features.coffee
View File

@ -3170,8 +3170,8 @@ ImageExpand =
wrapper = $.el 'div', wrapper = $.el 'div',
id: 'imgControls' id: 'imgControls'
innerHTML: """ innerHTML: """
<a class='expand-all-shortcut' title='Expand All Images' href='javascript:;'>Expand All Images</a> <a class='expand-all-shortcut' title='Expand All Images' href='javascript:;'></a>
<a class='menu-button' href='javascript:;'>[<i></i>]</a> <a class='menu-button' href='javascript:;'><i class=dropmarker></i></a>
""" """
@EAI = wrapper.firstElementChild @EAI = wrapper.firstElementChild
$.on @EAI, 'click', ImageExpand.cb.toggleAll $.on @EAI, 'click', ImageExpand.cb.toggleAll