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

This commit is contained in:
r888888888
2016-06-06 17:37:44 -07:00
parent 6a548cf2fa
commit 5249b5cd6e
2 changed files with 2 additions and 2 deletions

View File

@@ -13,4 +13,4 @@ require 'capistrano3/unicorn'
# Load custom tasks from `lib/capistrano/tasks` if you have any defined
Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
after "deploy:published", "unicorn:restart"
after "deploy:published", "unicorn:reload"

View File

@@ -1,4 +1,4 @@
<% CurrentUser.user.custom_style.split.each do |line| %>
<% CurrentUser.user.custom_style.split(/\r\n|\r|\n/).each do |line| %>
<% if line =~ /^@import/ %>
<%= raw(line) %>
<% else %>