diff --git a/Gemfile b/Gemfile index 995406a90..86fdf1993 100644 --- a/Gemfile +++ b/Gemfile @@ -177,6 +177,7 @@ group :development do gem 'bullet' gem 'letter_opener' gem 'web-console' + gem 'scss_lint', require: false # used in swagger build gem 'json_refs' diff --git a/Gemfile.lock b/Gemfile.lock index d980d4a40..3723a738c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -643,6 +643,11 @@ GEM sexp_processor (~> 4.6) ruby_parser (3.20.0) sexp_processor (~> 4.16) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) @@ -653,6 +658,8 @@ GEM tilt scout_apm (5.3.3) parser + scss_lint (0.60.0) + sass (~> 3.5, >= 3.5.5) seed_dump (3.3.1) activerecord (>= 4) activesupport (>= 4) @@ -874,6 +881,7 @@ DEPENDENCIES rubocop-rails rubocop-rspec scout_apm + scss_lint seed_dump sentry-rails sentry-ruby diff --git a/app/controllers/api/v1/accounts/portals_controller.rb b/app/controllers/api/v1/accounts/portals_controller.rb index b1837acbd..fcc02c6ec 100644 --- a/app/controllers/api/v1/accounts/portals_controller.rb +++ b/app/controllers/api/v1/accounts/portals_controller.rb @@ -30,7 +30,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController ActiveRecord::Base.transaction do @portal.update!(portal_params) if params[:portal].present? # @portal.custom_domain = parsed_custom_domain - process_attached_logo + process_attached_logo if params[:blob_id].present? rescue StandardError => e Rails.logger.error e render json: { error: @portal.errors.messages }.to_json, status: :unprocessable_entity diff --git a/app/javascript/portal/application.scss b/app/javascript/portal/application.scss index 0c4703e0e..b657e2249 100644 --- a/app/javascript/portal/application.scss +++ b/app/javascript/portal/application.scss @@ -11,7 +11,7 @@ html, body { - font-family: $font-family; + font-family: ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji; -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; height: 100%; diff --git a/app/javascript/portal/components/PublicArticleSearch.vue b/app/javascript/portal/components/PublicArticleSearch.vue index 4ced0665b..6827c4762 100644 --- a/app/javascript/portal/components/PublicArticleSearch.vue +++ b/app/javascript/portal/components/PublicArticleSearch.vue @@ -1,8 +1,5 @@