diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-25 15:09:40 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-25 15:09:40 +0100 |
| commit | 318886287b289a8caccf19102da8584453ef7faa (patch) | |
| tree | b3cf78d9c9b52c750aa3539072158fc49081c9e6 /app/assets | |
| parent | 36f3da3cde2bc2148e156a5dd09d732a06b44ddd (diff) | |
Fixing some stuff for Turbolinks, adding gzip on top, fixing a n+1 query
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/mastodon-logo.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/profiler.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/mastodon-logo.coffee b/app/assets/javascripts/mastodon-logo.coffee index bcf52f378..0b4e67e79 100644 --- 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) diff --git a/app/assets/javascripts/profiler.coffee b/app/assets/javascripts/profiler.coffee new file mode 100644 index 000000000..bcdcc1e59 --- /dev/null +++ b/app/assets/javascripts/profiler.coffee @@ -0,0 +1,2 @@ +$(document).on 'turbolinks:load', -> + window.MiniProfiler.pageTransition() unless typeof window.MiniProfiler == 'undefined' diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index e34f0ba32..1f35053a1 100644 --- 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; |