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

QR Slideup and Tabbed Slideup

Browse Source 
* upstream/master:
  move that where it belongs
  fix uploading swfs on /f/
  Release appchan x v2.9.10.
  Release 4chan X v3.19.5.
  Fix captchas, again. #1531
  Lets just build that so that we don't have to do so many logic checks
  Lets pretend we're smarter than we really are!

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Brandon 2014-04-02 20:12:35 -07:00
parent 1f9d5e2221
commit fd840d822c
4 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

4
builds/crx/script.js
View File

File diff suppressed because one or more lines are too long

2
src/General/Config.coffee Executable file → Normal file
View File

@ -710,7 +710,7 @@ Config =
'Post Form Style': [
'tabbed slideout'
'How the post form will sit on the page.'
['fixed', 'slideout', 'tabbed slideout', 'float']
['fixed', 'slideout', 'tabbed slideout', 'slideup', 'tabbed slideup', 'float']
]
'Post Form Slideout Transitions' : [
true

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

@ -968,6 +968,22 @@ nav a,
.hide-delete-ui .post:not(#exlinks-options) .rice {
display: none;
}
.post-form-style-slideup .deleteform::before,
.post-form-style-tabbed-slideup .deleteform::before,
.post-form-style-slideup .deleteform:hover,
.post-form-style-tabbed-slideup .deleteform:hover {
bottom: 0px !important;
}
.post-form-style-slideup .deleteform,
.post-form-style-tabbed-slideup .deleteform {
bottom: -50px !important;
}
.post-form-style-slideup .deleteform::before,
.post-form-style-tabbed-slideup .deleteform::before,
.post-form-style-slideup .deleteform,
.post-form-style-tabbed-slideup .deleteform {
right: 255px !important;
}
.deleteform {
position: fixed;
z-index: 18;
@ -1576,34 +1592,53 @@ input:checked + .rice {
.fourchan-ss-navigation.index.pagination-sticky-bottom:not(.post-form-style-float) #qr {
bottom: 1.5em !important;
}
.post-form-style-slideup #qr,
.post-form-style-slideout #qr {
top: auto !important;
}
.post-form-style-slideup #qr {
<%= transform %>: translateY(100%);
}
.post-form-style-slideout.sidebar-location-left #qr {
<%= transform %>: translateX(-93%);
}
.post-form-style-slideout.sidebar-location-right #qr {
<%= transform %>: translateX(93%);
}
.post-form-style-slideup #qr:hover,
.post-form-style-slideup #qr.focus,
.post-form-style-slideup #qr.dump {
<%= transform %>: translateY(7%);
}
.post-form-style-slideout #qr:hover,
.post-form-style-slideout #qr.focus,
.post-form-style-slideout #qr.dump {
<%= transform %>: translate(0);
}
.post-form-style-tabbed-slideup #qr,
.post-form-style-tabbed-slideout #qr {
top: auto !important;
}
.post-form-style-tabbed-slideup #qr {
<%= transform %>: translateY(107%);
}
.post-form-style-tabbed-slideout.sidebar-location-left #qr {
<%= transform %>: translateX(-100%);
}
.post-form-style-tabbed-slideout.sidebar-location-right #qr {
<%= transform %>: translateX(100%);
}
.post-form-style-tabbed-slideup #qr:hover,
.post-form-style-tabbed-slideup #qr.focus,
.post-form-style-tabbed-slideup #qr.dump {
<%= transform %>: translateY(7%);
}
.post-form-style-tabbed-slideout #qr:hover,
.post-form-style-tabbed-slideout #qr.focus,
.post-form-style-tabbed-slideout #qr.dump {
<%= transform %>: translateX(0);
}
.post-form-style-tabbed-slideup #qrtab,
.post-form-style-tabbed-slideout #qrtab {
position: absolute;
top: 0;
@ -1612,6 +1647,9 @@ input:checked + .rice {
border-width: 1px 1px 0 1px;
cursor: default;
}
.post-form-style-tabbed-slideup #qrtab {
top: -14px !important;
}
.post-form-style-tabbed-slideout.sidebar-location-left #qrtab {
<%= transform %>: rotate(90deg);
<%= transform %>-origin: bottom right;
@ -1622,11 +1660,20 @@ input:checked + .rice {
<%= transform %>-origin: bottom right;
right: 100%;
}
.post-form-style-tabbed-slideup #qr:hover #qrtab,
.post-form-style-tabbed-slideup #qr.focus #qrtab,
.post-form-style-tabbed-slideup #qr.dump #qrtab,
.post-form-style-tabbed-slideout #qr:hover #qrtab,
.post-form-style-tabbed-slideout #qr.focus #qrtab,
.post-form-style-tabbed-slideout #qr.dump #qrtab {
opacity: 0 !important;
}
.post-form-style-slideup #qrtab input,
.post-form-style-slideup #qrtab .rice,
.post-form-style-tabbed-slideup #qrtab input,
.post-form-style-tabbed-slideup #qrtab .close,
.post-form-style-tabbed-slideup #qrtab .rice,
.post-form-style-tabbed-slideup #qrtab span,
.post-form-style-slideout #qrtab input,
.post-form-style-slideout #qrtab .rice,
.post-form-style-tabbed-slideout #qrtab input,
@ -1635,6 +1682,7 @@ input:checked + .rice {
.post-form-style-tabbed-slideout #qrtab span {
display: none;
}
.post-form-style-tabbed-slideup #qrtab .selectrice,
.post-form-style-tabbed-slideout #qrtab .selectrice {
text-align: center;
}
@ -1648,7 +1696,7 @@ input:checked + .rice {
opacity: 1;
transition: opacity .3s linear;
}
:root:not(.show-post-form-header):not(.post-form-style-float):not(.post-form-style-tabbed-slideout) #qrtab,
:root:not(.show-post-form-header):not(.post-form-style-float):not(.post-form-style-tabbed-slideout):not(.post-form-style-tabbed-slideup) #qrtab,
.post-form-style-float .autohide:not(:hover):not(.focus) form,
.show-post-form-header.post-form-style-fixed .autohide:not(:hover):not(.focus) form {
display: none !important;
@ -1659,10 +1707,18 @@ input:checked + .rice {
#qr.autohide:not(:hover):not(.focus) #qrtab {
margin-bottom: 0;
}
.post-form-slideout-transitions.post-form-style-slideup #qr,
.post-form-slideout-transitions.post-form-style-tabbed-slideup #qr,
.post-form-slideout-transitions.post-form-style-slideout #qr,
.post-form-slideout-transitions.post-form-style-tabbed-slideout #qr {
transition: <%= transform %> .3s ease-in-out 1s;
}
.post-form-slideout-transitions.post-form-style-tabbed-slideup #qr.dump,
.post-form-slideout-transitions.post-form-style-tabbed-slideup #qr:hover,
.post-form-slideout-transitions.post-form-style-tabbed-slideup #qr.focus,
.post-form-slideout-transitions.post-form-style-slideup #qr.dump,
.post-form-slideout-transitions.post-form-style-slideup #qr:hover,
.post-form-slideout-transitions.post-form-style-slideup #qr.focus,
.post-form-slideout-transitions.post-form-style-tabbed-slideout #qr.dump,
.post-form-slideout-transitions.post-form-style-tabbed-slideout #qr:hover,
.post-form-slideout-transitions.post-form-style-tabbed-slideout #qr.focus,
@ -1677,6 +1733,12 @@ input:checked + .rice {
.post-form-slideout-transitions #qr:hover #qrtab {
transition: opacity .3s linear;
}
.post-form-slideout-transitions #qrtab {
transition: opacity .3s ease-in-out 1s;
}
.post-form-slideout-transitions #qr:hover #qrtab {
transition: opacity .3s linear;
}
#qr .close {
float: right;
padding: 0 3px;