diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index a3d5c6d6f..db73d22aa 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -99,7 +99,7 @@ }); dialog.parent().mouseout(function(e) { - dialog.parent().css({"opacity": 0.6}); + dialog.parent().css({"opacity": 0.6, "transition": "opacity .2s ease"}); }) .mouseover(function(e) { dialog.parent().css({"opacity": 1}); diff --git a/app/assets/stylesheets/common/jquery_ui_custom.scss b/app/assets/stylesheets/common/jquery_ui_custom.scss index 2c02c9090..7519a15fb 100644 --- a/app/assets/stylesheets/common/jquery_ui_custom.scss +++ b/app/assets/stylesheets/common/jquery_ui_custom.scss @@ -3,6 +3,7 @@ div.ui-dialog { overflow: visible; font-size: 1em; z-index: 999 !important; + box-shadow: 2px 2px 1px grey; ul { margin-left: 1em; @@ -19,3 +20,27 @@ div.ui-dialog { border: 1px solid #FBC7C6; background: #FDDFDE; } + +.ui-button { + margin: 0; + padding: 0.25em 1em; + background-color: #f6f6f6; + border: 1px solid #c5c5c5; + + &.sub { + font-size: 90%; + } + + &.tiny { + font-size: 90%; + padding: 0.25em 0.5em; + } + + &.gradient { + background: linear-gradient(#f6f6f6, #e5e5e5); + } +} + +.ui-button:hover { + box-shadow: 1px 1px grey; +} \ No newline at end of file diff --git a/app/assets/stylesheets/common/simple_form.scss b/app/assets/stylesheets/common/simple_form.scss index 7e3b606a7..ca697547d 100644 --- a/app/assets/stylesheets/common/simple_form.scss +++ b/app/assets/stylesheets/common/simple_form.scss @@ -6,6 +6,10 @@ form.simple_form { display: inline; vertical-align: middle; margin-left: 0.5em; + + input { + margin-right: 0.25em; + } } } diff --git a/app/assets/stylesheets/specific/posts.scss b/app/assets/stylesheets/specific/posts.scss index 2415ca2f9..b4b57be01 100644 --- a/app/assets/stylesheets/specific/posts.scss +++ b/app/assets/stylesheets/specific/posts.scss @@ -77,6 +77,14 @@ a.blacklisted-active { font-style: italic; } +#open-edit-dialog { + padding: 0; +} + +#edit-dialog textarea { + margin-bottom: 0.25em; +} + .post-preview { img { border: 2px solid transparent; @@ -223,7 +231,7 @@ div#c-posts { text-align: center; input[type=submit] { - padding: 0.2em 0.5em; + padding: 0.2em 0.75em; } } @@ -401,6 +409,10 @@ div#c-posts { word-wrap: break-word; } + textarea { + margin-bottom: 0.25em; + } + #favlist { margin-left: 1em; word-wrap: break-word; diff --git a/app/assets/stylesheets/specific/uploads.scss b/app/assets/stylesheets/specific/uploads.scss index 2315bc6fa..4bca51a6b 100644 --- a/app/assets/stylesheets/specific/uploads.scss +++ b/app/assets/stylesheets/specific/uploads.scss @@ -19,7 +19,7 @@ div#c-uploads { } textarea { - margin-bottom: 0.5em; + margin-bottom: 0.25em; } .hint { diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb index 5a8d44c81..5850efef5 100644 --- a/app/views/comments/_form.html.erb +++ b/app/views/comments/_form.html.erb @@ -9,6 +9,6 @@ <%= f.input :do_not_bump_post, :label => "No bump" %> <% end %> <% if CurrentUser.is_moderator? %> - <%= f.input :is_sticky, :label => "Post as moderator" %> + <%= f.input :is_sticky, :label => "Post as moderator", :for => "comment_is_sticky" %> <% end %> <% end %> diff --git a/app/views/posts/partials/common/_search.html.erb b/app/views/posts/partials/common/_search.html.erb index 93c12a4f0..acc9ac8b4 100644 --- a/app/views/posts/partials/common/_search.html.erb +++ b/app/views/posts/partials/common/_search.html.erb @@ -14,8 +14,8 @@ <%= hidden_field_tag :random, params[:random] %> <% end %> <%= hidden_field_tag "ms", "1" %> - <%= submit_tag "Go", :name => nil %> - <%= submit_tag "+", :id => "expand-search", "data-jq-dropdown" => "#search-dropdown" %> + <%= submit_tag "Go", :name => nil, :class => "ui-button ui-widget ui-corner-all tiny gradient" %> + <%= submit_tag "+", :id => "expand-search", "data-jq-dropdown" => "#search-dropdown", :class => "ui-button ui-widget ui-corner-all tiny gradient" %>