jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #1978

Browse Source 
Related to #1316
This commit is contained in:
Toks
2013-09-12 21:08:50 -04:00
parent 1d3a9e65f4
commit e79679ebb9
3 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/assets/javascripts/posts.js
View File

@@ -411,7 +411,6 @@
Danbooru.Post.initialize_post_previews = function() {
$(".post-preview").each(function(i, v) {
Danbooru.Post.initialize_title_for(v);
Danbooru.Post.initialize_preview_borders_for(v);
});
}
@@ -421,36 +420,6 @@
$img.attr("title", $post.attr("data-tags") + " user:" + $post.attr("data-uploader") + " rating:" + $post.data("rating") + " score:" + $post.data("score"));
}
Danbooru.Post.initialize_preview_borders_for = function(post) {
var $post = $(post);
var $img = $post.find("img");
var border_colors = [];
if ($post.hasClass("post-status-has-children")) {
border_colors.push("#0F0");
}
if ($post.hasClass("post-status-has-parent")) {
border_colors.push("#CC0");
}
if ($post.hasClass("post-status-deleted")) {
border_colors.push("#000");
} else if ($post.hasClass("post-status-pending")) {
border_colors.push("#00F");
} else if ($post.hasClass("post-status-flagged")) {
border_colors.push("#F00");
}
if (border_colors.length > 1) {
$img.css("border", "2px solid");
if (border_colors.length === 2) {
$img.css("border-color", border_colors[0] + " " + border_colors[1] + " " + border_colors[1] + " " + border_colors[0]);
} else if (border_colors.length === 3) {
$img.css("border-color", border_colors[0] + " " + border_colors[2] + " " + border_colors[2] + " " + border_colors[1]);
}
}
}
Danbooru.Post.initialize_post_image_resize_links = function() {
$("#image-resize-link").click(function(e) {
var $link = $(e.target);

5
app/assets/stylesheets/common/000_vars.css.scss
View File

@@ -19,6 +19,11 @@ $h3_padding: 1.51785em 0;
$h4_padding: 1.51785em 0;
$baseline: 1em;
$basefont: 100%;
$preview_has_children_color: #0F0;
$preview_has_parent_color: #CC0;
$preview_deleted_color: #000;
$preview_pending_color: #00F;
$preview_flagged_color: #F00;
@mixin border-radius($val) {
-moz-border-radius: $val;

78
app/assets/stylesheets/specific/posts.css.scss
View File

@@ -23,27 +23,73 @@ a.blacklisted-active {
}
.post-preview {
border: 2px solid transparent;
}
img {
border: 2px solid transparent;
}
.post-preview.post-status-has-parent img {
border: 2px solid #CC0;
}
.post-preview.post-status-deleted img {
border: 2px solid #000;
}
&.post-status-has-children img {
border-color: $preview_has_children_color;
}
.post-preview.post-status-has-children img {
border: 2px solid #0F0;
}
&.post-status-has-parent img {
border-color: $preview_has_parent_color;
}
&.post-status-has-children.post-status-has-parent img {
border-color: $preview_has_children_color $preview_has_parent_color $preview_has_parent_color $preview_has_children_color;
}
.post-preview.post-status-pending img {
border: 2px solid #00F;
}
.post-preview.post-status-flagged img {
border: 2px solid #F00;
&.post-status-deleted img {
border-color: $preview_deleted_color;
}
&.post-status-has-children.post-status-deleted img {
border-color: $preview_has_children_color $preview_deleted_color $preview_deleted_color $preview_has_children_color;
}
&.post-status-has-parent.post-status-deleted img {
border-color: $preview_has_parent_color $preview_deleted_color $preview_deleted_color $preview_has_parent_color;
}
&.post-status-has-children.post-status-has-parent.post-status-deleted img {
border-color: $preview_has_children_color $preview_deleted_color $preview_deleted_color $preview_has_parent_color;
}
&.post-status-pending img {
border-color: $preview_pending_color;
}
&.post-status-has-children.post-status-pending img {
border-color: $preview_has_children_color $preview_pending_color $preview_pending_color $preview_has_children_color;
}
&.post-status-has-parent.post-status-pending img {
border-color: $preview_has_parent_color $preview_pending_color $preview_pending_color $preview_has_parent_color;
}
&.post-status-has-children.post-status-has-parent.post-status-pending img {
border-color: $preview_has_children_color $preview_pending_color $preview_pending_color $preview_has_parent_color;
}
&.post-status-flagged img {
border-color: $preview_flagged_color;
}
&.post-status-has-children.post-status-flagged img {
border-color: $preview_has_children_color $preview_flagged_color $preview_flagged_color $preview_has_children_color;
}
&.post-status-has-parent.post-status-flagged img {
border-color: $preview_has_parent_color $preview_flagged_color $preview_flagged_color $preview_has_parent_color;
}
&.post-status-has-children.post-status-has-parent.post-status-flagged img {
border-color: $preview_has_children_color $preview_flagged_color $preview_flagged_color $preview_has_parent_color;
}
}
.post-preview.current-post {