Merge branch 'vampiric'

This commit is contained in:
Zixaphir 2014-04-03 15:33:39 -07:00
commit 4d46c17073
4 changed files with 73 additions and 8 deletions

File diff suppressed because one or more lines are too long

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': [ 'Post Form Style': [
'tabbed slideout' 'tabbed slideout'
'How the post form will sit on the page.' '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' : [ 'Post Form Slideout Transitions' : [
true true

View File

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