Merge remote-tracking branch 'origin/develop' into develop
commit
d01031aaf2
|
@ -79,11 +79,15 @@
|
||||||
|
|
||||||
.mx_Markdown_ITALIC {
|
.mx_Markdown_ITALIC {
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
/*
|
||||||
|
// interestingly, *not* using the explicit italic font
|
||||||
|
// variant seems yield better results.
|
||||||
|
|
||||||
// compensate for Nunito italics being terrible
|
// compensate for Nunito italics being terrible
|
||||||
// https://github.com/google/fonts/issues/1726
|
// https://github.com/google/fonts/issues/1726
|
||||||
transform: skewX(-14deg);
|
transform: skewX(-14deg);
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_Markdown_CODE {
|
.mx_Markdown_CODE {
|
||||||
|
|
|
@ -453,12 +453,17 @@ limitations under the License.
|
||||||
display: inline ! important;
|
display: inline ! important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
// actually, removing the Italic TTF provides
|
||||||
|
// better results seemingly
|
||||||
|
|
||||||
// compensate for Nunito italics being terrible
|
// compensate for Nunito italics being terrible
|
||||||
// https://github.com/google/fonts/issues/1726
|
// https://github.com/google/fonts/issues/1726
|
||||||
.mx_EventTile_content .markdown-body em {
|
.mx_EventTile_content .markdown-body em {
|
||||||
transform: skewX(-14deg);
|
transform: skewX(-14deg);
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
/* end of overrides */
|
/* end of overrides */
|
||||||
|
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,47 +1,36 @@
|
||||||
/*
|
/*
|
||||||
* Nunito.
|
* Nunito.
|
||||||
* Includes extended Latin and Vietnamese character sets
|
* 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
|
* 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.
|
/* 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-face {
|
||||||
font-family: 'Nunito';
|
font-family: 'Nunito';
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: 400;
|
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-face {
|
||||||
font-family: 'Nunito';
|
font-family: 'Nunito';
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: 600;
|
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-face {
|
||||||
font-family: 'Nunito';
|
font-family: 'Nunito';
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
src: url('$(res)/fonts/Nunito/XRXW3I6Li01BKofAjsOUYevN.ttf') format('truetype');
|
src: url('$(res)/fonts/Nunito/Nunito-Bold.ttf') format('truetype');
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue