fixes #2601: custom Css, do not add "important;" to lines starting with @

2016-06-01 13:25:22 -07:00
parent d2291fa754
commit ebbec0186c
1 changed files with 7 additions and 1 deletions
--- a/app/views/users/custom_style.css.erb
+++ b/app/views/users/custom_style.css.erb
@@ -1 +1,7 @@
-<%= CurrentUser.user.custom_style.gsub(/(\S)\s*(?:!important)?\s*(;|})/, "\\1!important\\2").html_safe %>
+<% CurrentUser.user.custom_style.split.each do |line| %>
+  <% if line =~ /^@import/ %>
+    <%= raw(line) %>
+  <% else %>
+    <%= raw(line.gsub(/(\S)\s*(?:!important)?\s*(;|})/, "\\1 !important\\2")) %>
+  <% end %>
+<% end %>