diff --git a/app/assets/stylesheets/common/jquery_ui_custom.css.scss b/app/assets/stylesheets/common/jquery_ui_custom.css.scss index e4f2bfb28..5355bd34b 100644 --- a/app/assets/stylesheets/common/jquery_ui_custom.css.scss +++ b/app/assets/stylesheets/common/jquery_ui_custom.css.scss @@ -6,6 +6,11 @@ div.ui-dialog { } .ui-state-highlight { - border: 2px solid #999; - background: #eee; -} \ No newline at end of file + border: 1px solid #FCEEC1; + background: #FDF5D9; +} + +.ui-state-error { + border: 1px solid #FBC7C6; + background: #FDDFDE; +} diff --git a/app/assets/stylesheets/common/main_layout.css.scss b/app/assets/stylesheets/common/main_layout.css.scss index 78798e659..9bf72c0d2 100644 --- a/app/assets/stylesheets/common/main_layout.css.scss +++ b/app/assets/stylesheets/common/main_layout.css.scss @@ -59,3 +59,4 @@ div#more-links { padding: 0.2em 0.6em; @include box-shadow(2px, 2px, 2px, #ccc); } + \ No newline at end of file diff --git a/app/assets/stylesheets/common/simple_form.css.scss b/app/assets/stylesheets/common/simple_form.css.scss index 224336875..40159e247 100644 --- a/app/assets/stylesheets/common/simple_form.css.scss +++ b/app/assets/stylesheets/common/simple_form.css.scss @@ -22,12 +22,12 @@ form.simple_form { display: block; cursor: pointer; font-weight: bold; + line-height: 1.5em; } span.hint { color: #666; font-style: italic; - margin-left: 1em; } fieldset { diff --git a/app/assets/stylesheets/specific/users.css.scss b/app/assets/stylesheets/specific/users.css.scss index 6cd608109..4a60f4763 100644 --- a/app/assets/stylesheets/specific/users.css.scss +++ b/app/assets/stylesheets/specific/users.css.scss @@ -6,12 +6,13 @@ div#c-users { margin-bottom: 0.5em; } - div.input span.hint { - visibility: hidden; + div.input { + margin-bottom: 2em; } - div.input:hover span.hint { - visibility: visible; + div.input span.hint { + display: block; + max-width: 30em; } } diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb index 189aae8de..60a2d29e4 100644 --- a/app/views/posts/partials/show/_notices.html.erb +++ b/app/views/posts/partials/show/_notices.html.erb @@ -1,4 +1,4 @@ -<% if (post.is_flagged? || post.is_deleted?) && post.flags.any? %> +<% if true || (post.is_flagged? || post.is_deleted?) && post.flags.any? %>