]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 714c8bc)
Docs: remove optional `direction` management for RTL (#42255)
authorJulien Déramond <juderamond@gmail.com>
Fri, 3 Apr 2026 22:38:29 +0000 (00:38 +0200)
committerGitHub <noreply@github.com>
Fri, 3 Apr 2026 22:38:29 +0000 (15:38 -0700)
site/src/components/head/Head.astro patch | blob | blame | history
site/src/components/head/Stylesheet.astro patch | blob | blame | history
site/src/content.config.ts patch | blob | blame | history
site/src/layouts/BaseLayout.astro patch | blob | blame | history
site/src/layouts/ExamplesLayout.astro patch | blob | blame | history
site/src/libs/bootstrap.ts patch | blob | blame | history
site/src/libs/examples.ts patch | blob | blame | history

diff --git a/site/src/components/head/Head.astro b/site/src/components/head/Head.astro
index af6ede7daf047ed4394e732da552ef33b57b9e3c..323877efd4dff39ff6712de27ac183c4c3085041 100644 (file)
--- a/site/src/components/head/Head.astro
+++ b/site/src/components/head/Head.astro
@@ -9,14 +9,13 @@ import Analytics from '@components/head/Analytics.astro'
 
 interface Props {
   description: string
-  direction?: 'rtl'
   layout: Layout
   robots: string | undefined
   thumbnail: string
   title: string
 }
 
-const { description, direction, layout, robots, thumbnail, title } = Astro.props
+const { description, layout, robots, thumbnail, title } = Astro.props
 
 const canonicalUrl = new URL(Astro.url.pathname, Astro.site)
 
@@ -63,7 +62,7 @@ const ScssProd = import.meta.env.PROD ? await import('@components/head/ScssProd.
 </script>
 
 {import.meta.env.PROD && ScssProd && (
-  <Stylesheet direction={direction} layout={layout} />
+  <Stylesheet layout={layout} />
   <ScssProd.default />
 )}
 
diff --git a/site/src/components/head/Stylesheet.astro b/site/src/components/head/Stylesheet.astro
index d0203893a478d758153f1e2919a89d9551073209..81a760143d3e291bbce9b2225fb1764ae5b65173 100644 (file)
--- a/site/src/components/head/Stylesheet.astro
+++ b/site/src/components/head/Stylesheet.astro
@@ -3,11 +3,8 @@ import { getVersionedBsCssProps } from '@libs/bootstrap'
 import type { Layout } from '@libs/layout'
 
 interface Props {
-  direction?: 'rtl'
   layout: Layout
 }
-
-const { direction } = Astro.props
 ---
 
-<link {...getVersionedBsCssProps(direction)} />
+<link {...getVersionedBsCssProps()} />
diff --git a/site/src/content.config.ts b/site/src/content.config.ts
index fbba90b5e03fec4aa8dfbca0677713deaeecf2bb..7dea9c18b79f9ca8c9db1e1c7d7c40f8f3b835f1 100644 (file)
--- a/site/src/content.config.ts
+++ b/site/src/content.config.ts
@@ -19,7 +19,6 @@ const docsSchema = z.object({
     ])
     .optional(),
   description: z.string(),
-  direction: z.literal('rtl').optional(),
   extra_js: z
     .object({
       async: z.boolean().optional(),
diff --git a/site/src/layouts/BaseLayout.astro b/site/src/layouts/BaseLayout.astro
index 1368e0c0d35584ec405dd54077909f8f26133970..4ac506139e6bbfd39e917b503fcbea4074a2c4b9 100644 (file)
--- a/site/src/layouts/BaseLayout.astro
+++ b/site/src/layouts/BaseLayout.astro
@@ -49,7 +49,6 @@ const mainProps = overrides?.main ?? {}
   <head>
     <Head
       description={description}
-      direction={frontmatter?.direction}
       layout={layout}
       robots={robots}
       thumbnail={thumbnail}
diff --git a/site/src/layouts/ExamplesLayout.astro b/site/src/layouts/ExamplesLayout.astro
index 1b1c1eb4f4e1d875f40521006471079394c062b9..327a256445ae51c5514cd8a54600ecc2d7365fc1 100644 (file)
--- a/site/src/layouts/ExamplesLayout.astro
+++ b/site/src/layouts/ExamplesLayout.astro
@@ -11,16 +11,14 @@ import Icons from '@layouts/partials/Icons.astro'
 
 type Props = ExampleFrontmatter
 
-const { body_class, direction, extra_css, extra_js, html_class, include_js, title = 'Example' } = Astro.props
+const { body_class, extra_css, extra_js, html_class, include_js, title = 'Example' } = Astro.props
 
 const pageTitle = `${title} · ${getConfig().title} v${getConfig().docs_version}`
 const canonicalUrl = new URL(Astro.url.pathname, Astro.site)
-
-const htmlProps: HTMLAttributes<'html'> = direction === 'rtl' ? { lang: 'ar', dir: 'rtl' } : { lang: 'en' }
 ---
 
 <!DOCTYPE html>
-<html {...htmlProps} class:list={html_class} data-bs-theme="auto">
+<html lang="en" class:list={html_class} data-bs-theme="auto">
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -33,7 +31,7 @@ const htmlProps: HTMLAttributes<'html'> = direction === 'rtl' ? { lang: 'ar', di
 
     <script is:inline src={getVersionedDocsPath('assets/js/color-modes.js')}></script>
 
-    <Stylesheet direction={direction} layout="examples" />
+    <Stylesheet layout="examples" />
     <Favicons />
 
     <style is:global>
diff --git a/site/src/libs/bootstrap.ts b/site/src/libs/bootstrap.ts
index 3b033895480a3aec5583f554925b536af6833076..101983fee10bb01a4717d3d43d66bad396486106 100644 (file)
--- a/site/src/libs/bootstrap.ts
+++ b/site/src/libs/bootstrap.ts
@@ -2,7 +2,7 @@ import type { HTMLAttributes } from 'astro/types'
 import { getConfig } from '@libs/config'
 import { getVersionedDocsPath } from '@libs/path'
 
-export function getVersionedBsCssProps(direction: 'rtl' | undefined) {
+export function getVersionedBsCssProps() {
   let bsCssLinkHref = '/dist/css/bootstrap'
 
   if (import.meta.env.PROD) {
diff --git a/site/src/libs/examples.ts b/site/src/libs/examples.ts
index 15596cd1608cf6c79e31faa26a1d59f8934daff2..de81ab5015a74b7ab87b00517cf041ddb35fdd82 100644 (file)
--- a/site/src/libs/examples.ts
+++ b/site/src/libs/examples.ts
@@ -6,7 +6,6 @@ import { getDocsFsPath } from './path'
 
 export const exampleFrontmatterSchema = z.object({
   body_class: z.string().optional(),
-  direction: z.literal('rtl').optional(),
   extra_css: z.string().array().optional(),
   extra_js: z
     .object({
Mirror of https://github.com/twbs/bootstrap.git