Fixing some stuff for Turbolinks, adding gzip on top, fixing a n+1 query

2016-03-25 15:09:40 +01:00
parent 36f3da3cde
commit 318886287b
7 changed files with 16 additions and 3 deletions
--- a/app/assets/javascripts/mastodon-logo.coffee
+++ b/app/assets/javascripts/mastodon-logo.coffee
@ -44,5 +44,5 @@ work = ->
  if runs == stop_at_run
    stop()

-$ ->
+$(document).on 'turbolinks:load', ->
  setTimeout(start, 100)
--- a/app/assets/javascripts/profiler.coffee
+++ b/app/assets/javascripts/profiler.coffee
@ -0,0 +1,2 @@
+$(document).on 'turbolinks:load', ->
+  window.MiniProfiler.pageTransition() unless typeof window.MiniProfiler == 'undefined'
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@ -279,6 +279,10 @@ body {
  }
 }

+.turbolinks-progress-bar {
+  background-color: #2b90d9;
+}
+
 .mastodon {
  $head: #282c37;
  $tusk: #d9e1e8;