diff --git a/.stylelintrc.json b/.stylelintrc.json index 1223ef3ad..1a610d5eb 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -9,7 +9,7 @@ "declaration-block-no-redundant-longhand-properties": null, "declaration-colon-newline-after": null, "declaration-empty-line-before": "never", - "font-family-no-missing-generic-family-keyword": [true, { "ignoreFontFamilies": ["ForkAwesome", "Font Awesome 5 Free", "OpenDyslexic", "soapbox"] }], + "font-family-no-missing-generic-family-keyword": [true, { "ignoreFontFamilies": ["ForkAwesome", "Font Awesome 5 Free"] }], "max-line-length": null, "no-descending-specificity": null, "no-duplicate-selectors": null, diff --git a/app/assets/fonts/OpenDyslexic/LICENSE b/app/assets/fonts/OpenDyslexic/LICENSE deleted file mode 100644 index bb867823f..000000000 --- a/app/assets/fonts/OpenDyslexic/LICENSE +++ /dev/null @@ -1,94 +0,0 @@ -Copyright (c) 2019-07-29, Abbie Gonzalez (https://abbiecod.es|support@abbiecod.es), -with Reserved Font Name OpenDyslexic. -Copyright (c) 12/2012 - 2019 -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/app/assets/fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2 b/app/assets/fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2 deleted file mode 100644 index aa7bcdea9..000000000 Binary files a/app/assets/fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2 and /dev/null differ diff --git a/app/assets/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2 b/app/assets/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2 deleted file mode 100644 index 2f04ad119..000000000 Binary files a/app/assets/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2 and /dev/null differ diff --git a/app/assets/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2 b/app/assets/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2 deleted file mode 100644 index 00c19082d..000000000 Binary files a/app/assets/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2 and /dev/null differ diff --git a/app/assets/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2 b/app/assets/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2 deleted file mode 100644 index 47e26d82a..000000000 Binary files a/app/assets/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2 and /dev/null differ diff --git a/app/soapbox/actions/settings.ts b/app/soapbox/actions/settings.ts index a52ba2255..d6bb970cd 100644 --- a/app/soapbox/actions/settings.ts +++ b/app/soapbox/actions/settings.ts @@ -47,7 +47,6 @@ const defaultSettings = ImmutableMap({ autoloadMore: true, systemFont: false, - dyslexicFont: false, demetricator: false, isDeveloper: false, diff --git a/app/soapbox/containers/soapbox.tsx b/app/soapbox/containers/soapbox.tsx index 8ce48f7e2..b9603b3b1 100644 --- a/app/soapbox/containers/soapbox.tsx +++ b/app/soapbox/containers/soapbox.tsx @@ -271,7 +271,6 @@ const SoapboxHead: React.FC = ({ children }) => { const bodyClass = classNames('bg-white dark:bg-gray-800 text-base h-full', { 'no-reduce-motion': !settings.get('reduceMotion'), 'underline-links': settings.get('underlineLinks'), - 'dyslexic': settings.get('dyslexicFont'), 'demetricator': settings.get('demetricator'), }); diff --git a/app/soapbox/features/developers/settings-store.tsx b/app/soapbox/features/developers/settings-store.tsx index 34caab1b0..a86a6b94c 100644 --- a/app/soapbox/features/developers/settings-store.tsx +++ b/app/soapbox/features/developers/settings-store.tsx @@ -134,12 +134,6 @@ const SettingsStore: React.FC = () => { -
- }> - - -
- } hint={} diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index 03dc9a814..a4fa4291a 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -961,7 +961,6 @@ "preferences.fields.display_media.default": "Hide posts marked as sensitive", "preferences.fields.display_media.hide_all": "Always hide posts", "preferences.fields.display_media.show_all": "Always show posts", - "preferences.fields.dyslexic_font_label": "Dyslexic mode", "preferences.fields.expand_spoilers_label": "Always expand posts marked with content warnings", "preferences.fields.language_label": "Display Language", "preferences.fields.media_display_label": "Sensitive content", diff --git a/app/styles/application.scss b/app/styles/application.scss index 53a7a8c39..828c678d1 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -20,7 +20,6 @@ @import 'emoji-picker'; @import 'rtl'; @import 'accessibility'; -@import 'dyslexic'; @import 'navigation'; @import 'placeholder'; @import 'autosuggest'; diff --git a/app/styles/dyslexic.scss b/app/styles/dyslexic.scss deleted file mode 100644 index e36600baa..000000000 --- a/app/styles/dyslexic.scss +++ /dev/null @@ -1,4 +0,0 @@ -.dyslexic { - font-family: 'OpenDyslexic' !important; - margin-bottom: 8px; -} diff --git a/app/styles/fonts.scss b/app/styles/fonts.scss index bbd6b751a..7ee787c1f 100644 --- a/app/styles/fonts.scss +++ b/app/styles/fonts.scss @@ -1,34 +1,9 @@ @use 'sass:math'; -// OpenDyslexic -@font-face { - font-family: 'OpenDyslexic'; - src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2') format('woff2'); -} - -@font-face { - font-family: 'OpenDyslexic'; - font-weight: bold; - src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2') format('woff2'); -} - -@font-face { - font-family: 'OpenDyslexic'; - font-weight: bold; - font-style: italic; - src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2') format('woff2'); -} - -@font-face { - font-family: 'OpenDyslexic'; - font-style: italic; - src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2') format('woff2'); -} - // TYPEOGRAPHY MIXINS // declare the font family using these shortcuts -@mixin font-inter { font-family: 'Inter', Arial, sans-serif !important; } +@mixin font-inter { font-family: Inter, Arial, sans-serif !important; } // Declare font weights as a numerical value in rendered output // Prevents certain browsers which do not play nice with "light, medium" textual declarations @@ -48,13 +23,13 @@ @mixin font-size($size) { $rem: math.div($size, 10); $px: $size; - font-size: #{$px + "px"}; - font-size: #{$rem + "rem"}; + font-size: #{$px + 'px'}; + font-size: #{$rem + 'rem'}; } @mixin line-height($size) { $rem: math.div($size, 10); $px: $size; - line-height: #{$px + "px"}; - line-height: #{$rem + "rem"}; + line-height: #{$px + 'px'}; + line-height: #{$rem + 'rem'}; }