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

fixes

Browse Source
This commit is contained in:
albert
2011-11-16 18:13:29 -05:00
parent 03850a37d5
commit 46236e32a5
6 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/notes.js
View File

@@ -271,7 +271,7 @@ Danbooru.Note = {
$textarea = $('<textarea></textarea>'); $textarea = $('<textarea></textarea>');
$textarea.css({ $textarea.css({
width: "100%", width: "95%",
height: "10em" height: "10em"
}); });

13
app/assets/stylesheets/common/forms.css.scss
View File

@@ -122,24 +122,15 @@ select:focus {
outline: 1px dotted #666; // Select elements don't get box-shadow styles, so instead we do outline outline: 1px dotted #666; // Select elements don't get box-shadow styles, so instead we do outline
} }
// button styles
button, input[type="submit"] {
// Sets the close button to the middle of message
.close {
font-family: Arial, sans-serif;
line-height: 18px;
}
}
// Base .btn styles // Base .btn styles
button, input[type="submit"] { button, input[type="submit"], a.btn {
// Button Base // Button Base
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
@include vertical-three-colors-gradient(#fff, #fff, 25%, darken(#fff, 10%)); @include vertical-three-colors-gradient(#fff, #fff, 25%, darken(#fff, 10%));
padding: 3px 10px 3px; padding: 3px 10px 3px;
text-shadow: 0 1px 1px rgba(255,255,255,.75); text-shadow: 0 1px 1px rgba(255,255,255,.75);
color: #222; color: black;
font-size: $basefont; font-size: $basefont;
line-height: normal; line-height: normal;
border: 1px solid #ccc; border: 1px solid #ccc;

2
app/assets/stylesheets/common/jquery_ui_custom.css.scss
View File

@@ -1,4 +1,6 @@
div.ui-dialog { div.ui-dialog {
overflow: visible;
ul { ul {
margin-left: 1em; margin-left: 1em;
margin-bottom: 1em; margin-bottom: 1em;

3
app/assets/stylesheets/common/page_header.css.scss
View File

@@ -28,7 +28,6 @@ header#top {
li.current a { li.current a {
background: $menu_color; background: $menu_color;
font-weight: bold; font-weight: bold;
@include border-radius(4px 4px 0 0);
} }
} }
} }

10
app/views/posts/partials/show/_notices.html.erb
View File

@@ -1,4 +1,4 @@
<% if true || (post.is_flagged? || post.is_deleted?) && post.flags.any? %> <% if (post.is_flagged? || post.is_deleted?) && post.flags.any? %>
<div class="ui-corner-all ui-state-highlight notice"> <div class="ui-corner-all ui-state-highlight notice">
This post has been flagged for deletion: <%= post_flag_reasons(post) %> This post has been flagged for deletion: <%= post_flag_reasons(post) %>
</div> </div>
@@ -9,10 +9,10 @@
This post is pending approval (<%= link_to "learn more", wiki_pages_path(:title => "help:post_moderation") %>) This post is pending approval (<%= link_to "learn more", wiki_pages_path(:title => "help:post_moderation") %>)
<% if CurrentUser.is_janitor? && !post.disapproved_by?(CurrentUser.user) %> <% if CurrentUser.is_janitor? && !post.disapproved_by?(CurrentUser.user) %>
<span class="quick-mod"> <div class="quick-mod">
<%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :method => :post, :remote => true %> <%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :method => :post, :remote => true, :class => "btn" %>
| <%= link_to "Disapprove", moderator_post_disapproval_path(:post_id => post.id), :method => :post, :remote => true %> <%= link_to "Disapprove", moderator_post_disapproval_path(:post_id => post.id), :method => :post, :remote => true, :class => "btn" %>
</span> </div>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

6
script/upgrade_schema.sql
View File

@@ -118,9 +118,9 @@ drop table dmails_orig;
alter table tag_subscriptions drop column id; alter table tag_subscriptions drop column id;
alter table tag_subscriptions add column id serial primary key; alter table tag_subscriptions add column id serial primary key;
alter table favorites drop constraint fk_favorites__post; -- alter table favorites drop constraint fk_favorites__post;
alter table favorites drop constraint fk_favorites__user; -- alter table favorites drop constraint fk_favorites__user;
alter table favorites drop constraint favorites_pkey; -- alter table favorites drop constraint favorites_pkey;
drop index idx_favorites__post; drop index idx_favorites__post;
drop index idx_favorites__user; drop index idx_favorites__user;
alter table favorites rename to favorites_orig; alter table favorites rename to favorites_orig;