diff --git a/book-example/src/format/config.md b/book-example/src/format/config.md index d8be13e886..c1a97aa7b8 100644 --- a/book-example/src/format/config.md +++ b/book-example/src/format/config.md @@ -177,6 +177,7 @@ The following configuration options are available: that occur in code blocks and code spans. Defaults to `false`. - **mathjax-support:** Adds support for [MathJax](mathjax.md). Defaults to `false`. +- **copy-fonts:** Copies fonts.css and respective font files to the output directory and use them in the default theme. Defaults to `true`. - **google-analytics:** If you use Google Analytics, this option lets you enable it by simply specifying your ID in the configuration file. - **additional-css:** If you need to slightly change the appearance of your book @@ -252,6 +253,7 @@ default-theme = "light" preferred-dark-theme = "navy" curly-quotes = true mathjax-support = false +copy-fonts = true google-analytics = "123456" additional-css = ["custom.css", "custom2.css"] additional-js = ["custom.js"] diff --git a/src/config.rs b/src/config.rs index 2c69625bf8..eae360cf80 100644 --- a/src/config.rs +++ b/src/config.rs @@ -475,7 +475,7 @@ pub enum RustEdition { } /// Configuration for the HTML renderer. -#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)] +#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[serde(default, rename_all = "kebab-case")] pub struct HtmlConfig { /// The theme directory, if specified. @@ -489,6 +489,8 @@ pub struct HtmlConfig { pub curly_quotes: bool, /// Should mathjax be enabled? pub mathjax_support: bool, + /// Whether to fonts.css and respective font files to the output directory. + pub copy_fonts: bool, /// An optional google analytics code. pub google_analytics: Option, /// Additional CSS stylesheets to include in the rendered page's ``. @@ -519,6 +521,29 @@ pub struct HtmlConfig { pub livereload_url: Option, } +impl Default for HtmlConfig { + fn default() -> HtmlConfig { + HtmlConfig { + theme: None, + default_theme: None, + preferred_dark_theme: None, + curly_quotes: false, + mathjax_support: false, + copy_fonts: true, + google_analytics: None, + additional_css: Vec::new(), + additional_js: Vec::new(), + fold: Fold::default(), + playpen: Playpen::default(), + no_section_label: false, + search: None, + git_repository_url: None, + git_repository_icon: None, + livereload_url: None, + } + } +} + impl HtmlConfig { /// Returns the directory of theme from the provided root directory. If the /// directory is not present it will append the default directory of "theme" diff --git a/src/renderer/html_handlebars/hbs_renderer.rs b/src/renderer/html_handlebars/hbs_renderer.rs index 80226374c8..8953d3b6f3 100644 --- a/src/renderer/html_handlebars/hbs_renderer.rs +++ b/src/renderer/html_handlebars/hbs_renderer.rs @@ -179,6 +179,20 @@ impl HtmlHandlebars { "FontAwesome/fonts/FontAwesome.ttf", theme::FONT_AWESOME_TTF, )?; + if html_config.copy_fonts { + write_file(destination, "fonts/fonts.css", theme::fonts::CSS)?; + for (file_name, contents) in theme::fonts::LICENSES.iter() { + write_file(destination, file_name, contents)?; + } + for (file_name, contents) in theme::fonts::OPEN_SANS.iter() { + write_file(destination, file_name, contents)?; + } + write_file( + destination, + theme::fonts::SOURCE_CODE_PRO.0, + theme::fonts::SOURCE_CODE_PRO.1, + )?; + } let playpen_config = &html_config.playpen; @@ -444,6 +458,10 @@ fn make_data( data.insert("mathjax_support".to_owned(), json!(true)); } + if html_config.copy_fonts { + data.insert("copy_fonts".to_owned(), json!(true)); + } + // Add check to see if there is an additional style if !html_config.additional_css.is_empty() { let mut css = Vec::new(); diff --git a/src/theme/fonts/OPEN-SANS-LICENSE.txt b/src/theme/fonts/OPEN-SANS-LICENSE.txt new file mode 100755 index 0000000000..d645695673 --- /dev/null +++ b/src/theme/fonts/OPEN-SANS-LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/theme/fonts/SOURCE-CODE-PRO-LICENSE.txt b/src/theme/fonts/SOURCE-CODE-PRO-LICENSE.txt new file mode 100644 index 0000000000..366206f549 --- /dev/null +++ b/src/theme/fonts/SOURCE-CODE-PRO-LICENSE.txt @@ -0,0 +1,93 @@ +Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. + +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/src/theme/fonts/fonts.css b/src/theme/fonts/fonts.css new file mode 100644 index 0000000000..b2b63d0273 --- /dev/null +++ b/src/theme/fonts/fonts.css @@ -0,0 +1,101 @@ +/* Open Sans is licensed under the Apache License, Version 2.0. See http://www.apache.org/licenses/LICENSE-2.0 */ +/* Source Code Pro is under the Open Font License. See https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL */ + +/* open-sans-300 - latin_vietnamese_latin-ext_greek-ext_greek_cyrillic-ext_cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), + url('open-sans-v17-all-charsets-300.woff2') format('woff2'); +} + +/* open-sans-300italic - latin_vietnamese_latin-ext_greek-ext_greek_cyrillic-ext_cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 300; + src: local('Open Sans Light Italic'), local('OpenSans-LightItalic'), + url('open-sans-v17-all-charsets-300italic.woff2') format('woff2'); +} + +/* open-sans-regular - latin_vietnamese_latin-ext_greek-ext_greek_cyrillic-ext_cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Regular'), local('OpenSans-Regular'), + url('open-sans-v17-all-charsets-regular.woff2') format('woff2'); +} + +/* open-sans-italic - latin_vietnamese_latin-ext_greek-ext_greek_cyrillic-ext_cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: local('Open Sans Italic'), local('OpenSans-Italic'), + url('open-sans-v17-all-charsets-italic.woff2') format('woff2'); +} + +/* open-sans-600 - latin_vietnamese_latin-ext_greek-ext_greek_cyrillic-ext_cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), + url('open-sans-v17-all-charsets-600.woff2') format('woff2'); +} + +/* open-sans-600italic - latin_vietnamese_latin-ext_greek-ext_greek_cyrillic-ext_cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 600; + src: local('Open Sans SemiBold Italic'), local('OpenSans-SemiBoldItalic'), + url('open-sans-v17-all-charsets-600italic.woff2') format('woff2'); +} + +/* open-sans-700 - latin_vietnamese_latin-ext_greek-ext_greek_cyrillic-ext_cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), + url('open-sans-v17-all-charsets-700.woff2') format('woff2'); +} + +/* open-sans-700italic - latin_vietnamese_latin-ext_greek-ext_greek_cyrillic-ext_cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700; + src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), + url('open-sans-v17-all-charsets-700italic.woff2') format('woff2'); +} + +/* open-sans-800 - latin_vietnamese_latin-ext_greek-ext_greek_cyrillic-ext_cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 800; + src: local('Open Sans ExtraBold'), local('OpenSans-ExtraBold'), + url('open-sans-v17-all-charsets-800.woff2') format('woff2'); +} + +/* open-sans-800italic - latin_vietnamese_latin-ext_greek-ext_greek_cyrillic-ext_cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 800; + src: local('Open Sans ExtraBold Italic'), local('OpenSans-ExtraBoldItalic'), + url('open-sans-v17-all-charsets-800italic.woff2') format('woff2'); +} + +/* source-code-pro-500 - latin_vietnamese_latin-ext_greek_cyrillic-ext_cyrillic */ +@font-face { + font-family: 'Source Code Pro'; + font-style: normal; + font-weight: 500; + src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), + url('source-code-pro-v11-all-charsets-500.woff2') format('woff2'); +} diff --git a/src/theme/fonts/mod.rs b/src/theme/fonts/mod.rs new file mode 100644 index 0000000000..5d2e29cb58 --- /dev/null +++ b/src/theme/fonts/mod.rs @@ -0,0 +1,61 @@ +pub static CSS: &[u8] = include_bytes!("fonts.css"); +// An array of (file_name, file_contents) pairs +pub static LICENSES: [(&str, &[u8]); 2] = [ + ( + "fonts/OPEN-SANS-LICENSE.txt", + include_bytes!("OPEN-SANS-LICENSE.txt"), + ), + ( + "fonts/SOURCE-CODE-PRO-LICENSE.txt", + include_bytes!("SOURCE-CODE-PRO-LICENSE.txt"), + ), +]; +// An array of (file_name, file_contents) pairs +pub static OPEN_SANS: [(&str, &[u8]); 10] = [ + ( + "fonts/open-sans-v17-all-charsets-300.woff2", + include_bytes!("open-sans-v17-all-charsets-300.woff2"), + ), + ( + "fonts/open-sans-v17-all-charsets-300italic.woff2", + include_bytes!("open-sans-v17-all-charsets-300italic.woff2"), + ), + ( + "fonts/open-sans-v17-all-charsets-regular.woff2", + include_bytes!("open-sans-v17-all-charsets-regular.woff2"), + ), + ( + "fonts/open-sans-v17-all-charsets-italic.woff2", + include_bytes!("open-sans-v17-all-charsets-italic.woff2"), + ), + ( + "fonts/open-sans-v17-all-charsets-600.woff2", + include_bytes!("open-sans-v17-all-charsets-600.woff2"), + ), + ( + "fonts/open-sans-v17-all-charsets-600italic.woff2", + include_bytes!("open-sans-v17-all-charsets-600italic.woff2"), + ), + ( + "fonts/open-sans-v17-all-charsets-700.woff2", + include_bytes!("open-sans-v17-all-charsets-700.woff2"), + ), + ( + "fonts/open-sans-v17-all-charsets-700italic.woff2", + include_bytes!("open-sans-v17-all-charsets-700italic.woff2"), + ), + ( + "fonts/open-sans-v17-all-charsets-800.woff2", + include_bytes!("open-sans-v17-all-charsets-800.woff2"), + ), + ( + "fonts/open-sans-v17-all-charsets-800italic.woff2", + include_bytes!("open-sans-v17-all-charsets-800italic.woff2"), + ), +]; + +// A (file_name, file_contents) pair +pub static SOURCE_CODE_PRO: (&str, &[u8]) = ( + "fonts/source-code-pro-v11-all-charsets-500.woff2", + include_bytes!("source-code-pro-v11-all-charsets-500.woff2"), +); diff --git a/src/theme/fonts/open-sans-v17-all-charsets-300.woff2 b/src/theme/fonts/open-sans-v17-all-charsets-300.woff2 new file mode 100644 index 0000000000..9f51be370f Binary files /dev/null and b/src/theme/fonts/open-sans-v17-all-charsets-300.woff2 differ diff --git a/src/theme/fonts/open-sans-v17-all-charsets-300italic.woff2 b/src/theme/fonts/open-sans-v17-all-charsets-300italic.woff2 new file mode 100644 index 0000000000..2f54544841 Binary files /dev/null and b/src/theme/fonts/open-sans-v17-all-charsets-300italic.woff2 differ diff --git a/src/theme/fonts/open-sans-v17-all-charsets-600.woff2 b/src/theme/fonts/open-sans-v17-all-charsets-600.woff2 new file mode 100644 index 0000000000..f503d558d5 Binary files /dev/null and b/src/theme/fonts/open-sans-v17-all-charsets-600.woff2 differ diff --git a/src/theme/fonts/open-sans-v17-all-charsets-600italic.woff2 b/src/theme/fonts/open-sans-v17-all-charsets-600italic.woff2 new file mode 100644 index 0000000000..c99aabe803 Binary files /dev/null and b/src/theme/fonts/open-sans-v17-all-charsets-600italic.woff2 differ diff --git a/src/theme/fonts/open-sans-v17-all-charsets-700.woff2 b/src/theme/fonts/open-sans-v17-all-charsets-700.woff2 new file mode 100644 index 0000000000..421a1ab25f Binary files /dev/null and b/src/theme/fonts/open-sans-v17-all-charsets-700.woff2 differ diff --git a/src/theme/fonts/open-sans-v17-all-charsets-700italic.woff2 b/src/theme/fonts/open-sans-v17-all-charsets-700italic.woff2 new file mode 100644 index 0000000000..12ce3d20d1 Binary files /dev/null and b/src/theme/fonts/open-sans-v17-all-charsets-700italic.woff2 differ diff --git a/src/theme/fonts/open-sans-v17-all-charsets-800.woff2 b/src/theme/fonts/open-sans-v17-all-charsets-800.woff2 new file mode 100644 index 0000000000..c94a223b03 Binary files /dev/null and b/src/theme/fonts/open-sans-v17-all-charsets-800.woff2 differ diff --git a/src/theme/fonts/open-sans-v17-all-charsets-800italic.woff2 b/src/theme/fonts/open-sans-v17-all-charsets-800italic.woff2 new file mode 100644 index 0000000000..eed7d3c63d Binary files /dev/null and b/src/theme/fonts/open-sans-v17-all-charsets-800italic.woff2 differ diff --git a/src/theme/fonts/open-sans-v17-all-charsets-italic.woff2 b/src/theme/fonts/open-sans-v17-all-charsets-italic.woff2 new file mode 100644 index 0000000000..398b68a085 Binary files /dev/null and b/src/theme/fonts/open-sans-v17-all-charsets-italic.woff2 differ diff --git a/src/theme/fonts/open-sans-v17-all-charsets-regular.woff2 b/src/theme/fonts/open-sans-v17-all-charsets-regular.woff2 new file mode 100644 index 0000000000..8383e94c65 Binary files /dev/null and b/src/theme/fonts/open-sans-v17-all-charsets-regular.woff2 differ diff --git a/src/theme/fonts/source-code-pro-v11-all-charsets-500.woff2 b/src/theme/fonts/source-code-pro-v11-all-charsets-500.woff2 new file mode 100644 index 0000000000..722245682f Binary files /dev/null and b/src/theme/fonts/source-code-pro-v11-all-charsets-500.woff2 differ diff --git a/src/theme/index.hbs b/src/theme/index.hbs index e27f6aa354..e8a92dd098 100644 --- a/src/theme/index.hbs +++ b/src/theme/index.hbs @@ -24,8 +24,9 @@ - - + {{#if copy_fonts}} + + {{/if}} diff --git a/src/theme/mod.rs b/src/theme/mod.rs index 1172922ff8..b8c496c347 100644 --- a/src/theme/mod.rs +++ b/src/theme/mod.rs @@ -2,6 +2,8 @@ pub mod playpen_editor; +pub mod fonts; + #[cfg(feature = "search")] pub mod searcher; @@ -176,6 +178,7 @@ mod tests { "header.hbs", "favicon.png", "css/chrome.css", + "css/fonts.css", "css/general.css", "css/print.css", "css/variables.css",