From f93b1fe478bf4277260592e9b5cf4cc9b9f776b8 Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 13 Mar 2021 21:20:20 -0600 Subject: [PATCH] custom css: don't add !important to every line. Fixes #4398. --- app/controllers/users_controller.rb | 2 +- app/logical/custom_css.rb | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 app/logical/custom_css.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index acd68815d..ca95cdb4e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -109,7 +109,7 @@ class UsersController < ApplicationController end def custom_style - @css = CustomCss.parse(CurrentUser.user.custom_style) + @css = CurrentUser.user.custom_style expires_in 10.years end diff --git a/app/logical/custom_css.rb b/app/logical/custom_css.rb deleted file mode 100644 index 0f3629095..000000000 --- a/app/logical/custom_css.rb +++ /dev/null @@ -1,11 +0,0 @@ -module CustomCss - def self.parse(css) - css.to_s.split(/\r\n|\r|\n/).map do |line| - if line =~ /\A@import/ - line - else - line.gsub(/([^[:space:]])[[:space:]]*(?:!important)?[[:space:]]*(;|})/, "\\1 !important\\2") - end - end.join("\n") - end -end