Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Upgrade Bootstrap version to 5.3.3 #806

Merged
merged 4 commits into from
Feb 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion themes/buildpacks/assets/scss/_reboot.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap Reboot v4.1.3 (https://getbootstrap.com/)
* Bootstrap Reboot v5.3.3(https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
Expand Down
4 changes: 2 additions & 2 deletions themes/buildpacks/layouts/_default/baseof.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
{{ partial "meta.html" . }}

<script
src="https://cdn.jsdelivr.net/combine/npm/axios@0.21.0,npm/jquery@3.5.1,npm/bootstrap@4.5.3,npm/fullcalendar@5.4.0,npm/jquery-replacetext@1.1.0/replacetext.min.js"></script>
src="https://cdn.jsdelivr.net/combine/npm/axios@0.21.0,npm/jquery@3.5.1,npm/bootstrap@5.3.3,npm/fullcalendar@5.4.0,npm/jquery-replacetext@1.1.0/replacetext.min.js"></script>


<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.1/css/all.min.css"
crossorigin="anonymous">
<link rel="stylesheet"
href="https://cdn.jsdelivr.net/combine/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css,npm/fullcalendar@5.4.0/main.min.css"
href="https://cdn.jsdelivr.net/combine/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css,npm/fullcalendar@5.4.0/main.min.css"
crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Fira+Mono|Source+Sans+Pro:400,400i,600" rel="stylesheet">
{{ $style := resources.Get "scss/site.scss" | toCSS }}
Expand Down
23 changes: 14 additions & 9 deletions themes/buildpacks/layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@
<ul class="navbar-nav">
{{ $current := . }}
{{ range $.Site.Menus.main }}
{{ $topLevel := replace .URL "/" "" }}
<li class="nav-item mr-lg-4 text-center text-lg-left {{ if or (eq $current.Permalink .URL) (eq $current.Type $topLevel) }}active{{end}}">
<a class="nav-link py-2 py-lg-0 px-1" {{if (hasPrefix .URL "https" )}}target='_blank' {{end}} href="{{ .URL }}">
{{.Name}}
</a>
</li>
{{ $topLevel := replace .URL "/" "" }}
<li class="nav-item ms-lg-4 text-center text-lg-left {{ if or (eq $current.Permalink .URL) (eq $current.Type $topLevel) }}active{{end}}">
<a class="nav-link py-2 py-lg-0 px-1" {{ if (hasPrefix .URL "https") }}target='_blank'{{ end }}
href="{{ .URL }}">
{{ .Name }}
</a>
</li>
{{ end }}

<!-- Mobile-specific links (Docs & GitHub) -->
<li class="nav-item text-center d-lg-none">
<a class="nav-link py-2 px-1" href="/docs">Docs</a>
</li>
Expand All @@ -26,8 +29,10 @@
</li>
</ul>

<a class="button-light mr-3 d-none d-lg-block" href="/docs"><i class="far fa-file-alt mr-2"></i>Docs</a>
<a class="github-button icon-button bg-blue button d-none d-lg-flex" href="https://github.com/buildpacks">GitHub</a>
</div>
<a class="button-light ms-3 d-none d-lg-block" href="/docs">
<i class="far fa-file-alt me-2"></i>Docs
</a>
<a class="github-button ms-3 icon-button bg-blue button d-none d-lg-flex" href="https://github.com/buildpacks">GitHub</a>
</div>
</nav>
</header>
Loading