diff --git a/src-docs/src/fonts/iAWriterMono/LICENSE.md b/src-docs/src/fonts/iAWriterMono/LICENSE.md new file mode 100755 index 000000000000..5cd41aa49bc0 --- /dev/null +++ b/src-docs/src/fonts/iAWriterMono/LICENSE.md @@ -0,0 +1,100 @@ +# iA Writer Typeface + +Copyright © 2018 Information Architects Inc. with Reserved Font Name "iA Writer" + +# Based on IBM Plex Typeface + +Copyright © 2017 IBM Corp. with Reserved Font Name "Plex" + +# License + +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. \ No newline at end of file diff --git a/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Bold.woff b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Bold.woff new file mode 100755 index 000000000000..19e27622f5e3 Binary files /dev/null and b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Bold.woff differ diff --git a/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Bold.woff2 b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Bold.woff2 new file mode 100755 index 000000000000..1271a12acebf Binary files /dev/null and b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Bold.woff2 differ diff --git a/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-BoldItalic.woff b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-BoldItalic.woff new file mode 100755 index 000000000000..3c62593b62ce Binary files /dev/null and b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-BoldItalic.woff differ diff --git a/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-BoldItalic.woff2 b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-BoldItalic.woff2 new file mode 100755 index 000000000000..34ff8013d1c2 Binary files /dev/null and b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-BoldItalic.woff2 differ diff --git a/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Italic.woff b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Italic.woff new file mode 100755 index 000000000000..a93ecb0e0e3a Binary files /dev/null and b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Italic.woff differ diff --git a/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Italic.woff2 b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Italic.woff2 new file mode 100755 index 000000000000..c76d4ce4d664 Binary files /dev/null and b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Italic.woff2 differ diff --git a/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Regular.woff b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Regular.woff new file mode 100755 index 000000000000..c7354a8842d8 Binary files /dev/null and b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Regular.woff differ diff --git a/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Regular.woff2 b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Regular.woff2 new file mode 100755 index 000000000000..5c360515bb80 Binary files /dev/null and b/src-docs/src/fonts/iAWriterMono/iAWriterMonoS-Regular.woff2 differ diff --git a/src-docs/src/fonts/iAWriterMono/iAWriterMonoV-Italic.woff2 b/src-docs/src/fonts/iAWriterMono/iAWriterMonoV-Italic.woff2 new file mode 100644 index 000000000000..32a231d79d4f Binary files /dev/null and b/src-docs/src/fonts/iAWriterMono/iAWriterMonoV-Italic.woff2 differ diff --git a/src-docs/src/fonts/iAWriterMono/iAWriterMonoV.woff2 b/src-docs/src/fonts/iAWriterMono/iAWriterMonoV.woff2 new file mode 100644 index 000000000000..a5fc61fe1cde Binary files /dev/null and b/src-docs/src/fonts/iAWriterMono/iAWriterMonoV.woff2 differ diff --git a/src-docs/src/fonts/iAWriterMono/iaWriterMono.css b/src-docs/src/fonts/iAWriterMono/iaWriterMono.css new file mode 100644 index 000000000000..0eb0b1c1bdcd --- /dev/null +++ b/src-docs/src/fonts/iAWriterMono/iaWriterMono.css @@ -0,0 +1,51 @@ +@font-face { + font-family: 'iA Writer Mono'; + font-style: normal; + font-weight: 400; + src: url("iAWriterMonoS-Regular.woff2") format("woff2"), + url("iAWriterMonoS-Regular.woff") format("woff"); +} +@font-face { + font-family: 'iA Writer Mono'; + font-style: italic; + font-weight: 400; + src: url("iAWriterMonoS-Italic.woff2") format("woff2"), + url("iAWriterMonoS-Italic.woff") format("woff"); +} + +@font-face { + font-family: 'iA Writer Mono'; + font-style: normal; + font-weight: 700; + src: url("iAWriterMonoS-Bold.woff2") format("woff2"), + url("iAWriterMonoS-Bold.woff") format("woff"); +} +@font-face { + font-family: 'iA Writer Mono'; + font-style: italic; + font-weight: 700; + src: url("iAWriterMonoS-BoldItalic.woff2") format("woff2"), + url("iAWriterMonoS-BoldItalic.woff") format("woff"); +} + +/* -------------------------------------------------------------------------- + +@supports (font-variation-settings: normal) { + html { + font-family: 'iA Writer Mono V', sans-serif; + } +} + +*/ +@font-face { + font-family: 'iA Writer Mono V'; + font-weight: 400 700; + font-style: normal; + src: url("iAWriterMonoV.woff2") format("woff2"); +} +@font-face { + font-family: 'iA Writer Mono V'; + font-weight: 400 700; + font-style: italic; + src: url("iAWriterMonoV-Italic.woff2") format("woff2"); +} diff --git a/src-docs/src/theme_dark.scss b/src-docs/src/theme_dark.scss index f09a1aede5c8..c0d2048151fa 100644 --- a/src-docs/src/theme_dark.scss +++ b/src-docs/src/theme_dark.scss @@ -1,3 +1,7 @@ +// sass-lint:disable no-url-domains, no-url-protocols +@import url('https://rsms.me/inter/inter-ui.css'); +@import url('./fonts/iAWriterMono/iaWriterMono.css'); + @import '../../src/theme_dark'; @import './components/guide_components'; @import './views/header/global_filter_group'; diff --git a/src-docs/src/theme_light.scss b/src-docs/src/theme_light.scss index 782fc422f638..8a21c9a55388 100644 --- a/src-docs/src/theme_light.scss +++ b/src-docs/src/theme_light.scss @@ -1,3 +1,7 @@ +// sass-lint:disable no-url-domains, no-url-protocols +@import url('https://rsms.me/inter/inter-ui.css'); +@import url('./fonts/iAWriterMono/iaWriterMono.css'); + @import '../../src/theme_light'; @import './components/guide_components'; @import './views/header/global_filter_group'; diff --git a/src/global_styling/mixins/_typography.scss b/src/global_styling/mixins/_typography.scss index fce5efd5de1e..c0c9a1693aa6 100644 --- a/src/global_styling/mixins/_typography.scss +++ b/src/global_styling/mixins/_typography.scss @@ -19,6 +19,10 @@ @mixin euiCodeFont { font-family: $euiCodeFontFamily; letter-spacing: normal; + + @supports (font-variation-settings: normal) { + font-family: $euiCodeFontFamilyVariable; + } } @mixin euiText { diff --git a/src/global_styling/variables/_typography.scss b/src/global_styling/variables/_typography.scss index 29c2fe26fd3f..c4cf656d26b2 100644 --- a/src/global_styling/variables/_typography.scss +++ b/src/global_styling/variables/_typography.scss @@ -1,7 +1,3 @@ -// sass-lint:disable no-url-domains, no-url-protocols - -@import url('https://rsms.me/inter/inter-ui.css'); - // Some mixins that help us deal with browser scaling of text more consistantly. // Essentially, fonts across eui should scale agains the root html element, not // against parent inheritance. @@ -32,10 +28,12 @@ $euiFontFamily: 'Inter UI', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol' !default; $euiFontFamilyVariable: 'Inter UI var', $euiFontFamily !default; -$euiCodeFontFamily: Consolas, 'Liberation Mono', Menlo, Courier, monospace !default; - $euiFontFeatureSettings: 'calt' 1, 'kern' 1, 'liga' 1 !default; +$euiCodeFontFamily: 'iA Writer Mono', Consolas, Menlo, courier new , monospace !default; +$euiCodeFontFamilyVariable: 'iA Writer Mono V', $euiCodeFontFamily !default; + + // Font sizes -- scale is loosely based on Major Third (1.250) $euiTextScale: 2.25, 1.75, 1.25, 1.125, 1, .875, .75 !default;