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

Merge branch 'master' into catalog

Browse Source 
Conflicts:
	src/General/Index.coffee
	src/Menu/Menu.coffee
This commit is contained in:
ccd0 2014-09-13 13:08:37 -07:00
commit c519026083
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -30,7 +30,7 @@
"dev": " dev" "dev": " dev"
}, },
"min": { "min": {
"chrome": "31", "chrome": "32",
"firefox": "26", "firefox": "26",
"greasemonkey": "1.14" "greasemonkey": "1.14"
} }

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

@ -616,7 +616,7 @@ span.hide-announcement {
#updater > div:last-child { #updater > div:last-child {
text-align: center; text-align: center;
} }
#updater input[type=number] { #updater input[type="number"] {
width: 4em; width: 4em;
} }
:root.float #updater { :root.float #updater {
@ -898,7 +898,7 @@ span.hide-announcement {
:root.hide-original-post-form #togglePostFormLink, :root.hide-original-post-form #togglePostFormLink,
:root:not(.catalog) #togglePostFormLink, :root:not(.catalog) #togglePostFormLink,
#qr.autohide:not(.focus):not(:hover):not(:active) > form, #qr.autohide:not(.focus):not(:hover):not(:active) > form,
:root.thread-view #qr:not(.show-new-thread-option) select[data-name=thread], :root.thread-view #qr:not(.show-new-thread-option) select[data-name="thread"],
#file-n-submit:not(.has-file) #qr-filerm { #file-n-submit:not(.has-file) #qr-filerm {
display: none; display: none;
} }
@ -984,9 +984,9 @@ span.hide-announcement {
flex: 1; flex: 1;
width: 0; width: 0;
} }
#qr.forced-anon input[data-name=name]:not(.force-show), #qr.forced-anon input[data-name="name"]:not(.force-show),
#qr.forced-anon input[data-name=sub]:not(.force-show), #qr.forced-anon input[data-name="sub"]:not(.force-show),
#qr.reply-to-thread input[data-name=sub]:not(.force-show) { #qr.reply-to-thread input[data-name="sub"]:not(.force-show) {
display: none; display: none;
} }
#qr textarea.field { #qr textarea.field {
@ -1026,11 +1026,11 @@ input.field.tripped:not(:hover):not(:focus) {
#qr textarea { #qr textarea {
min-width: 100%; min-width: 100%;
} }
#qr [type='submit'] { #qr [type="submit"] {
width: 25%; width: 25%;
vertical-align: top; vertical-align: top;
} }
:root.webkit #qr [type='submit'] { :root.webkit #qr [type="submit"] {
height: 24px; height: 24px;
} }
#qr label input[type="checkbox"] { #qr label input[type="checkbox"] {
@ -1094,12 +1094,12 @@ input#qr-filename:not(.edit) {
#file-n-submit { #file-n-submit {
height: 23px; height: 23px;
} }
#qr input[type=file] { #qr input[type="file"] {
visibility: hidden; visibility: hidden;
position: absolute; position: absolute;
} }
/* Thread Select / Spoiler Label */ /* Thread Select / Spoiler Label */
#qr select[data-name=thread] { #qr select[data-name="thread"] {
float: right; float: right;
} }
#qr.has-spoiler .has-file #qr-spoiler-label { #qr.has-spoiler .has-file #qr-spoiler-label {