-
-
Notifications
You must be signed in to change notification settings - Fork 78.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into xmr/docs-bundler-images
- Loading branch information
Showing
13 changed files
with
198 additions
and
151 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| {{- $originalSrc := .Destination | safeURL -}} | ||
| {{- $localImgPath := path.Join "/site/static/docs" site.Params.docs_version $originalSrc -}} | ||
| {{- /* This shouldn't be needed but we have a weird folder structure with version included... */ -}} | ||
| {{- $src := urls.JoinPath "/docs" site.Params.docs_version $originalSrc -}} | ||
| {{- $config := imageConfig $localImgPath -}} | ||
| {{- $classes := "d-block img-fluid" -}} | ||
|
|
||
| <img src="{{ $src }}" class="{{ $classes }}" alt="{{ .Text }}" width="{{ $config.Width }}" height="{{ $config.Height }}" loading="lazy"> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,29 +28,9 @@ <h1 class="bd-title mt-0">{{ .Title | markdownify }}</h1> | |
| <div class="container-xxl bd-gutter"> | ||
| {{ .Content }} | ||
|
|
||
| {{ if eq .Title "Examples" }} | ||
| <hr class="my-5"> | ||
| <div class="container"> | ||
| <div class="text-center"> | ||
| <div class="masthead-followup-icon d-inline-block mb-2 text-bg-danger"> | ||
| {{ partial "icons/droplet-fill.svg" (dict "width" "32" "height" "32") }} | ||
| </div> | ||
| <h2 class="display-6 fw-normal">Go further with Bootstrap Themes</h2> | ||
| <p class="col-md-10 col-lg-8 mx-auto lead"> | ||
| Need something more than these examples? Take Bootstrap to the next level with premium themes from the <a href="{{ .Site.Params.themes }}">official Bootstrap Themes marketplace</a>. They’re built as their own extended frameworks, rich with new components and plugins, documentation, and powerful build tools. | ||
| </p> | ||
| <a href="{{ .Site.Params.themes }}" class="btn btn-lg btn-outline-primary mb-3">Browse themes</a> | ||
| </div> | ||
| <img class="d-block img-fluid mt-3 mx-auto" | ||
| srcset="/docs/{{ .Site.Params.docs_version }}/assets/img/bootstrap-themes-collage.png, | ||
| /docs/{{ .Site.Params.docs_version }}/assets/img/[email protected] 2x" | ||
| src="/docs/{{ .Site.Params.docs_version }}/assets/img/bootstrap-themes-collage.png" | ||
| alt="Bootstrap Themes" | ||
| width="1150" | ||
| height="320" | ||
| loading="lazy"> | ||
| </div> | ||
| {{ end }} | ||
| {{ if eq .Title "Examples" -}} | ||
| {{ partial "examples/bs-themes" . }} | ||
| {{- end }} | ||
| </div> | ||
| </main> | ||
| {{ end }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <hr class="my-5"> | ||
| <div class="container"> | ||
| <div class="text-center"> | ||
| <div class="masthead-followup-icon d-inline-block mb-2 text-bg-danger"> | ||
| {{ partial "icons/droplet-fill.svg" (dict "width" "32" "height" "32") }} | ||
| </div> | ||
| <h2 class="display-6 fw-normal">Go further with Bootstrap Themes</h2> | ||
| <p class="col-md-10 col-lg-8 mx-auto lead"> | ||
| Need something more than these examples? Take Bootstrap to the next level with premium themes from the <a href="{{ .Site.Params.themes }}">official Bootstrap Themes marketplace</a>. They’re built as their own extended frameworks, rich with new components and plugins, documentation, and powerful build tools. | ||
| </p> | ||
| <a href="{{ .Site.Params.themes }}" class="btn btn-lg btn-outline-primary mb-3">Browse themes</a> | ||
| </div> | ||
| {{ partial "responsive-img" (dict "context" . | ||
| "imgPath" "/assets/img/bootstrap-themes-collage.png" | ||
| "alt" "Bootstrap Themes" | ||
| "classes" "d-block mt-3") }} | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,13 +10,11 @@ | |
| <svg class="bi" style="width: 20px; height: 20px;"><use xlink:href="#arrow-right-short"></use></svg> | ||
| </span> | ||
| </a> | ||
| <img class="d-none d-sm-block mx-auto mb-3" | ||
| srcset="/docs/{{ .Site.Params.docs_version }}/assets/brand/bootstrap-logo-shadow.png, | ||
| /docs/{{ .Site.Params.docs_version }}/assets/brand/[email protected] 2x" | ||
| src="/docs/{{ .Site.Params.docs_version }}/assets/brand/bootstrap-logo-shadow.png" | ||
| alt="Bootstrap" | ||
| width="200" | ||
| height="165"> | ||
| {{ partial "responsive-img" (dict "context" . | ||
| "imgPath" "/assets/brand/bootstrap-logo-shadow.png" | ||
| "alt" "Bootstrap" | ||
| "classes" "d-none d-sm-block mb-3" | ||
| "lazyload" false) }} | ||
| <h1 class="mb-3 fw-semibold lh-1">Build fast, responsive sites with Bootstrap</h1> | ||
| <p class="lead mb-4"> | ||
| Powerful, extensible, and feature-packed frontend toolkit. Build and customize with Sass, utilize prebuilt grid system and components, and bring projects to life with powerful JavaScript plugins. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| {{- /* | ||
| Accepts context, classes, imgPath, alt and lazyload | ||
| */ -}} | ||
|
|
||
| {{- $lazy := .lazyload | default true -}} | ||
| {{- $classes := slice "img-fluid" "mx-auto" | append (slice .classes) -}} | ||
|
|
||
| {{- $basePath := path.Join "/docs" .context.Site.Params.docs_version (path.Dir .imgPath) -}} | ||
| {{- $basename := path.BaseName .imgPath -}} | ||
| {{- $ext := path.Ext .imgPath -}} | ||
| {{- $imgPath := path.Join $basePath (printf "%s%s" $basename $ext) -}} | ||
| {{- $imgPath2x := path.Join $basePath (printf "%s@2x%s" $basename $ext) -}} | ||
|
|
||
| {{- with (imageConfig (path.Join "/site/static" $imgPath)) }} | ||
| <img class="{{ delimit $classes " " }}" | ||
| srcset="{{ $imgPath }}, {{ $imgPath2x }} 2x" | ||
| src="{{ $imgPath }}" | ||
| alt="{{ $.alt }}"{{ if eq $lazy true }} | ||
| loading="lazy"{{ end }} | ||
| width="{{ .Width }}" | ||
| height="{{ .Height }}"> | ||
| {{- end }} |