Move Header Menu into the icon bar as an icon.

This commit is contained in:
Zixaphir 2013-04-14 19:36:15 -07:00
parent da3fe8e6fd
commit e93b533ea4
11 changed files with 78 additions and 34 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.

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -7,6 +7,7 @@ body > div.navLinks > a:first-of-type::after,
#boardNavDesktopFoot::after, #boardNavDesktopFoot::after,
body > a[style="cursor: pointer; float: right;"]::after, body > a[style="cursor: pointer; float: right;"]::after,
#img-controls, #img-controls,
#main-menu,
#catalog::after, #catalog::after,
#fappeTyme { #fappeTyme {
z-index: 18; z-index: 18;
@ -22,6 +23,7 @@ body > div.navLinks > a:first-of-type,
#{if Conf['Slideout Watcher'] then '#watcher,' else ''} #{if Conf['Slideout Watcher'] then '#watcher,' else ''}
#{if Conf['Announcements'] is 'slideout' then '#globalMessage,' else ''} #{if Conf['Announcements'] is 'slideout' then '#globalMessage,' else ''}
#boardNavDesktopFoot, #boardNavDesktopFoot,
#main-menu,
body > a[style="cursor: pointer; float: right;"], body > a[style="cursor: pointer; float: right;"],
#catalog { #catalog {
z-index: 16; z-index: 16;
@ -76,6 +78,7 @@ body > a[style="cursor: pointer; float: right;"]::after {
#img-controls:hover, #img-controls:hover,
#navlinks a:hover, #navlinks a:hover,
#appchanOptions:hover, #appchanOptions:hover,
#main-menu:hover,
#navtopright .exlinksOptionsLink:hover::after, #navtopright .exlinksOptionsLink:hover::after,
#qr #qrtab, #qr #qrtab,
#watcher:hover::after, #watcher:hover::after,

View File

@ -27,6 +27,10 @@ body > a[style="cursor: pointer; float: right;"]::after {
#img-controls { #img-controls {
#{align}: #{position[i++]}px; #{align}: #{position[i++]}px;
} }
/* Main Menu */
#main-menu {
#{align}: #{position[i++]}px;
}
/* 4chan Catalog */ /* 4chan Catalog */
#catalog::after { #catalog::after {
#{align}: #{position[i++]}px; #{align}: #{position[i++]}px;
@ -62,6 +66,7 @@ div.navLinks > a:first-of-type::after {
#watcher::after, #watcher::after,
#globalMessage::after, #globalMessage::after,
#img-controls, #img-controls,
#main-menu,
#fappeTyme, #fappeTyme,
div.navLinks > a:first-of-type::after, div.navLinks > a:first-of-type::after,
#catalog::after, #catalog::after,

View File

@ -3,6 +3,10 @@
#img-controls { #img-controls {
top: #{position[i++]}px; top: #{position[i++]}px;
} }
/* Main Menu */
#main-menu {
top: #{position[i++]}px;
}
/* 4chan X Options */ /* 4chan X Options */
#appchanOptions { #appchanOptions {
top: #{position[i++]}px; top: #{position[i++]}px;
@ -60,6 +64,7 @@ div.navLinks > a:first-of-type::after {
#boardNavDesktopFoot::after, #boardNavDesktopFoot::after,
#globalMessage::after, #globalMessage::after,
#img-controls, #img-controls,
#main-menu,
#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,

View File

@ -145,7 +145,7 @@ hr {
border-left: 6px solid transparent; border-left: 6px solid transparent;
margin: 1.5px; margin: 1.5px;
} }
/* Navigation */ /* Header */
#boardNavDesktop { #boardNavDesktop {
z-index: 6; z-index: 6;
border-width: 1px; border-width: 1px;
@ -246,6 +246,31 @@ else "
.close { .close {
float: right; float: right;
} }
/* Main Menu */
#main-menu {
margin: 0;
border: 2px solid;
border-radius: 10px;
height: 14px;
width: 14px;
#{Style.sizing}: border-box;
border-color: rgb(130,130,130);
color: rgb(130,130,130);
}
#main-menu::after {
content: '';
font-size: 10px;
position: absolute;
top: 50%;
left: 50%;
#{agent}transform: translate(-60%, -50%);
display: block;
border-top: 5px solid rgb(130, 130, 130);
border-left: 3px solid transparent;
border-right: 3px solid transparent;
width: 7px;
#{Style.sizing}: border-box;
}
/* Pagination */ /* Pagination */
.pagelist { .pagelist {
border-width: 1px; border-width: 1px;

View File

@ -242,6 +242,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']
true
notEither notEither
g.VIEW is 'thread' g.VIEW is 'thread'
notEither and _conf['Fappe Tyme'] notEither and _conf['Fappe Tyme']
@ -268,6 +269,7 @@ Style =
[ [
notEither and _conf['Image Expansion'] notEither and _conf['Image Expansion']
true true
true
_conf['Slideout Navigation'] isnt 'hide' _conf['Slideout Navigation'] isnt 'hide'
_conf['Announcements'] is 'slideout' and $ '#globalMessage', d.body _conf['Announcements'] is 'slideout' and $ '#globalMessage', d.body
notCatalog and _conf['Slideout Watcher'] and _conf['Thread Watcher'] notCatalog and _conf['Slideout Watcher'] and _conf['Thread Watcher']

View File

@ -2,7 +2,7 @@ Header =
init: -> init: ->
@menuButton = $.el 'span', @menuButton = $.el 'span',
className: 'menu-button' className: 'menu-button'
innerHTML: '<a class=brackets-wrap href=javascript:;><i class=drop-marker></i></a>' id: 'main-menu'
@menu = new UI.Menu 'header' @menu = new UI.Menu 'header'
$.on @menuButton, 'click', @menuToggle $.on @menuButton, 'click', @menuToggle
@ -83,10 +83,11 @@ Header =
Header.setBarVisibility Conf['Header auto-hide'] Header.setBarVisibility Conf['Header auto-hide']
$.sync 'Header auto-hide', Header.setBarVisibility $.sync 'Header auto-hide', Header.setBarVisibility
$.prepend d.body, $.id 'navtopright' $.prepend d.body, settings = $.id 'navtopright'
$.add settings, Header.menuButton
$.add fullBoardList, [nav.childNodes...] $.add fullBoardList, [nav.childNodes...]
$.add nav, [Header.menuButton, customBoardList, fullBoardList, Header.shortcuts, Header.bar, Header.toggle] $.add nav, [customBoardList, fullBoardList, Header.shortcuts, Header.bar, Header.toggle]
if Conf['Custom Board Navigation'] if Conf['Custom Board Navigation']
Header.generateBoardList Conf['boardnav'] Header.generateBoardList Conf['boardnav']