Skip to content

Commit ae86fa0

Browse files
authored
Merge pull request #35 from jenkinsci/dependabot/npm_and_yarn/bootstrap-5.1.1
Bump bootstrap from 5.1.0 to 5.1.1
2 parents 9af8adb + ad3ee57 commit ae86fa0

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

README.adoc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,20 @@ should occupy. Typically, all visible components are mapped on the available spa
5757
In a Jenkins view we have a fixed header and footer and a navigation bar on the left
5858
(20 percent of the horizontal space). The rest of a screen can be used by
5959
a details view. In order to simplify the distribution of elements in that remaining space we use
60-
https://getbootstrap.com/docs/4.4/layout/grid/[Bootstrap's grid system].
60+
https://getbootstrap.com/docs/5.1/layout/grid/[Bootstrap's grid system].
6161

6262
.Jenkins layout with a details view that contains a grid system
6363
[#img-grid]
6464
image::grid.png[Grid layout in Jenkins]
6565

6666
That means, a view is split into 12 columns and and arbitrary number of rows. This grid system is simple to use
6767
(but complex enough to also support fancy screen layouts) - I won't go into
68-
details here, please refer to the https://getbootstrap.com/docs/4.4/layout/grid/[Bootstrap documentation]
68+
details here, please refer to the https://getbootstrap.com/docs/5.1/layout/grid/[Bootstrap documentation]
6969
for details.
7070

7171
For the forensics detail view we use a simple grid of two rows and two columns. Since the number of columns always is 12
72-
we need to create two "fat" columns that fill 6 of the standard columns.
73-
In order to create such a view in our
74-
plugin we need to create a view given as a jelly file and a corresponding Java view model object. A view with this layout
72+
we need to create two "fat" columns that fill 6 of the standard columns. In order to create such a view in our plugin we
73+
need to create a view given as a jelly file and a corresponding Java view model object. A view with this layout
7574
is shown in the following snippet:
7675

7776
[source,xml,linenums]
@@ -152,7 +151,7 @@ to get a consistent look and feel in Jenkins' plugin ecosystem.
152151
[#img-card]
153152
image::card.png[Card examples]
154153

155-
Note that the size of the cards is determined by the grid configuration, see <<boostrap-grid>>.
154+
Note that the size of the cards is determined by the grid configuration, see section <<Grid layout>>.
156155

157156
You can find several examples of Jenkins views that use jQuery in the
158157
https://github.com/jenkinsci/warnings-ng-plugin[Warnings Next Generation plugin]

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"dependencies": {
99
"@popperjs/core": "^2.10.1",
10-
"bootstrap": "^5.1.0",
10+
"bootstrap": "^5.1.1",
1111
"autoprefixer": "^10.3.4",
1212
"cross-env": "^7.0.3",
1313
"rtlcss": "^3.3.0",

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<description>Provides Bootstrap 5 for Jenkins plugins.</description>
2020

2121
<properties>
22-
<revision>5.1.0-4</revision>
22+
<revision>5.1.1-1</revision>
2323
<changelist>-SNAPSHOT</changelist>
2424
<module.name>${project.groupId}.bootstrap5</module.name>
2525

0 commit comments

Comments
 (0)