1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Merge pull request #735 from ferferga/font-family

Change font family
This commit is contained in:
dkanada 2020-02-09 16:56:58 +09:00 committed by GitHub
commit e70628c890
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 304 additions and 41 deletions

View file

@ -1,29 +1,30 @@
html {
font-family: -apple-system, "Helvetica", system-ui, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", 'Open Sans', sans-serif;
font-family: "Noto Sans", sans-serif;
font-size: 93%;
-webkit-text-size-adjust: 100%;
text-size-adjust: 100%;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
}
h1,
h2,
h3 {
/* For better bolding, since Helvetica does not support 500 weight, and 600 is too thick */
font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", 'Open Sans', sans-serif;
font-family: "Noto Sans", sans-serif;
}
h1 {
font-weight: 500;
font-weight: 400;
font-size: 1.8em;
}
h2 {
font-weight: 500;
font-weight: 400;
font-size: 1.5em;
}
h3 {
font-weight: 500;
font-weight: 400;
font-size: 1.17em;
}

View file

@ -1,5 +1,5 @@
h1 {
font-weight: 500;
font-weight: 400;
font-size: 1.8em;
}
@ -8,12 +8,12 @@ h1 {
}
h2 {
font-weight: 500;
font-weight: 400;
font-size: 1.5em;
}
h3 {
font-weight: 500;
font-weight: 400;
font-size: 1.17em;
}

View file

@ -102,3 +102,8 @@ var material_icons = require("material-design-icons-iconfont/dist/material-desig
_define("material-icons", function() {
return material_icons;
});
var jellyfin_noto = require("jellyfin-noto");
_define("jellyfin-noto", function () {
return jellyfin_noto;
});

View file

@ -732,7 +732,8 @@ var AppInfo = {};
"sortable",
"libjass",
"webcomponents",
"material-icons"
"material-icons",
"jellyfin-noto"
]
},
urlArgs: urlArgs,
@ -747,6 +748,7 @@ var AppInfo = {};
});
require(["css!assets/css/site"]);
require(["jellyfin-noto"]);
// define styles
// TODO determine which of these files can be moved to the components themselves