diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss index 0847aa7c9b..cf2c066589 100644 --- a/res/css/views/elements/_RichText.scss +++ b/res/css/views/elements/_RichText.scss @@ -79,11 +79,15 @@ .mx_Markdown_ITALIC { font-style: italic; +/* + // interestingly, *not* using the explicit italic font + // variant seems yield better results. // compensate for Nunito italics being terrible // https://github.com/google/fonts/issues/1726 transform: skewX(-14deg); display: inline-block; +*/ } .mx_Markdown_CODE { diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index ee9971887e..c920d6e390 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -453,12 +453,17 @@ limitations under the License. display: inline ! important; } +/* +// actually, removing the Italic TTF provides +// better results seemingly + // compensate for Nunito italics being terrible // https://github.com/google/fonts/issues/1726 .mx_EventTile_content .markdown-body em { transform: skewX(-14deg); display: inline-block; } +*/ /* end of overrides */ diff --git a/res/fonts/Nunito/Nunito-Bold.ttf b/res/fonts/Nunito/Nunito-Bold.ttf new file mode 100644 index 0000000000..c70de76bbd Binary files /dev/null and b/res/fonts/Nunito/Nunito-Bold.ttf differ diff --git a/res/fonts/Nunito/Nunito-Regular.ttf b/res/fonts/Nunito/Nunito-Regular.ttf new file mode 100644 index 0000000000..064e805431 Binary files /dev/null and b/res/fonts/Nunito/Nunito-Regular.ttf differ diff --git a/res/fonts/Nunito/Nunito-SemiBold.ttf b/res/fonts/Nunito/Nunito-SemiBold.ttf new file mode 100644 index 0000000000..a84b3b35a6 Binary files /dev/null and b/res/fonts/Nunito/Nunito-SemiBold.ttf differ diff --git a/res/themes/dharma/css/_fonts.scss b/res/themes/dharma/css/_fonts.scss index 93fa9afbfa..ac15847e44 100644 --- a/res/themes/dharma/css/_fonts.scss +++ b/res/themes/dharma/css/_fonts.scss @@ -1,47 +1,36 @@ /* * Nunito. * Includes extended Latin and Vietnamese character sets - * Current URLs are v9, derived from the contents of + * Current URLs are taken from + * https://github.com/alexeiva/NunitoFont/releases/tag/v3.500 + * ...in order to include cyrillic. + * + * Previously, they were * https://fonts.googleapis.com/css?family=Nunito:400,400i,600,600i,700,700i&subset=latin-ext,vietnamese + * + * We explicitly do not include Nunito's italic variants, as they are not italic enough + * and it's better to rely on the browser's built-in obliquing behaviour. */ /* the 'src' links are relative to the bundle.css, which is in a subdirectory. */ -@font-face { - font-family: 'Nunito'; - font-style: italic; - font-weight: 400; - src: url('$(res)/fonts/Nunito/XRXX3I6Li01BKofIMNaDRss.ttf') format('truetype'); -} -@font-face { - font-family: 'Nunito'; - font-style: italic; - font-weight: 600; - src: url('$(res)/fonts/Nunito/XRXQ3I6Li01BKofIMN5cYtvKUTo.ttf') format('truetype'); -} -@font-face { - font-family: 'Nunito'; - font-style: italic; - font-weight: 700; - src: url('$(res)/fonts/Nunito/XRXQ3I6Li01BKofIMN44Y9vKUTo.ttf') format('truetype'); -} @font-face { font-family: 'Nunito'; font-style: normal; font-weight: 400; - src: url('$(res)/fonts/Nunito/XRXV3I6Li01BKofINeaE.ttf') format('truetype'); + src: url('$(res)/fonts/Nunito/Nunito-Regular.ttf') format('truetype'); } @font-face { font-family: 'Nunito'; font-style: normal; font-weight: 600; - src: url('$(res)/fonts/Nunito/XRXW3I6Li01BKofA6sKUYevN.ttf') format('truetype'); + src: url('$(res)/fonts/Nunito/Nunito-SemiBold.ttf') format('truetype'); } @font-face { font-family: 'Nunito'; font-style: normal; font-weight: 700; - src: url('$(res)/fonts/Nunito/XRXW3I6Li01BKofAjsOUYevN.ttf') format('truetype'); + src: url('$(res)/fonts/Nunito/Nunito-Bold.ttf') format('truetype'); } /*