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

Merge branch 'v3' into json

Browse Source 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-01-10 17:18:23 -07:00
commit a44e75862f
17 changed files with 209 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CHANGELOG.md
View File

@ -1,7 +1,6 @@
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5682df5a2a366e5c5f4362395574179a2de68bb9
## v1.3.0
*2014-01-10*
**MayhemYDG**:
- **New option**: `Auto-hide header on scroll`.
- Added support for `4cdn.org`.
@ -47,16 +46,12 @@
**seaweedchan**:
- Various fixes and improvements for the JSONified index
- Removed index refresh notifications
- Various style tweaks
**Zixaphir**:
- FappeTyme and WerkTyme now persist across sessions.
<<<<<<< HEAD
=======
=======
- Various fixes and improvements for the JSONified index
>>>>>>> 5682df5a2a366e5c5f4362395574179a2de68bb9
### v1.2.45
*2014-01-07*
@ -67,10 +62,6 @@
**Zixaphir**:
- Fix optional increase for thread updater
<<<<<<< HEAD
>>>>>>> 08ae1daee8d4a2dfa272b00a62f78aa56092dfd4
=======
>>>>>>> 5682df5a2a366e5c5f4362395574179a2de68bb9
### v1.2.44
*2013-12-06*

2
LICENSE
View File

