diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b2d338a34..bb63248d7 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,5 +1,4 @@ //= require hammer.min.js -//= require jquery-ui-1.11.2.min.js //= require jquery.hotkeys.js //= require jquery.timeout.js //= require jquery-ui-autocomplete-1.11.2.js diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 7d9d2d48e..0abc0600c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,4 +1,3 @@ -@import "jquery-ui-1.11.2.min.scss"; @import "jquery.dropdown.scss"; @import "jquery.qtip.css"; @import "common/*"; diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 9b5ebc3b3..5ee1cabeb 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -27,11 +27,13 @@ <%= content_tag(:meta, nil, name: "disable-mobile-gestures", content: CurrentUser.disable_mobile_gestures?) %> <%= auto_discovery_link_tag :atom, posts_path(:format => "atom", :tags => params[:tags]) %> + <%= stylesheet_link_tag "application", :media => "screen" %> <% if CurrentUser.user.custom_style.present? %> <%= stylesheet_link_tag custom_style_users_path, :media => "screen" %> <% end %> + <%= javascript_include_tag "application" %> <%= raw Danbooru.config.custom_html_header_content %> <%= yield :html_header %>