Merge branch 'master' of github.com:r888888888/danbooru

This commit is contained in:
r888888888
2017-09-23 13:15:05 -07:00
7 changed files with 35 additions and 41 deletions

View File

@@ -217,12 +217,6 @@
}
Danbooru.Post.initialize_links = function() {
$("#side-edit-link").click(function(e) {
$("#post-edit-link").trigger("click");
$("#post_tag_string").trigger("focus");
e.preventDefault();
});
$("#copy-notes").click(function(e) {
var current_post_id = $("meta[name=post-id]").attr("content");
var other_post_id = parseInt(prompt("Enter the ID of the post to copy all notes to:"), 10);

View File

@@ -229,6 +229,7 @@ div#c-posts {
.fav-buttons {
font-size: 14pt;
text-align: center;
margin: 0.5em 0;
input[type=submit] {
padding: 0.2em 0.75em;

View File

@@ -55,8 +55,24 @@
}
form {
input[type=text], input[type=submit], select {
font-size: 1.5em;
input[type=text] {
vertical-align: top;
font-size: 24pt;
border: 1px solid #c5c5c5;
}
textarea {
vertical-align: top;
border: 1px solid #c5c5c5;
}
input[type=submit] {
font-size: 160%;
}
input[type=submit].tiny {
font-size: 120%;
vertical-align: top;
}
}
@@ -70,17 +86,17 @@
}
div.paginator {
font-size: 20pt;
font-size: 24pt;
font-weight: bold;
text-align: left;
text-align: center;
width: 100%;
padding: 0;
margin: 0;
margin-top: 1em;
li {
width: 30vw;
display: inline-block;
margin: 0 0.25em;
a, span {
margin: 0;
@@ -104,27 +120,24 @@
article.post-preview {
margin: 0.5vw;
width: 32vw;
height: 32vw;
width: 48.5vw;
height: 48.5vw;
text-align: center;
vertical-align: middle;
display: inline-block;
a {
width: 32vw;
width: 48.5vw;
display: block;
margin: 0 auto;
}
img {
object-fit: cover;
width: 32vw;
height: 32vw;
object-fit: contain;
width: 48.5vw;
height: 48.5vw;
margin: 0 auto;
border: none !important;
}
img.cropped-true {
object-fit: cover;
}
&[data-tags~=animated]:before, &[data-file-ext=swf]:before, &[data-file-ext=webm]:before, &[data-file-ext=mp4]:before, &[data-file-ext=zip]:before {
left: 0.5vw;
@include animated-icon;