Skip to content

Commit a7c6552

Browse files
committed
Fix some bugs during v4->v5 migration.
1 parent 9f4557d commit a7c6552

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

README.adoc

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,16 @@ You can see the available breakpoints by including the following HTML snippet in
2626

2727
[source,xml]
2828
----
29-
<div class="col-12">
30-
<span class="badge badge-dark d-xxxl-inline d-none">xxxl</span>
31-
<span class="badge badge-dark d-xxl-inline d-xxxl-none d-none">xxl</span>
32-
<span class="badge badge-dark d-xl-inline d-xxl-none d-none">xl</span>
33-
<span class="badge badge-dark d-lg-inline d-xl-none d-none">lg</span>
34-
<span class="badge badge-dark d-md-inline d-lg-none d-none">md</span>
35-
<span class="badge badge-dark d-sm-inline d-md-none d-none">sm</span>
36-
<span class="badge badge-dark d-inline d-sm-none">xs</span>
29+
<div class="row py-3">
30+
<div class="col-12">
31+
<span class="badge bg-secondary d-xxxl-inline d-none">xxxl</span>
32+
<span class="badge bg-secondary d-xxl-inline d-xxxl-none d-none">xxl</span>
33+
<span class="badge bg-secondary d-xl-inline d-xxl-none d-none">xl</span>
34+
<span class="badge bg-secondary d-lg-inline d-xl-none d-none">lg</span>
35+
<span class="badge bg-secondary d-md-inline d-lg-none d-none">md</span>
36+
<span class="badge bg-secondary d-sm-inline d-md-none d-none">sm</span>
37+
<span class="badge bg-secondary d-inline d-sm-none">xs</span>
38+
</div>
3739
</div>
3840
----
3941

etc/bootstrap-custom-build.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ $container-max-widths: (
2020

2121
@import "../node_modules/bootstrap/scss/variables";
2222
@import "../node_modules/bootstrap/scss/mixins";
23+
@import "../node_modules/bootstrap/scss/utilities";
2324

2425
/* override the !default vars with the values we set above */
2526

@@ -35,8 +36,8 @@ th {
3536
text-align: inherit;
3637
}
3738

38-
@import "../node_modules/bootstrap/scss/accordion";
3939
@import "../node_modules/bootstrap/scss/images";
40+
@import "../node_modules/bootstrap/scss/containers";
4041
@import "../node_modules/bootstrap/scss/grid";
4142
@import "../node_modules/bootstrap/scss/tables";
4243
@import "../node_modules/bootstrap/scss/forms";
@@ -47,6 +48,7 @@ th {
4748
@import "../node_modules/bootstrap/scss/nav";
4849
@import "../node_modules/bootstrap/scss/navbar";
4950
@import "../node_modules/bootstrap/scss/card";
51+
@import "../node_modules/bootstrap/scss/accordion";
5052
@import "../node_modules/bootstrap/scss/breadcrumb";
5153
@import "../node_modules/bootstrap/scss/pagination";
5254
@import "../node_modules/bootstrap/scss/badge";
@@ -60,5 +62,7 @@ th {
6062
@import "../node_modules/bootstrap/scss/popover";
6163
@import "../node_modules/bootstrap/scss/carousel";
6264
@import "../node_modules/bootstrap/scss/spinners";
63-
@import "../node_modules/bootstrap/scss/utilities";
65+
@import "../node_modules/bootstrap/scss/helpers";
66+
67+
@import "../node_modules/bootstrap/scss/utilities/api";
6468
// scss-docs-end import-stack

src/main/resources/io/jenkins/plugins/bootstrap5.jelly

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Use it like <st:adjunct includes="io.jenkins.plugins.bootstrap5"/>
77
<j:new var="h" className="hudson.Functions" />
88
${h.initPageVariables(context)}
99

10+
<st:adjunct includes="io.jenkins.plugins.jquery3"/> <!-- FIXME: no-prototype.js dependes on JQuery -->
1011
<st:adjunct includes="io.jenkins.plugins.popper2"/>
1112

1213
<link type="text/css" rel="stylesheet" href="${resURL}/plugin/bootstrap5-api/css/bootstrap-custom-build.css"/>
@@ -15,5 +16,9 @@ Use it like <st:adjunct includes="io.jenkins.plugins.bootstrap5"/>
1516
<script type="text/javascript" src="${resURL}/plugin/bootstrap5-api/js/bootstrap.min.js"/>
1617
<script type="text/javascript" src="${resURL}/plugin/bootstrap5-api/js/no-prototype.js"/>
1718

19+
<script>
20+
const bootstrap5 = bootstrap;
21+
</script>
22+
1823
</j:jelly>
1924

src/main/webapp/css/jenkins-style.css

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ pre {
3838
width: 20px;
3939
}
4040

41-
.carousel-control-prev-icon {
42-
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23b4b4b4' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E");
43-
}
44-
45-
.carousel-control-next-icon {
46-
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23b4b4b4' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E");
47-
}
48-
4941
/* ------------------------------------------------------------------------------------------------------------------- */
5042
/* Font awesome icons float right */
5143
/* ------------------------------------------------------------------------------------------------------------------- */

0 commit comments

Comments
 (0)