diff --git a/phpmyfaq/assets/fonts/AtkinsonHyperlegibleNext-Italic-VariableFont_wght.ttf b/phpmyfaq/assets/fonts/AtkinsonHyperlegibleNext-Italic-VariableFont_wght.ttf new file mode 100644 index 0000000000..3d4593aab1 Binary files /dev/null and b/phpmyfaq/assets/fonts/AtkinsonHyperlegibleNext-Italic-VariableFont_wght.ttf differ diff --git a/phpmyfaq/assets/fonts/AtkinsonHyperlegibleNext-VariableFont_wght.ttf b/phpmyfaq/assets/fonts/AtkinsonHyperlegibleNext-VariableFont_wght.ttf new file mode 100644 index 0000000000..b35873abe7 Binary files /dev/null and b/phpmyfaq/assets/fonts/AtkinsonHyperlegibleNext-VariableFont_wght.ttf differ diff --git a/phpmyfaq/assets/fonts/OFL.txt b/phpmyfaq/assets/fonts/OFL.txt index 9d23fa3bfc..88955733b8 100644 --- a/phpmyfaq/assets/fonts/OFL.txt +++ b/phpmyfaq/assets/fonts/OFL.txt @@ -1,93 +1,93 @@ -Copyright 2020 Braille Institute of America, Inc. - -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: -https://openfontlicense.org - - ------------------------------------------------------------ -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. +Copyright 2020-2024 The Atkinson Hyperlegible Next Project Authors (https://github.com/googlefonts/atkinson-hyperlegible-next) + +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: +https://openfontlicense.org + + +----------------------------------------------------------- +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/phpmyfaq/assets/scss/layout/_theme-switcher.scss b/phpmyfaq/assets/scss/layout/_theme-switcher.scss index 6a9eb80062..524cae4dbd 100644 --- a/phpmyfaq/assets/scss/layout/_theme-switcher.scss +++ b/phpmyfaq/assets/scss/layout/_theme-switcher.scss @@ -256,6 +256,35 @@ color: #ffffff !important; } + //Theme Switcher Button for high contrast mode + .pmf-theme-switcher { + button { + color: var(--bs-light) !important; + border: none; + background: transparent; + transition: all 0.3s ease; + opacity: 1; + + &:hover { + color: var(--bs-dark) !important; + background: #ffffff !important; + opacity: 1; + } + + &.active { + color: var(--bs-dark) !important; + opacity: 1; + background: #ffff00 !important; + } + + i { + font-size: 1.3rem; + transition: transform 0.3s ease; + } + + } +} + // Navigation adjustments for high contrast mode .text-bg-pmf-nav { background-color: #000000 !important; @@ -332,9 +361,10 @@ // Form elements .form-control, .form-select { - background-color: #000000; - border: 2px solid #ffffff; - color: #ffffff; + background-color: #ffff00; + border: 2px solid #ffff00; + color: #000000; + font-size: 1.3rem; &:focus { background-color: #000000; @@ -347,13 +377,14 @@ .dropdown-menu { background-color: #000000; border: 2px solid #ffffff; - + font-size: 1.3rem; + .dropdown-item { color: #ffffff; &:hover, &:focus { - background-color: #ffffff; + background-color: #ffff00; color: #000000; } } @@ -490,7 +521,9 @@ color: #ffffff !important; &:hover { - background-color: #333333; + background-color: #ffff00; + color: #000!important; + border-radius: 5px; } } } diff --git a/phpmyfaq/assets/templates/default/index.twig b/phpmyfaq/assets/templates/default/index.twig index ed5430cb1e..b9ca8190e9 100644 --- a/phpmyfaq/assets/templates/default/index.twig +++ b/phpmyfaq/assets/templates/default/index.twig @@ -17,9 +17,11 @@ +{% if customCss is not empty %} +{% endif %} diff --git a/phpmyfaq/assets/templates/default/theme.css b/phpmyfaq/assets/templates/default/theme.css index 6d2881d2e6..ab055304bf 100644 --- a/phpmyfaq/assets/templates/default/theme.css +++ b/phpmyfaq/assets/templates/default/theme.css @@ -13,6 +13,23 @@ * @since 2024-09-01 */ +/* Font -Atkinson Hyperlegible Next- from Braille Institute for high-contrast mode to achieve better A11y */ +@font-face { + font-family: 'Atkinson Hyperlegible Next'; + src: url('../../fonts/AtkinsonHyperlegibleNext-VariableFont_wght.ttf') format('truetype-variations'); + font-weight: 200 800; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Atkinson Hyperlegible Next'; + src: url('../../fonts/AtkinsonHyperlegibleNext-Italic-VariableFont_wght.ttf') format('truetype-variations'); + font-weight: 200 800; + font-style: italic; + font-display: swap; +} + :root, [data-bs-theme='light'] { --bs-light: #eceff9; @@ -69,4 +86,14 @@ --bs-border-color: #ffffff; --bs-link-color: #ffff00; --bs-link-hover-color: #ffff66; + + /* Individual high-contrast adjustments */ + + body { + font-family: "Atkinson Hyperlegible Next" !important; + font-size: 1.3rem; + font-optical-sizing: auto; + font-weight: 800; + font-style: normal; + } }