From 46236e32a5ba45728aee35e134c113097de7aa63 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Wed, 16 Nov 2011 18:13:29 -0500
Subject: [PATCH] fixes

---
 app/assets/javascripts/notes.js                     |  2 +-
 app/assets/stylesheets/common/forms.css.scss        | 13 ++-----------
 .../stylesheets/common/jquery_ui_custom.css.scss    |  2 ++
 app/assets/stylesheets/common/page_header.css.scss  |  3 +--
 app/views/posts/partials/show/_notices.html.erb     | 10 +++++-----
 script/upgrade_schema.sql                           |  6 +++---
 6 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 9f78827ff..f387ab30d 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -271,7 +271,7 @@ Danbooru.Note = {
 
       $textarea = $('<textarea></textarea>');
       $textarea.css({
-        width: "100%",
+        width: "95%",
         height: "10em"
       });
       
diff --git a/app/assets/stylesheets/common/forms.css.scss b/app/assets/stylesheets/common/forms.css.scss
index 46712ef3f..cfc0bba47 100644
--- a/app/assets/stylesheets/common/forms.css.scss
+++ b/app/assets/stylesheets/common/forms.css.scss
@@ -122,24 +122,15 @@ select:focus {
   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
-button, input[type="submit"] {
+button, input[type="submit"], a.btn {
   // Button Base
   cursor: pointer;
   display: inline-block;
   @include vertical-three-colors-gradient(#fff, #fff, 25%, darken(#fff, 10%));
   padding: 3px 10px 3px;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
-  color: #222;
+  color: black;
   font-size: $basefont;
   line-height: normal;
   border: 1px solid #ccc;
diff --git a/app/assets/stylesheets/common/jquery_ui_custom.css.scss b/app/assets/stylesheets/common/jquery_ui_custom.css.scss
index 5355bd34b..fac4ed2ea 100644
--- a/app/assets/stylesheets/common/jquery_ui_custom.css.scss
+++ b/app/assets/stylesheets/common/jquery_ui_custom.css.scss
@@ -1,4 +1,6 @@
 div.ui-dialog {
+  overflow: visible;
+  
   ul {
     margin-left: 1em;
     margin-bottom: 1em;
diff --git a/app/assets/stylesheets/common/page_header.css.scss b/app/assets/stylesheets/common/page_header.css.scss
index 484f8365b..34c74076a 100644
--- a/app/assets/stylesheets/common/page_header.css.scss
+++ b/app/assets/stylesheets/common/page_header.css.scss
@@ -28,7 +28,6 @@ header#top {
     li.current a {
       background: $menu_color;
       font-weight: bold;
-      @include border-radius(4px 4px 0 0);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb
index 60a2d29e4..824523511 100644
--- a/app/views/posts/partials/show/_notices.html.erb
+++ b/app/views/posts/partials/show/_notices.html.erb
@@ -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">
     This post has been flagged for deletion: <%= post_flag_reasons(post) %>
   </div>
@@ -9,10 +9,10 @@
     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) %>
-      <span class="quick-mod">
-        <%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :method => :post, :remote => true %>
-        | <%= link_to "Disapprove", moderator_post_disapproval_path(:post_id => post.id), :method => :post, :remote => true %>
-      </span>
+      <div class="quick-mod">
+        <%= 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, :class => "btn" %>
+      </div>
     <% end %>
   </div>
 <% end %>
diff --git a/script/upgrade_schema.sql b/script/upgrade_schema.sql
index ebfd631f2..85c5c210d 100644
--- a/script/upgrade_schema.sql
+++ b/script/upgrade_schema.sql
@@ -118,9 +118,9 @@ drop table dmails_orig;
 alter table tag_subscriptions drop column id;
 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__user;
-alter table favorites drop constraint favorites_pkey;
+-- alter table favorites drop constraint fk_favorites__post;
+-- alter table favorites drop constraint fk_favorites__user;
+-- alter table favorites drop constraint favorites_pkey;
 drop index idx_favorites__post;
 drop index idx_favorites__user;
 alter table favorites rename to favorites_orig;