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.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? %>