From 3485bb6f3786d23cfd5285b8b0e4d936ded797d8 Mon Sep 17 00:00:00 2001 From: paulinebessoles Date: Thu, 17 Nov 2022 17:17:36 +0100 Subject: [PATCH 1/3] Update fontface file --- app/packs/stylesheets/decidim/_fontface.scss | 38 ++++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app/packs/stylesheets/decidim/_fontface.scss b/app/packs/stylesheets/decidim/_fontface.scss index 6e57c8d..e7dfac0 100644 --- a/app/packs/stylesheets/decidim/_fontface.scss +++ b/app/packs/stylesheets/decidim/_fontface.scss @@ -1,12 +1,12 @@ @font-face { font-family: 'Montserrat'; - src: asset-data-url('fonts/Montserrat/Montserrat-Regular.eot'); + src: ('fonts/Montserrat/Montserrat-Regular.eot'); src: local('Montserrat Regular'), local('Montserrat-Regular'), - font-url('fonts/Montserrat/Montserrat-Regular.eot?#iefix') format('embedded-opentype'), - font-url('fonts/Montserrat/Montserrat-Regular.woff2') format('woff2'), - font-url('fonts/Montserrat/Montserrat-Regular.woff') format('woff'), - font-url('fonts/Montserrat/Montserrat-Regular.ttf') format('truetype'), - font-url('fonts/Montserrat/Montserrat-Regular.svg#Montserrat-Regular') format('svg'); + url('fonts/Montserrat/Montserrat-Regular.eot?#iefix') format('embedded-opentype'), + url('fonts/Montserrat/Montserrat-Regular.woff2') format('woff2'), + url('fonts/Montserrat/Montserrat-Regular.woff') format('woff'), + url('fonts/Montserrat/Montserrat-Regular.ttf') format('truetype'), + url('fonts/Montserrat/Montserrat-Regular.svg#Montserrat-Regular') format('svg'); font-weight: normal; font-style: normal; font-display: swap; @@ -14,13 +14,13 @@ @font-face { font-family: 'OktaNeue Bold'; - src: asset-data-url('fonts/OktaNeue/OktaNeue-Bold.eot'); + src: url('fonts/OktaNeue/OktaNeue-Bold.eot'); src: local('Okta Neue Bold'), local('OktaNeue-Bold'), - font-url('fonts/OktaNeue/OktaNeue-Bold.eot?#iefix') format('embedded-opentype'), - font-url('fonts/OktaNeue/OktaNeue-Bold.woff2') format('woff2'), - font-url('fonts/OktaNeue/OktaNeue-Bold.woff') format('woff'), - font-url('fonts/OktaNeue/OktaNeue-Bold.ttf') format('truetype'), - font-url('fonts/OktaNeue/OktaNeue-Bold.svg#OktaNeue-Bold') format('svg'); + url('fonts/OktaNeue/OktaNeue-Bold.eot?#iefix') format('embedded-opentype'), + url('fonts/OktaNeue/OktaNeue-Bold.woff2') format('woff2'), + url('fonts/OktaNeue/OktaNeue-Bold.woff') format('woff'), + url('fonts/OktaNeue/OktaNeue-Bold.ttf') format('truetype'), + url('fonts/OktaNeue/OktaNeue-Bold.svg#OktaNeue-Bold') format('svg'); font-weight: bold; font-style: normal; font-display: swap; @@ -28,14 +28,14 @@ @font-face { font-family: 'OktaNeue Black'; - src: asset-data-url('fonts/OktaNeue/OktaNeue-Black.eot'); + src: url('fonts/OktaNeue/OktaNeue-Black.eot'); src: local('Okta Neue Black'), local('OktaNeue-Black'), - font-url('fonts/OktaNeue/OktaNeue-Black.eot?#iefix') format('embedded-opentype'), - font-url('fonts/OktaNeue/OktaNeue-Black.woff2') format('woff2'), - font-url('fonts/OktaNeue/OktaNeue-Black.woff') format('woff'), - font-url('fonts/OktaNeue/OktaNeue-Black.ttf') format('truetype'), - font-url('fonts/OktaNeue/OktaNeue-Black.svg#OktaNeue-Black') format('svg'); + url('fonts/OktaNeue/OktaNeue-Black.eot?#iefix') format('embedded-opentype'), + url('fonts/OktaNeue/OktaNeue-Black.woff2') format('woff2'), + url('fonts/OktaNeue/OktaNeue-Black.woff') format('woff'), + url('fonts/OktaNeue/OktaNeue-Black.ttf') format('truetype'), + url('fonts/OktaNeue/OktaNeue-Black.svg#OktaNeue-Black') format('svg'); font-weight: 900; font-style: normal; font-display: swap; -} \ No newline at end of file +} From 1e1f1115f48c5bd8c5915dfb7ec66ab5f315d925 Mon Sep 17 00:00:00 2001 From: paulinebessoles Date: Thu, 24 Nov 2022 17:31:59 +0100 Subject: [PATCH 2/3] Fix test --- .../test/w3c_rspec_validators_overrides.rb | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 lib/decidim/dev/test/w3c_rspec_validators_overrides.rb diff --git a/lib/decidim/dev/test/w3c_rspec_validators_overrides.rb b/lib/decidim/dev/test/w3c_rspec_validators_overrides.rb new file mode 100644 index 0000000..4198779 --- /dev/null +++ b/lib/decidim/dev/test/w3c_rspec_validators_overrides.rb @@ -0,0 +1,48 @@ +# frozen_string_literal: true + +# This is a temporary fix to ignore some HTML/CSS validation issues with the +# Decidim HTML validation process. +# +# See: https://github.com/decidim/decidim/pull/10014 +# Related: +# - https://github.com/rails/rails/issues/46405 +# - https://github.com/foundation/foundation-sites/pull/12496 +module W3CValidators + class NuValidator + protected + + alias validate_nu validate unless method_defined?(:validate_nu) + + def validate(options) # :nodoc: + filter_results(validate_nu(options)) + end + + def ignore_errors + @ignore_errors ||= [ + "An “input” element with a “type” attribute whose value is “hidden” must not have an “autocomplete” attribute whose value is “on” or “off”.", + "An “input” element with a “type” attribute whose value is “hidden” must not have any “aria-*” attributes." + ] + end + + def filter_results(results) + messages = results.instance_variable_get(:@messages) + messages.delete_if do |msg| + msg.is_error? && ignore_errors.include?(msg.message) + end + results.instance_variable_set(:@validity, messages.none?(&:is_error?)) + + results + end + end +end + +# This allows us to dynamically load the validator URL from the ENV. +module W3cRspecValidators + class Config + def self.get + @config ||= { + w3c_service_uri: ENV.fetch("VALIDATOR_HTML_URI", "https://validator.w3.org/nu/") + }.stringify_keys + end + end +end From a327abe1e1f9b2837057c8e47a8d59743cc6f9e7 Mon Sep 17 00:00:00 2001 From: paulinebessoles Date: Thu, 24 Nov 2022 17:58:34 +0100 Subject: [PATCH 3/3] Fix lint --- lib/decidim/dev/test/w3c_rspec_validators_overrides.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/decidim/dev/test/w3c_rspec_validators_overrides.rb b/lib/decidim/dev/test/w3c_rspec_validators_overrides.rb index 4198779..98e6b7b 100644 --- a/lib/decidim/dev/test/w3c_rspec_validators_overrides.rb +++ b/lib/decidim/dev/test/w3c_rspec_validators_overrides.rb @@ -40,7 +40,7 @@ def filter_results(results) module W3cRspecValidators class Config def self.get - @config ||= { + @get ||= { w3c_service_uri: ENV.fetch("VALIDATOR_HTML_URI", "https://validator.w3.org/nu/") }.stringify_keys end