diff --git a/app/javascript/src/javascripts/posts.js.erb b/app/javascript/src/javascripts/posts.js.erb index dba32a2a5..65fc2a22a 100644 --- a/app/javascript/src/javascripts/posts.js.erb +++ b/app/javascript/src/javascripts/posts.js.erb @@ -148,9 +148,9 @@ Post.open_edit_dialog = function() { }); dialog.parent().mouseout(function(e) { - dialog.parent().css({"opacity": 0.6, "transition": "opacity .2s ease"}); + dialog.parent().css({"opacity": 0.6, "transition": "opacity .4s ease"}); }).mouseover(function(e) { - dialog.parent().css({"opacity": 1}); + dialog.parent().css({"opacity": 1, "transition": "opacity .2s ease"}); }); $tag_string.css({"resize": "none", "width": "100%"}); diff --git a/app/javascript/src/styles/common/jquery_ui_custom.scss b/app/javascript/src/styles/common/jquery_ui_custom.scss index 2712e48a3..e1da6ddd9 100644 --- a/app/javascript/src/styles/common/jquery_ui_custom.scss +++ b/app/javascript/src/styles/common/jquery_ui_custom.scss @@ -22,6 +22,12 @@ div.ui-dialog { font-size: 1em; z-index: 999 !important; box-shadow: 2px 2px 1px grey; + padding: 0; + + .ui-dialog-titlebar { + border-radius: 0; + border: none; + } ul { margin-left: 1em; @@ -52,7 +58,11 @@ div.ui-dialog { margin: 0; padding: 0.25em 1em; background-color: #f6f6f6; - border: 1px solid #c5c5c5; + border-top: 1px solid silver; + border-left: 1px solid silver; + border-bottom: 1px solid darkgrey; + border-right: 1px solid darkgrey; + background: linear-gradient(#f6f6f6, #e5e5e5); &.sub { font-size: 90%; @@ -62,19 +72,11 @@ div.ui-dialog { font-size: 90%; padding: 0.25em 0.5em; } - - &.gradient { - background: linear-gradient(#f6f6f6, #e5e5e5); - } } .ui-button:hover { box-shadow: 1px 1px grey; - transform: translateY(-1px); - - &.gradient { - background: linear-gradient(#fefefe, #f0f0f0); - } + background: linear-gradient(#fefefe, #f0f0f0); } .ui-front { diff --git a/app/views/posts/partials/index/_options.html.erb b/app/views/posts/partials/index/_options.html.erb index 7527f69fe..d6e8b1fbf 100644 --- a/app/views/posts/partials/index/_options.html.erb +++ b/app/views/posts/partials/index/_options.html.erb @@ -2,7 +2,7 @@

Options

diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb index 662b011bc..01fc5987c 100644 --- a/app/views/posts/partials/show/_edit.html.erb +++ b/app/views/posts/partials/show/_edit.html.erb @@ -68,7 +68,7 @@
<%= f.label :source %> <%= f.text_field :source %> - <%= button_tag "Similar", :id => "similar-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %> + <%= button_tag "Similar", :id => "similar-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub" %>
<% if Danbooru.config.iqdbs_server %> diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb index 7c8a0b96c..d23e03749 100644 --- a/app/views/posts/show.html.erb +++ b/app/views/posts/show.html.erb @@ -56,11 +56,11 @@ <% if CurrentUser.is_member? %> <%= content_tag(:div, class: "fav-buttons fav-buttons-#{@post.is_favorited?}") do %> <%= form_tag(favorites_path(post_id: @post.id), method: "post", id: "add-fav-button", "data-remote": true) do %> - <%= button_tag tag.i(class: "far fa-heart"), class: "ui-button ui-widget ui-corner-all gradient", "data-disable-with": tag.i(class: "fas fa-spinner fa-spin") %> + <%= button_tag tag.i(class: "far fa-heart"), class: "ui-button ui-widget ui-corner-all", "data-disable-with": tag.i(class: "fas fa-spinner fa-spin") %> <% end %> <%= form_tag(favorite_path(@post.id), method: "delete", id: "remove-fav-button", "data-remote": true) do %> - <%= button_tag tag.i(class: "fas fa-heart"), class: "ui-button ui-widget ui-corner-all gradient", "data-disable-with": tag.i(class: "fas fa-spinner fa-spin") %> + <%= button_tag tag.i(class: "fas fa-heart"), class: "ui-button ui-widget ui-corner-all", "data-disable-with": tag.i(class: "fas fa-spinner fa-spin") %> <% end %> <% end %> <% end %> diff --git a/app/views/related_tags/_buttons.html.erb b/app/views/related_tags/_buttons.html.erb index e2b4667f9..0bb87a6e6 100644 --- a/app/views/related_tags/_buttons.html.erb +++ b/app/views/related_tags/_buttons.html.erb @@ -1,5 +1,5 @@ -<%= button_tag "Related tags", type: :button, class: "related-tags-button ui-button ui-widget ui-corner-all sub gradient" %> +<%= button_tag "Related tags", type: :button, class: "related-tags-button ui-button ui-widget ui-corner-all sub" %> <% TagCategory.related_button_list.each do |category| %> - <%= button_tag TagCategory.related_button_mapping[category], type: :button, "data-category": category, class: "related-tags-button ui-button ui-widget ui-corner-all sub gradient" %> + <%= button_tag TagCategory.related_button_mapping[category], type: :button, "data-category": category, class: "related-tags-button ui-button ui-widget ui-corner-all sub" %> <% end %> diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb index 10c475388..6febd5a1c 100644 --- a/app/views/uploads/new.html.erb +++ b/app/views/uploads/new.html.erb @@ -42,7 +42,7 @@
<%= f.label :source %> <%= f.text_field :source, :size => 50, :value => params[:url] %> - <%= button_tag "Similar", :id => "similar-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %> + <%= button_tag "Similar", :id => "similar-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub" %> You can enter a URL to have <%= Danbooru.config.app_name %> automatically download and process it
@@ -108,7 +108,7 @@
- <%= submit_tag "Submit", :id => "submit-button", :class => "large ui-button ui-widget ui-corner-all gradient", data: { disable_with: false } %> + <%= submit_tag "Submit", :id => "submit-button", :class => "large ui-button ui-widget ui-corner-all", data: { disable_with: false } %>
<%= render "related_tags/container" %>