jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Capfile
View File

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

2
app/views/users/custom_style.css.erb
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/ %> <% if line =~ /^@import/ %>
<%= raw(line) %> <%= raw(line) %>
<% else %> <% else %>