diff --git a/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt b/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt index 6e754264e9..7ffcd9e350 100644 --- a/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt +++ b/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt @@ -77,7 +77,8 @@ class StylesInstaller(private val dokkaContext: DokkaContext) : PageTransformer "styles/style.css", "styles/main.css", "styles/prism.css", - "styles/logo-styles.css" + "styles/logo-styles.css", + "styles/font-jb-sans-auto.css" ) override fun invoke(input: RootPageNode): RootPageNode = diff --git a/plugins/base/src/main/resources/dokka/styles/font-jb-sans-auto.css b/plugins/base/src/main/resources/dokka/styles/font-jb-sans-auto.css new file mode 100644 index 0000000000..95d8ef8334 --- /dev/null +++ b/plugins/base/src/main/resources/dokka/styles/font-jb-sans-auto.css @@ -0,0 +1,32 @@ +/* Light weight */ +@font-face { + font-family: 'JetBrains Sans'; + src: url('https://resources.jetbrains.com/storage/jetbrains-sans/JetBrainsSans-Light.woff2') format('woff2'), url('https://resources.jetbrains.com/storage/jetbrains-sans/JetBrainsSans-Light.woff') format('woff'); + font-weight: 300; + font-style: normal; +} +/* Regular weight */ +@font-face { + font-family: 'JetBrains Sans'; + src: url('https://resources.jetbrains.com/storage/jetbrains-sans/JetBrainsSans-Regular.woff2') format('woff2'), url('https://resources.jetbrains.com/storage/jetbrains-sans/JetBrainsSans-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; +} +/* SemiBold weight */ +@font-face { + font-family: 'JetBrains Sans'; + src: url('https://resources.jetbrains.com/storage/jetbrains-sans/JetBrainsSans-SemiBold.woff2') format('woff2'), url('https://resources.jetbrains.com/storage/jetbrains-sans/JetBrainsSans-SemiBold.woff') format('woff'); + font-weight: 600; + font-style: normal; +} + +@supports (font-variation-settings: normal) { + @font-face { + font-family: 'JetBrains Sans'; + src: url('https://resources.jetbrains.com/storage/jetbrains-sans/JetBrainsSans.woff2') format('woff2 supports variations'), + url('https://resources.jetbrains.com/storage/jetbrains-sans/JetBrainsSans.woff2') format('woff2-variations'), + url('https://resources.jetbrains.com/storage/jetbrains-sans/JetBrainsSans.woff') format('woff-variations'); + font-weight: 100 900; + font-style: normal; + } +} diff --git a/plugins/base/src/main/resources/dokka/styles/style.css b/plugins/base/src/main/resources/dokka/styles/style.css index 8d5770df17..aaa21baf52 100644 --- a/plugins/base/src/main/resources/dokka/styles/style.css +++ b/plugins/base/src/main/resources/dokka/styles/style.css @@ -1,3 +1,4 @@ +@import url('./font-jb-sans-auto.css'); @import url('https://fonts.googleapis.com/css?family=JetBrains+Mono'); /* --- root styles --- */ @@ -24,7 +25,7 @@ --background-color: var(--default-white); --dark-mode-and-search-icon-color: var(--default-white); --color-dark: #27282c; - --default-font-family: system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Droid Sans, Helvetica Neue, Arial, sans-serif; + --default-font-family: JetBrains Sans, Inter, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI,Roboto, Oxygen, Ubuntu,Cantarell, Droid Sans, Helvetica Neue, Arial, sans-serif; --default-monospace-font-family: JetBrains Mono, SFMono-Regular, Consolas, Liberation Mono, Menlo, Courier, monospace; --default-font-size: 15px; --average-color: var(--color-dark); @@ -144,7 +145,7 @@ pre { dt { color: #444; - font-weight: 700; + font-weight: 530; } img { @@ -482,6 +483,10 @@ td:first-child { margin: 30px 0; border-top: 3px double #8c8b8b; } + +.main-content :is(h1, h2) { + font-weight: 530; +} /* /--- Main Content styles --- */ /* /--- Breadcrumbs styles --- */ @@ -1428,7 +1433,7 @@ div.runnablesample { display: flex; align-items: center; color: #fff; - font-weight: 700; + font-weight: 530; } .library-name--link::before {