@ -1,5 +1,5 @@
/*
* 4chan X - Version 1.2.45 - 2014-01-10
* 4chan X - Version 1.3.0 - 2014-01-10
*
* Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

2
builds/4chan-X.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.2.45
// @version 1.3.0
// @minGMVer 1.13
// @minFFVer 26
// @namespace 4chan-X

16
builds/4chan-X.user.js
View File

File diff suppressed because one or more lines are too long

2
builds/crx/manifest.json
View File

@ -1,6 +1,6 @@
{
"name": "4chan X",
"version": "1.2.45",
"version": "1.3.0",
"manifest_version": 2,
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"icons": {

14
builds/crx/script.js
View File

File diff suppressed because one or more lines are too long

2
latest.js
View File

@ -1 +1 @@
postMessage({version:'1.2.45'},'*')
postMessage({version:'1.3.0'},'*')

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "4chan-X",
"version": "1.2.45",
"version": "1.3.0",
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": {
"name": "4chan X",

15
src/General/css/burichan.css
View File

@ -8,6 +8,9 @@
}
/* Header */
:root.burichan #header-bar.dialog {
background-color: rgba(214,218,240,0.98);
}
:root.burichan #header-bar, :root.burichan #header-bar #notifications {
font-size: 11pt;
color: #89A;
@ -16,10 +19,10 @@
color: #34345C;
}
:root.burichan #custom-board-list .current {
border-bottom: 1px solid #2F4DC6;
border-bottom: 1px solid rgba(30, 30, 255, 0.2);
}
:root.burichan #custom-board-list .current:hover {
border-bottom-color: #ff0000;
border-bottom-color: rgba(255,0,0,0.2);
}
/* Settings */
@ -44,13 +47,19 @@
:root.burichan .qr-preview {
background-color: rgba(0, 0, 0, .15);
}
:root.burichan .qr-link {
border-color: rgb(199, 203, 225) rgb(199, 203, 225) rgb(184, 188, 210);
background: linear-gradient(#E5E9FF, #D6DAF0) repeat scroll 0% 0% transparent;
}
:root.burichan .qr-link:hover {
background: #D9DDF3;
}
/* Menu */
:root.burichan #menu {
color: #000000;
}
:root.burichan .entry {
border-bottom: 1px solid #B7C5D9;
font-size: 12pt;
}
:root.burichan .focused.entry {

19
src/General/css/font-awesome.css vendored
View File

File diff suppressed because one or more lines are too long

15
src/General/css/futaba.css
View File

@ -8,6 +8,9 @@
}
/* Header */
:root.futaba #header-bar.dialog {
background-color: rgba(240,224,214,0.98);
}
:root.futaba #header-bar, :root.futaba #notifications {
font-size: 11pt;
color: #B86;
@ -16,10 +19,10 @@
color: #800000;
}
:root.futaba #custom-board-list a.current {
border-bottom: 1px solid #b20000;
border-bottom: 1px solid rgba(178,0,0,0.2);
}
:root.futaba #custom-board-list .current:hover {
border-bottom-color: #ff0000;
border-bottom-color: rgba(255,0,0,0.2);
}
/* Settings */
@ -44,13 +47,19 @@
:root.futaba .qr-preview {
background-color: rgba(0, 0, 0, .15);
}
:root.futaba .qr-link {
border-color: rgb(225, 209, 199) rgb(225, 209, 199) rgb(210, 194, 184);
background: linear-gradient(#FFEFE5, #F0E0D6) repeat scroll 0% 0% transparent;
}
:root.futaba .qr-link:hover {
background: #F0E0D6;
}
/* Menu */
:root.futaba #menu {
color: #800000;
}
:root.futaba .entry {
border-bottom: 1px solid #D9BFB7;
font-size: 12pt;
}
:root.futaba .focused.entry {

21
src/General/css/photon.css
View File

@ -8,6 +8,9 @@
}
/* Header */
:root.photon #header-bar.dialog {
background-color: rgba(221,221,221,0.98);
}
:root.photon #header-bar, :root.photon #notifications {
font-size: 9pt;
color: #333;
@ -16,10 +19,10 @@
color: #FF6600;
}
:root.photon #custom-board-list a.current {
border-bottom: 1px solid #004A99;
border-bottom: 1px solid rgba(0,74,153,0.2);
}
:root.photon #custom-board-list .current:hover {
border-bottom-color: #FF3300;
border-bottom-color: rgba(255,51,0,0.2);
}
/* Settings */
@ -44,13 +47,19 @@
:root.photon .qr-preview {
background-color: rgba(0, 0, 0, .15);
}
:root.photon .qr-link {
border-color: rgb(206, 206, 206) rgb(206, 206, 206) rgb(191, 191, 191);
background: linear-gradient(#ECECEC, #DDD) repeat scroll 0% 0% transparent;
}
:root.photon .qr-link:hover {
background: #DDDDDD;
}
/* Menu */
:root.photon #menu {
color: #333;
}
:root.photon .entry {
border-bottom: 1px solid #CCC;
font-size: 10pt;
}
:root.photon .focused.entry {
@ -62,3 +71,9 @@
{
background-image: url("data:image/svg+xml,<svg viewBox='0 0 26 26' preserveAspectRatio='true' xmlns='http://www.w3.org/2000/svg'><path fill='rgb(51,51,51)' d='M24.132,7.971c-2.203-2.205-5.916-2.098-8.25,0.235L15.5,8.588l-0.382-0.382c-2.334-2.333-6.047-2.44-8.25-0.235c-2.204,2.203-2.098,5.916,0.235,8.249l8.396,8.396l8.396-8.396C26.229,13.887,26.336,10.174,24.132,7.971z'/></svg>");
}
/* Board Title */
:root.photon div.boardTitle {
font-family: sans-serif !important;
text-shadow: 1px 1px 1px rgba(0,74,153,0.6);
}

74
src/General/css/style.css
View File

@ -2,7 +2,6 @@
.dialog {
border: 1px solid;
display: block;
padding: 0;
}
.dialog:not(#qr):not(#thread-watcher):not(#header-bar) {
box-shadow: 0 1px 2px rgba(0, 0, 0, .15);
@ -67,6 +66,21 @@ a {
border-radius: 3px;
padding: 0px 2px;
}
body>hr, .ad-plea-bottom + hr {
display: none;
}
.board > hr:last-of-type {
border-top-color: transparent !important;
}
div.navLinks {
margin-bottom: -10px !important;
}
.ad-plea {
display: none;
}
.ad-cnt {
margin: 10px !important;
}
/* 4chan style fixes */
.opContainer, .op {
@ -151,7 +165,6 @@ div.center:not(.ad-cnt) {
border-width: 0;
transition: all .1s .05s ease-in-out;
box-shadow: -5px 1px 10px rgba(0, 0, 0, 0.20);
opacity: 0.98;
}
#custom-board-list .current {
padding: 1px 1px 4px 1px;
@ -502,8 +515,15 @@ div.center:not(.ad-cnt) {
:root.hide-announcement #globalMessage {
display: none;
}
a.hide-announcement {
float: left;
span.hide-announcement {
font-size: 11px;
position: relative;
bottom: 5px;
}
.globalMessage, h2, h3 {
color: inherit !important;
font-size: 13px;
font-weight: 100;
}
/* Unread */
@ -803,6 +823,15 @@ a.hide-announcement {
.qr-link-container {
text-align: center;
}
.qr-link {
border-radius: 3px;
padding: 6px 10px 5px;
font-weight: bold;
vertical-align: middle;
border-style: solid;
border-width: 1px;
font-size: 10pt;
}
.persona {
width: 248px;
max-width: 100%;
@ -865,6 +894,10 @@ input.field.tripped:not(:hover):not(:focus) {
:root.webkit #qr [type='submit'] {
height: 24px;
}
#qr label input[type="checkbox"] {
position: relative;
top: 2px;
}
/* Fake File Input */
input#qr-filename {
border: none !important;
@ -1075,6 +1108,19 @@ a:only-of-type > .remove {
.op .menu-button,
#thread-watcher .menu-button {
margin-left: -5px !important;
position: relative;
}
.op .menu-button,
#thread-watcher .menu-button {
top: 1px;
}
:root.blink .reply .menu-button {
position: relative;
top: 2px;
}
:root.blink .op .menu-button,
:root.blink #thread-watcher .menu-button {
top: 3px;
}
.menu-button + .container:not(:empty) {
margin-left: -5px !important;
@ -1083,12 +1129,16 @@ a:only-of-type > .remove {
position: fixed;
outline: none;
}
#menu, .submenu {
border-radius: 3px;
padding-top: 1px;
padding-bottom: 3px;
}
.entry {
border-bottom: 1px solid rgba(0,0,0,.25);
cursor: pointer;
display: block;
outline: none;
padding: 3px 7px;
padding: 2px 10px;
position: relative;
text-decoration: none;
white-space: nowrap;
@ -1097,8 +1147,11 @@ a:only-of-type > .remove {
.left>.entry.has-submenu {
padding-right: 17px !important;
}
.entry:last-child {
border-bottom: 0;
.entry input[type="checkbox"],
.entry input[type="radio"] {
margin: 0px;
position: relative;
top: 2px;
}
.has-submenu::after {
content: "";
@ -1119,6 +1172,8 @@ a:only-of-type > .remove {
position: absolute;
left: 100%;
top: -1px;
margin-left: 0px;
margin-top: -2px;
}
.focused > .submenu {
display: block;
@ -1140,6 +1195,9 @@ a:only-of-type > .remove {
.boardSubtitle[contenteditable="true"] {
cursor: text !important;
}
div.boardTitle {
font-weight: 400 !important;
}
/* Link Title Favicons */
.linkify.YouTube {
background: transparent url('data:image/png;base64,<%= grunt.file.read("src/General/img/links/youtube.png", {encoding: "base64"}) %>') center left no-repeat!important;

21
src/General/css/tomorrow.css
View File

@ -5,6 +5,9 @@
}
/* Header */
:root.tomorrow #header-bar.dialog {
background-color: rgba(40,42,46,0.9);
}
:root.tomorrow #header-bar, :root.tomorrow #notifications {
font-size: 9pt;
color: #C5C8C6;
@ -13,10 +16,10 @@
color: #81A2BE;
}
:root.tomorrow #custom-board-list a.current {
border-bottom: 1px solid #537ca0;
border-bottom: 1px solid rgba(83,124,160,0.4);
}
:root.tomorrow #custom-board-list .current:hover {
border-bottom-color: #5F89AC;
border-bottom-color: rgba(95,137,172,0.4);
}
/* Settings */
@ -50,13 +53,19 @@
border-color: rgb(129, 162, 190) !important;
background-color: rgb(30,32,36);
}
:root.tomorrow .qr-link {
border-color: rgb(25, 27, 31) rgb(25, 27, 31) rgb(10, 12, 16);
background: linear-gradient(#37393D, #282A2E) repeat scroll 0% 0% transparent;
}
:root.tomorrow .qr-link:hover {
background: #282A2E;
}
/* Menu */
:root.tomorrow #menu {
color: #C5C8C6;
}
:root.tomorrow .entry {
border-bottom: 1px solid #111;
font-size: 10pt;
}
:root.tomorrow .focused.entry {
@ -68,3 +77,9 @@
{
background-image: url("data:image/svg+xml,<svg viewBox='0 0 26 26' preserveAspectRatio='true' xmlns='http://www.w3.org/2000/svg'><path fill='rgb(197,200,198)' d='M24.132,7.971c-2.203-2.205-5.916-2.098-8.25,0.235L15.5,8.588l-0.382-0.382c-2.334-2.333-6.047-2.44-8.25-0.235c-2.204,2.203-2.098,5.916,0.235,8.249l8.396,8.396l8.396-8.396C26.229,13.887,26.336,10.174,24.132,7.971z'/></svg>");
}
/* Board Title */
:root.tomorrow div.boardTitle {
font-family: sans-serif !important;
text-shadow: 1px 1px 1px rgba(167,170,168,0.6);
}

22
src/General/css/yotsuba-b.css
View File

@ -8,6 +8,9 @@
}
/* Header */
:root.yotsuba-b #header-bar.dialog {
background-color: rgba(214,218,240,0.98);
}
:root.yotsuba-b #header-bar, :root.yotsuba-b #notifications {
font-size: 9pt;
color: #89A;
@ -16,10 +19,10 @@
color: #34345C;
}
:root.yotsuba-b #custom-board-list .current {
border-bottom: 1px solid #2F4DC6;
border-bottom: 1px solid rgba(30, 30, 255, 0.2);
}
:root.yotsuba-b #custom-board-list .current:hover {
border-bottom-color: #ff0000;
border-bottom-color: rgba(255,0,0,0.2);
}
/* Settings */
@ -44,13 +47,20 @@
:root.yotsuba-b .qr-preview {
background-color: rgba(0, 0, 0, .15);
}
:root.yotsuba-b .qr-link {
border-color: rgb(199, 203, 225) rgb(199, 203, 225) rgb(184, 188, 210);
background: linear-gradient(#E5E9FF, #D6DAF0) repeat scroll 0% 0% transparent;
}
:root.yotsuba-b .qr-link:hover {
background: #D9DDF3;
}
/* Menu */
:root.yotsuba-b #menu {
color: #000;
}
:root.yotsuba-b .entry {
border-bottom: 1px solid #B7C5D9;
font-size: 10pt;
}
:root.yotsuba-b .focused.entry {
@ -62,3 +72,9 @@
{
background-image: url("data:image/svg+xml,<svg viewBox='0 0 26 26' preserveAspectRatio='true' xmlns='http://www.w3.org/2000/svg'><path fill='rgb(0,0,0)' d='M24.132,7.971c-2.203-2.205-5.916-2.098-8.25,0.235L15.5,8.588l-0.382-0.382c-2.334-2.333-6.047-2.44-8.25-0.235c-2.204,2.203-2.098,5.916,0.235,8.249l8.396,8.396l8.396-8.396C26.229,13.887,26.336,10.174,24.132,7.971z'/></svg>");
}
/* Board Title */
:root.yotsuba-b div.boardTitle {
font-family: sans-serif !important;
text-shadow: 1px 1px 1px rgba(105,10,15,0.6);
}

21
src/General/css/yotsuba.css
View File

@ -8,6 +8,9 @@
}
/* Header */
:root.yotsuba #header-bar.dialog {
background-color: rgba(240,224,214,0.98);
}
:root.yotsuba #header-bar, :root.yotsuba #notifications {
font-size: 9pt;
color: #B86;
@ -16,10 +19,10 @@
color: #800000;
}
:root.yotsuba #custom-board-list a.current {
border-bottom: 1px solid #b20000;
border-bottom: 1px solid rgba(178,0,0,0.2);
}
:root.yotsuba #custom-board-list .current:hover {
border-bottom-color: #ff0000;
border-bottom-color: rgba(255,0,0,0.2);
}
/* Settings */
@ -44,13 +47,19 @@
:root.yotsuba .qr-preview {
background-color: rgba(0, 0, 0, .15);
}
:root.yotsuba .qr-link {
border-color: rgb(225, 209, 199) rgb(225, 209, 199) rgb(210, 194, 184);
background: linear-gradient(#FFEFE5, #F0E0D6) repeat scroll 0% 0% transparent;
}
:root.yotsuba .qr-link:hover {
background: #F0E0D6;
}
/* Menu */
:root.yotsuba #menu {
color: #800000;
}
:root.yotsuba .entry {
border-bottom: 1px solid #D9BFB7;
font-size: 10pt;
}
:root.yotsuba .focused.entry {
@ -62,3 +71,9 @@
{
background-image: url("data:image/svg+xml,<svg viewBox='0 0 26 26' preserveAspectRatio='true' xmlns='http://www.w3.org/2000/svg'><path fill='rgb(128,0,0)' d='M24.132,7.971c-2.203-2.205-5.916-2.098-8.25,0.235L15.5,8.588l-0.382-0.382c-2.334-2.333-6.047-2.44-8.25-0.235c-2.204,2.203-2.098,5.916,0.235,8.249l8.396,8.396l8.396-8.396C26.229,13.887,26.336,10.174,24.132,7.971z'/></svg>");
}
/* Board Title */
:root.yotsuba div.boardTitle {
font-family: sans-serif !important;
text-shadow: 1px 1px 1px rgba(100,0,0,0.6);
}

8
src/Miscellaneous/AnnouncementHiding.coffee
View File

@ -23,16 +23,16 @@ PSAHiding =
$.event 'AddMenuEntry', entry
$.on entry.el, 'click', PSAHiding.toggle
PSAHiding.btn = btn = $.el 'a',
innerHTML: '<span class=brackets-wrap>&nbsp;-&nbsp;</span>'
title: 'Hide announcement.'
PSAHiding.btn = btn = $.el 'span',
innerHTML: '[<a href=javascript:;>Dismiss</a>]'
title: 'Mark announcement as read and hide.'
className: 'hide-announcement'
href: 'javascript:;'
$.on btn, 'click', PSAHiding.toggle
$.get 'hiddenPSA', 0, ({hiddenPSA}) ->
PSAHiding.sync hiddenPSA
$.before psa, btn
$.add psa, btn
$.rmClass doc, 'hide-announcement'
$.sync 'hiddenPSA', PSAHiding.sync