Skip to content

Commit 2849187

Browse files
thomasparkthomaspark
committed
Merge branch 'v5'
2 parents c58ccd2 + 6c4ea3b commit 2849187

File tree

377 files changed

+1431
-792
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

377 files changed

+1431
-792
lines changed

‎Gruntfile.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,21 @@ module.exports = grunt => {
184184
'dist/*/_variables.scss',
185185
'dist/*/_bootswatch.scss'
186186
],
187-
tasks: 'build'
187+
tasks: ['build', 'shell:csslint']
188188
}
189189
},
190190
shell: {
191191
options: {
192-
stderr: false
192+
stderr: false,
193+
failOnError: false
193194
},
194195
rtlcss: {
195196
command: function (theme) {
196197
return `rtlcss dist/${theme}/bootstrap.css dist/${theme}/bootstrap.rtl.css`;
197198
}
199+
},
200+
csslint: {
201+
command: 'stylelint "dist/**/*.scss"'
198202
}
199203
}
200204
});

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<img width="200" height="200" src="https://bootswatch.com/_assets/img/logo-dark.svg">
2+
<img width="200" height="200" src="https://bootswatch.com/_assets/img/logo.png">
33
</p>
44

55
<h3 align="center">Bootswatch</h3>

‎dist/brite/_bootswatch.scss‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Brite 5.3.6
1+
// Brite 5.3.7
22
// Bootswatch
33

44

@@ -105,6 +105,10 @@
105105
.btn {
106106
margin-left: 0;
107107
}
108+
109+
> .btn.active {
110+
z-index: 0;
111+
}
108112
}
109113

110114
.btn-group,
@@ -199,6 +203,16 @@ a {
199203

200204
// Navs
201205

206+
.nav {
207+
&:not(.nav-tabs, .nav-pills) {
208+
.nav-link {
209+
&.active {
210+
font-weight: 700;
211+
}
212+
}
213+
}
214+
}
215+
202216
.nav-tabs {
203217
gap: 4px;
204218
padding: .4rem .4rem calc(.4rem + 2px);
@@ -289,7 +303,7 @@ a {
289303
}
290304
}
291305

292-
.nav-underline {
306+
.nav {
293307
.nav-link {
294308
--#{$prefix}nav-link-color: #fff;
295309

‎dist/brite/_variables.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Brite 5.3.6
1+
// Brite 5.3.7
22
// Bootswatch
33

44
$theme: "brite" !default;

‎dist/brite/bootstrap.css‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
@charset "UTF-8";
22
/*!
3-
* Bootswatch v5.3.5 (https://bootswatch.com)
3+
* Bootswatch v5.3.7 (https://bootswatch.com)
44
* Theme: brite
55
* Copyright 2012-2025 Thomas Park
66
* Licensed under MIT
77
* Based on Bootstrap
88
*/
99
/*!
10-
* Bootstrap v5.3.6 (https://getbootstrap.com/)
10+
* Bootstrap v5.3.7 (https://getbootstrap.com/)
1111
* Copyright 2011-2025 The Bootstrap Authors
1212
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
1313
*/
@@ -12258,6 +12258,9 @@ textarea.form-control-lg {
1225812258
.btn-group .btn {
1225912259
margin-left: 0;
1226012260
}
12261+
.btn-group > .btn.active {
12262+
z-index: 0;
12263+
}
1226112264

1226212265
.btn-group .btn:hover, .btn-group .btn:active, .btn-group .btn:focus,
1226312266
.btn-group-vertical .btn:hover,
@@ -12331,6 +12334,10 @@ a {
1233112334
box-shadow: none;
1233212335
}
1233312336

12337+
.nav:not(.nav-tabs, .nav-pills) .nav-link.active {
12338+
font-weight: 700;
12339+
}
12340+
1233412341
.nav-tabs {
1233512342
gap: 4px;
1233612343
padding: 0.4rem 0.4rem calc(0.4rem + 2px);
@@ -12450,10 +12457,10 @@ a {
1245012457
[data-bs-theme=dark] .page-link:hover {
1245112458
--bs-pagination-hover-color: #fff;
1245212459
}
12453-
[data-bs-theme=dark] .nav-underline .nav-link {
12460+
[data-bs-theme=dark] .nav .nav-link {
1245412461
--bs-nav-link-color: #fff;
1245512462
}
12456-
[data-bs-theme=dark] .nav-underline .nav-link:hover, [data-bs-theme=dark] .nav-underline .nav-link:focus {
12463+
[data-bs-theme=dark] .nav .nav-link:hover, [data-bs-theme=dark] .nav .nav-link:focus {
1245712464
--bs-nav-link-hover-color: #fff;
1245812465
}
1245912466
[data-bs-theme=dark] .breadcrumb a {

‎dist/brite/bootstrap.min.css‎

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

‎dist/brite/bootstrap.min.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/brite/bootstrap.rtl.css‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
@charset "UTF-8";
22
/*!
3-
* Bootswatch v5.3.5 (https://bootswatch.com)
3+
* Bootswatch v5.3.7 (https://bootswatch.com)
44
* Theme: brite
55
* Copyright 2012-2025 Thomas Park
66
* Licensed under MIT
77
* Based on Bootstrap
88
*/
99
/*!
10-
* Bootstrap v5.3.6 (https://getbootstrap.com/)
10+
* Bootstrap v5.3.7 (https://getbootstrap.com/)
1111
* Copyright 2011-2025 The Bootstrap Authors
1212
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
1313
*/
@@ -12232,6 +12232,9 @@ textarea.form-control-lg {
1223212232
.btn-group .btn {
1223312233
margin-right: 0;
1223412234
}
12235+
.btn-group > .btn.active {
12236+
z-index: 0;
12237+
}
1223512238

1223612239
.btn-group .btn:hover, .btn-group .btn:active, .btn-group .btn:focus,
1223712240
.btn-group-vertical .btn:hover,
@@ -12305,6 +12308,10 @@ a {
1230512308
box-shadow: none;
1230612309
}
1230712310

12311+
.nav:not(.nav-tabs, .nav-pills) .nav-link.active {
12312+
font-weight: 700;
12313+
}
12314+
1230812315
.nav-tabs {
1230912316
gap: 4px;
1231012317
padding: 0.4rem 0.4rem calc(0.4rem + 2px);
@@ -12424,10 +12431,10 @@ a {
1242412431
[data-bs-theme=dark] .page-link:hover {
1242512432
--bs-pagination-hover-color: #fff;
1242612433
}
12427-
[data-bs-theme=dark] .nav-underline .nav-link {
12434+
[data-bs-theme=dark] .nav .nav-link {
1242812435
--bs-nav-link-color: #fff;
1242912436
}
12430-
[data-bs-theme=dark] .nav-underline .nav-link:hover, [data-bs-theme=dark] .nav-underline .nav-link:focus {
12437+
[data-bs-theme=dark] .nav .nav-link:hover, [data-bs-theme=dark] .nav .nav-link:focus {
1243112438
--bs-nav-link-hover-color: #fff;
1243212439
}
1243312440
[data-bs-theme=dark] .breadcrumb a {

‎dist/brite/bootstrap.rtl.min.css‎

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

‎dist/brite/bootstrap.rtl.min.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)