Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix custom fonts #9

Merged
merged 3 commits into from
Nov 25, 2022
Merged

Fix custom fonts #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3485bb6
Update fontface file
Nov 17, 2022
1e1f111
Fix test
Nov 24, 2022
a327abe
Fix lint
Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions app/packs/stylesheets/decidim/_fontface.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
@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;
}

@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;
}

@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;
}
}
48 changes: 48 additions & 0 deletions lib/decidim/dev/test/w3c_rspec_validators_overrides.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
@get ||= {
w3c_service_uri: ENV.fetch("VALIDATOR_HTML_URI", "https://validator.w3.org/nu/")
}.stringify_keys
end
end
end