1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-11 08:04:59 +02:00

Tweak docs layout and font-sizes, try out Inter

This commit is contained in:
Mark Otto
2025-04-14 09:59:34 -07:00
parent f9c74a0974
commit d30d9bfd96
8 changed files with 51 additions and 9 deletions

View File

@@ -39,6 +39,7 @@
// Note: Custom variable values only support SassScript inside `#{}`. // Note: Custom variable values only support SassScript inside `#{}`.
// Fonts // Fonts
font-feature-settings: "liga" 1, "calt" 1; /* fix for Chrome */
// Note: Use `inspect` for lists so that quoted items keep the quotes. // Note: Use `inspect` for lists so that quoted items keep the quotes.
// See https://github.com/sass/sass/issues/2383#issuecomment-336349172 // See https://github.com/sass/sass/issues/2383#issuecomment-336349172
@@ -51,7 +52,7 @@
@if $font-size-root != null { @if $font-size-root != null {
--#{$prefix}root-font-size: #{$font-size-root}; --#{$prefix}root-font-size: #{$font-size-root};
} }
--#{$prefix}body-font-family: #{inspect($font-family-base)}; --#{$prefix}body-font-family: Inter, #{inspect($font-family-base)};
@include rfs($font-size-base, --#{$prefix}body-font-size); @include rfs($font-size-base, --#{$prefix}body-font-size);
--#{$prefix}body-font-weight: #{$font-weight-base}; --#{$prefix}body-font-weight: #{$font-weight-base};
--#{$prefix}body-line-height: #{$line-height-base}; --#{$prefix}body-line-height: #{$line-height-base};

View File

@@ -28,7 +28,7 @@ const sidebar = getData('sidebar')
)} */} )} */}
{group.title} {group.title}
</strong> </strong>
<ul class="list-unstyled fw-normal pb-2 small"> <ul class="list-unstyled fw-normal pb-2">
{group.pages?.map((page) => { {group.pages?.map((page) => {
const docSlug = getSlug(page.title) const docSlug = getSlug(page.title)
const unversionedPageSlug = `${groupSlug}/${docSlug}` const unversionedPageSlug = `${groupSlug}/${docSlug}`

View File

@@ -47,6 +47,9 @@ const pageTitle = isHome
<script is:inline src={getVersionedDocsPath('assets/js/color-modes.js')}></script> <script is:inline src={getVersionedDocsPath('assets/js/color-modes.js')}></script>
<link rel="preconnect" href="https://rsms.me/">
<link rel="stylesheet" href="https://rsms.me/inter/inter.css">
<Stylesheet direction={direction} layout={layout} /> <Stylesheet direction={direction} layout={layout} />
<Scss /> <Scss />
<Favicons /> <Favicons />

View File

@@ -156,7 +156,7 @@ if (currentPageIndex < allPages.length - 1) {
<Ads /> <Ads />
</div> </div>
<div class="docs-content-body prose ps-lg-2"> <div class="docs-content-body ps-lg-2">
{ {
frontmatter.sections && ( frontmatter.sections && (
<div class="grid mb-5"> <div class="grid mb-5">

View File

@@ -1,5 +1,6 @@
@use "../../../scss/config" as *; @use "../../../scss/config" as *;
@use "../../../scss/colors" as *; @use "../../../scss/colors" as *;
@use "../../../scss/mixins/border-radius" as *;
@use "variables" as *; @use "variables" as *;
// //
@@ -8,20 +9,28 @@
@layer custom { @layer custom {
.bd-callout { .bd-callout {
--#{$prefix}link-color: var(--bd-callout-link); --#{$prefix}link-color: var(--bd-callout-color);
--#{$prefix}link-hover-color: var(--bd-callout-color);
--#{$prefix}code-color: var(--bd-callout-code-color); --#{$prefix}code-color: var(--bd-callout-code-color);
padding: 1.25rem; padding: 1.25rem;
margin-top: 1.25rem; margin-top: 1.25rem;
margin-bottom: 1.25rem; margin-bottom: 1.25rem;
color: var(--bd-callout-color, inherit); font-size: .875rem;
line-height: 1.5;
// color: var(--bd-callout-color, inherit);
background-color: var(--bd-callout-bg, var(--bs-gray-100)); background-color: var(--bd-callout-bg, var(--bs-gray-100));
border: 1px solid var(--bd-callout-border, var(--bs-border-color));
border-left: .25rem solid var(--bd-callout-border, var(--bs-gray-300)); border-left: .25rem solid var(--bd-callout-border, var(--bs-gray-300));
@include border-radius(var(--bs-border-radius));
// box-shadow: inset .25rem 0 0 var(--bd-callout-border, var(--bs-gray-300));
h4 { h4 {
margin-bottom: .25rem; margin-bottom: .25rem;
} }
a { font-weight: 500; }
> :last-child { > :last-child {
margin-bottom: 0; margin-bottom: 0;
} }
@@ -38,8 +47,8 @@
// Variations // Variations
@each $variant in $bd-callout-variants { @each $variant in $bd-callout-variants {
.bd-callout-#{$variant} { .bd-callout-#{$variant} {
--bd-callout-color: var(--bs-#{$variant}-text); // --bd-callout-color: var(--bs-#{$variant}-text);
--bd-callout-bg: var(--bs-#{$variant}-bg-subtle); --bd-callout-bg: color-mix(in srgb, var(--bs-#{$variant}-bg-subtle), transparent 50%);
--bd-callout-border: var(--bs-#{$variant}-border); --bd-callout-border: var(--bs-#{$variant}-border);
} }
} }

View File

@@ -8,6 +8,33 @@
@layer custom { @layer custom {
.docs-content-body { .docs-content-body {
> h2,
> h3,
> h4 {
--bs-heading-color: var(--bs-emphasis-color);
}
// Offset content from fixed navbar when jumping to headings
> h2:not(:first-child) {
margin-top: 3rem;
}
> h3 {
margin-top: 2rem;
}
> ul li,
> ol li {
margin-bottom: .25rem;
// stylelint-disable selector-max-type, selector-max-compound-selectors
> p ~ ul {
margin-top: -.5rem;
margin-bottom: 1rem;
}
// stylelint-enable selector-max-type, selector-max-compound-selectors
}
// Override Bootstrap defaults // Override Bootstrap defaults
> .table, > .table,
> .table-responsive .table { > .table-responsive .table {

View File

@@ -3,6 +3,8 @@
@use "../../../scss/mixins/box-shadow" as *; @use "../../../scss/mixins/box-shadow" as *;
.bd-sidebar { .bd-sidebar {
font-size: .875rem;
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
position: sticky; position: sticky;
top: 5rem; top: 5rem;
@@ -31,7 +33,7 @@
.bd-links-nav { .bd-links-nav {
@include media-breakpoint-down(lg) { @include media-breakpoint-down(lg) {
font-size: .875rem; // font-size: .875rem;
} }
@include media-breakpoint-between(xs, lg) { @include media-breakpoint-between(xs, lg) {

View File

@@ -17,7 +17,7 @@
} }
nav { nav {
@include font-size(.875rem); // @include font-size(.875rem);
ul { ul {
padding-left: 0; padding-left: 0;