[Git][noosfero/noosfero][stable-1.10] Merge branch 'social-statistics-css-include' into 'master'

Rodrigo Souto gitlab at mg.gitlab.com
Tue Oct 31 18:37:16 BRST 2017


Rodrigo Souto pushed to branch stable-1.10 at Noosfero / noosfero


Commits:
1380b473 by Rodrigo Souto at 2017-10-31T20:37:08+00:00
Merge branch 'social-statistics-css-include' into 'master'

social-statistics: fix css include

See merge request noosfero/noosfero!1334

(cherry picked from commit f364aac27feaa7d19bc0fd213a8e788eba1eb930)

3dce6005 social-statistics: fix css include
- - - - -


1 changed file:

- plugins/social_statistics/views/layouts/blazer/application.html.erb


Changes:

=====================================
plugins/social_statistics/views/layouts/blazer/application.html.erb
=====================================
--- a/plugins/social_statistics/views/layouts/blazer/application.html.erb
+++ b/plugins/social_statistics/views/layouts/blazer/application.html.erb
@@ -8,7 +8,7 @@
     <meta charset="utf-8" />
 
     <%= stylesheet_link_tag "blazer/application" %>
-    <%= stylesheet_link_tag "#{File.join(theme_path, 'blazer')}/style.css" %>
+    <%= stylesheet_link_tag "/assets#{File.join(theme_path, 'blazer')}/style.css" %>
     <%= javascript_include_tag "blazer/application" %>
     <script>
       <%= blazer_js_var "rootPath", root_path %>



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/1380b47376720004d5ff3230493064ffc114ec32

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/1380b47376720004d5ff3230493064ffc114ec32
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20171031/ea649cc2/attachment.html>


More information about the Noosfero-dev mailing list