Skip to content

Commit b23269a

Browse files
dragonstyledragonstyle
committed
Update to latest version of bslib
1 parent 615a07c commit b23269a

File tree

12 files changed

+80
-80
lines changed

12 files changed

+80
-80
lines changed

‎configuration‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export ESBUILD=0.12.10
1616

1717
# Bootstrap dependencies from bslib
1818
# (use commit hash from bslib repo)
19-
export BOOTSTRAP=839c75bc963810694537c986015482f3cbad64cc
19+
export BOOTSTRAP=888fbe064491692deb56fd90dc23455052e31073
2020
export BOOTSTRAP_FONT=1.7.0
2121
export BOOTSWATCH=5.1.3
2222

‎src/resources/formats/html/bootstrap/dist/scss/_forms.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ $shiny-radio-inline: $shiny-radio + "-inline";
55
$form-check-input-selector: ".form-check-input, " +
66
$shiny-check + " input, " + $shiny-check-inline + " input, " +
77
$shiny-radio + " input, " + $shiny-radio-inline + " input, ";
8+
$form-check-label-selector: ".form-check-label, " +
9+
$shiny-check + " label, " + $shiny-check-inline + " label, " +
10+
$shiny-radio + " label, " + $shiny-radio-inline + " label, ";
811

912
@import "forms/labels";
1013
@import "forms/form-text";

‎src/resources/formats/html/bootstrap/dist/scss/_variables.scss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ $form-check-min-height: $font-size-base * $line-height-base !d
904904
$form-check-padding-start: 0 !default;
905905
$form-check-margin-bottom: .125rem !default;
906906
$form-check-label-color: null !default;
907-
$form-check-label-cursor: null !default;
907+
$form-check-label-cursor: pointer !default;
908908
$form-check-transition: null !default;
909909

910910
$form-check-input-active-filter: brightness(90%) !default;
@@ -1140,11 +1140,11 @@ $navbar-toggler-transition: box-shadow .15s ease-in-out !default;
11401140

11411141
// scss-docs-start navbar-theme-variables
11421142
$navbar-bg: null !default; // Background color for any navbarPage()
1143-
$navbar-dark-bg: $navbar-bg !default; // Background color for navbarPage(inverse = TRUE)
1144-
$navbar-light-bg: $navbar-bg !default; // Background color for navbarPage(inverse = FALSE)
1143+
$navbar-dark-bg: if($navbar-bg, $navbar-bg, $dark) !default; // Background color for navbarPage(inverse = TRUE)
1144+
$navbar-light-bg: if($navbar-bg, $navbar-bg, $light) !default; // Background color for navbarPage(inverse = FALSE)
11451145

1146-
$navbar-dark-contrast: if($navbar-dark-bg, color-contrast($navbar-dark-bg), $white) !default; // Deepest contrasting color for navbarPage(inverse = TRUE). Defaults to $white or $black based on luminance of $navbar-dark-bg
1147-
$navbar-light-contrast: if($navbar-light-bg, color-contrast($navbar-light-bg), $black) !default; // Deepest contrasting color for navbarPage(inverse = FALSE). Defaults to $white or $black based on luminance of $navbar-light-bg
1146+
$navbar-dark-contrast: color-contrast($navbar-dark-bg) !default; // Deepest contrasting color for navbarPage(inverse = TRUE). Defaults to $white or $black based on luminance of $navbar-dark-bg
1147+
$navbar-light-contrast: color-contrast($navbar-light-bg) !default; // Deepest contrasting color for navbarPage(inverse = FALSE). Defaults to $white or $black based on luminance of $navbar-light-bg
11481148

11491149
$navbar-dark-color: rgba($navbar-dark-contrast, .55) !default;
11501150
$navbar-dark-hover-color: rgba($navbar-dark-contrast, .75) !default;

‎src/resources/formats/html/bootstrap/dist/scss/forms/_form-check.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@
9494
// See: https://github.com/twbs/bootstrap/issues/28247
9595
&[disabled],
9696
&:disabled {
97-
~ .form-check-label {
97+
~ .form-check-label, ~ span {
9898
opacity: $form-check-label-disabled-opacity;
9999
}
100100
}
101101
}
102102

103-
.form-check-label {
103+
#{$form-check-label-selector} {
104104
color: $form-check-label-color;
105105
cursor: $form-check-label-cursor;
106106
}

‎src/resources/formats/html/bootstrap/themes/darkly.scss‎

Lines changed: 57 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,28 @@ $green: #00bc8c !default;
2929
$teal: #20c997 !default;
3030
$cyan: #3498db !default;
3131

32+
// Body
33+
34+
$body-bg: $gray-900 !default;
35+
$body-color: $white !default;
36+
@function body-mix($weight) {
37+
@return mix($body-bg, $body-color, $weight);
38+
}
39+
3240
$primary: $blue !default;
33-
$secondary: $gray-700 !default;
41+
$secondary: body-mix(85%) !default;
3442
$success: $green !default;
3543
$info: $cyan !default;
3644
$warning: $yellow !default;
3745
$danger: $red !default;
38-
$light: $gray-500 !default;
39-
$dark: $gray-800 !default;
46+
// This is inconsistent with Bootstrap semantics. That is, $dark
47+
// should actually be a light color in a dark mode setting, :shrug:
48+
// https://github.com/thomaspark/bootswatch/issues/989
49+
$light: body-mix(65%) !default;
50+
$dark: body-mix(95%) !default;
4051

4152
$min-contrast-ratio: 1.9 !default;
4253

43-
// Body
44-
45-
$body-bg: $gray-900 !default;
46-
$body-color: $white !default;
47-
4854
// Links
4955

5056
$link-color: $success !default;
@@ -56,114 +62,110 @@ $font-family-sans-serif: Lato, -apple-system, BlinkMacSystemFont, "Segoe UI
5662
$h1-font-size: 3rem !default;
5763
$h2-font-size: 2.5rem !default;
5864
$h3-font-size: 2rem !default;
59-
$text-muted: $gray-600 !default;
65+
$text-muted: body-mix(75%) !default;
6066

6167
// Tables
6268

63-
$table-border-color: $gray-700 !default;
69+
$table-border-color: body-mix(85%) !default;
6470

6571
$table-bg-scale: 0 !default;
6672

6773
// Forms
6874

6975
$input-bg: $white !default;
70-
$input-color: $gray-800 !default;
76+
$input-color: body-mix(95%) !default;
7177
$input-border-color: $body-bg !default;
72-
$input-group-addon-color: $gray-500 !default;
73-
$input-group-addon-bg: $gray-700 !default;
78+
$input-group-addon-color: body-mix(65%) !default;
79+
$input-group-addon-bg: body-mix(85%) !default;
7480

75-
$form-check-input-bg: $white !default;
81+
$form-check-input-bg: $body-color !default;
7682
$form-check-input-border: none !default;
7783

78-
$form-file-button-color: $white !default;
84+
$form-file-button-color: $body-color !default;
7985

8086
// Dropdowns
8187

82-
$dropdown-bg: $gray-900 !default;
83-
$dropdown-border-color: $gray-700 !default;
84-
$dropdown-divider-bg: $gray-700 !default;
85-
$dropdown-link-color: $white !default;
86-
$dropdown-link-hover-color: $white !default;
88+
$dropdown-bg: $body-bg !default;
89+
$dropdown-border-color: body-mix(85%) !default;
90+
$dropdown-divider-bg: body-mix(85%) !default;
91+
$dropdown-link-color: $body-color !default;
92+
$dropdown-link-hover-color: $body-color !default;
8793
$dropdown-link-hover-bg: $primary !default;
8894

8995
// Navs
9096

9197
$nav-link-padding-x: 2rem !default;
92-
$nav-link-disabled-color: $gray-500 !default;
93-
$nav-tabs-border-color: $gray-700 !default;
98+
$nav-link-disabled-color: body-mix(65%) !default;
99+
$nav-tabs-border-color: body-mix(85%) !default;
94100
$nav-tabs-link-hover-border-color: $nav-tabs-border-color $nav-tabs-border-color transparent !default;
95-
$nav-tabs-link-active-color: $white !default;
101+
$nav-tabs-link-active-color: $body-color !default;
96102
$nav-tabs-link-active-border-color: $nav-tabs-border-color $nav-tabs-border-color transparent !default;
97103

98104
// Navbar
99105

100106
$navbar-padding-y: 1rem !default;
101-
$navbar-dark-color: rgba($white, .6) !default;
102-
$navbar-dark-hover-color: $white !default;
103-
$navbar-light-color: rgba($gray-900, .7) !default;
104-
$navbar-light-hover-color: $gray-900 !default;
105-
$navbar-light-active-color: $gray-900 !default;
106-
$navbar-light-toggler-border-color: rgba($gray-900, .1) !default;
107+
$navbar-light-bg: $primary !default;
108+
$navbar-dark-bg: $success !default;
107109

108110
// Pagination
109111

110-
$pagination-color: $white !default;
112+
$pagination-color: $body-color !default;
111113
$pagination-bg: $success !default;
112114
$pagination-border-width: 0 !default;
113115
$pagination-border-color: transparent !default;
114-
$pagination-hover-color: $white !default;
116+
$pagination-hover-color: $body-color !default;
115117
$pagination-hover-bg: lighten($success, 10%) !default;
116118
$pagination-hover-border-color: transparent !default;
117119
$pagination-active-bg: $pagination-hover-bg !default;
118120
$pagination-active-border-color: transparent !default;
119-
$pagination-disabled-color: $white !default;
121+
$pagination-disabled-color: $body-color !default;
120122
$pagination-disabled-bg: darken($success, 15%) !default;
121123
$pagination-disabled-border-color: transparent !default;
122124

123125
// Cards
124126

125-
$card-cap-bg: $gray-700 !default;
126-
$card-bg: $gray-800 !default;
127+
$card-cap-bg: body-mix(85%) !default;
128+
$card-bg: body-mix(95%) !default;
127129

128130
// Popovers
129131

130-
$popover-bg: $gray-800 !default;
131-
$popover-header-bg: $gray-700 !default;
132+
$popover-bg: body-mix(95%) !default;
133+
$popover-header-bg: body-mix(85%) !default;
132134

133135
// Toasts
134136

135-
$toast-background-color: $gray-700 !default;
136-
$toast-header-background-color: $gray-800 !default;
137+
$toast-background-color: body-mix(85%) !default;
138+
$toast-header-background-color: body-mix(95%) !default;
137139

138140
// Modals
139141

140-
$modal-content-bg: $gray-800 !default;
141-
$modal-content-border-color: $gray-700 !default;
142-
$modal-header-border-color: $gray-700 !default;
142+
$modal-content-bg: body-mix(95%) !default;
143+
$modal-content-border-color: body-mix(85%) !default;
144+
$modal-header-border-color: body-mix(85%) !default;
143145

144146
// Progress bars
145147

146-
$progress-bg: $gray-700 !default;
148+
$progress-bg: body-mix(85%) !default;
147149

148150
// List group
149151

150152
$list-group-color: $body-color !default;
151-
$list-group-bg: $gray-800 !default;
152-
$list-group-border-color: $gray-700 !default;
153-
$list-group-hover-bg: $gray-700 !default;
153+
$list-group-bg: body-mix(95%) !default;
154+
$list-group-border-color: body-mix(85%) !default;
155+
$list-group-hover-bg: body-mix(85%) !default;
154156
$list-group-action-hover-color: $list-group-color !default;
155-
$list-group-action-active-bg: $gray-900 !default;
157+
$list-group-action-active-bg: body-mix(99%) !default;
156158

157159
// Breadcrumbs
158160

159161
$breadcrumb-padding-y: .375rem !default;
160162
$breadcrumb-padding-x: .75rem !default;
161-
$breadcrumb-bg: $gray-700 !default;
163+
$breadcrumb-bg: body-mix(85%) !default;
162164
$breadcrumb-border-radius: .25rem !default;
163165

164166
// Close
165167

166-
$btn-close-color: $white !default;
168+
$btn-close-color: $body-color !default;
167169
$btn-close-opacity: .4 !default;
168170
$btn-close-hover-opacity: 1 !default;
169171

@@ -187,14 +189,14 @@ $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0
187189

188190
.blockquote {
189191
&-footer {
190-
color: $gray-600;
192+
color: body-mix(75%);
191193
}
192194
}
193195

194196
// Forms
195197

196198
.input-group-addon {
197-
color: $white;
199+
color: $body-color;
198200
}
199201

200202
.form-floating > label {
@@ -212,12 +214,12 @@ $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0
212214
.nav-item.open .nav-link,
213215
.nav-item.open .nav-link:focus,
214216
.nav-item.open .nav-link:hover {
215-
color: $white;
217+
color: $body-color;
216218
}
217219
}
218220

219221
.breadcrumb a {
220-
color: $white;
222+
color: $body-color;
221223
}
222224

223225
.pagination {
@@ -230,18 +232,18 @@ $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0
230232

231233
.alert {
232234
border: none;
233-
color: $white;
235+
color: $body-color;
234236

235237
a,
236238
.alert-link {
237-
color: $white;
239+
color: $body-color;
238240
text-decoration: underline;
239241
}
240242

241243
@each $color, $value in $theme-colors {
242244
&-#{$color} {
243245
@if $enable-gradients {
244-
background: $value linear-gradient(180deg, mix($white, $value, 15%), $value) repeat-x;
246+
background: $value linear-gradient(180deg, mix($body-color, $value, 15%), $value) repeat-x;
245247
} @else {
246248
background-color: $value;
247249
}

‎src/resources/formats/html/bootstrap/themes/sandstone.scss‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ $nav-tabs-link-active-bg: $white !default;
7272
$nav-pills-link-active-color: $gray-600 !default;
7373
$nav-pills-link-active-bg: $gray-200 !default;
7474

75-
// Navbar
76-
77-
$navbar-dark-hover-color: $white !default;
78-
$navbar-light-hover-color: $black !default;
79-
$navbar-light-active-color: $black !default;
8075

8176
// Pagination
8277

‎src/resources/formats/html/bootstrap/themes/sketchy.scss‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@ select.form-control {
320320
border-radius: $border-radius-lg-sketchy !important;
321321
}
322322

323-
[type="checkbox"] {
324-
position: relative !important;
323+
#{$shiny-check} input, #{$shiny-check-inline} input, [type="checkbox"] {
324+
position: relative;
325325
appearance: none;
326326
-webkit-appearance: none;
327327
-moz-appearance: none;
@@ -361,8 +361,8 @@ select.form-control {
361361
}
362362
}
363363

364-
[type="radio"] {
365-
position: relative !important;
364+
#{$shiny-radio} input, #{$shiny-radio-inline} input, [type="radio"] {
365+
position: relative;
366366
appearance: none;
367367
-webkit-appearance: none;
368368
-moz-appearance: none;
@@ -396,7 +396,11 @@ select.form-control {
396396
}
397397
}
398398

399-
.form-check-input {
399+
#{$shiny-check}, #{$shiny-check-inline}, #{$shiny-radio}, #{$shiny-radio-inline} {
400+
span { padding-left: 1rem; }
401+
}
402+
403+
#{$form-check-input-selector} {
400404
&:focus {
401405
box-shadow: none;
402406
}

‎src/resources/formats/html/bootstrap/themes/slate.scss‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ $nav-tabs-link-active-border-color: $nav-tabs-border-color !default;
119119
// Navbar
120120

121121
$navbar-padding-y: 0 !default;
122-
$navbar-dark-hover-color: $contrast-bg !default;
123-
$navbar-light-hover-color: body-mix(66.7%) !default;
124-
$navbar-light-active-color: body-mix(66.7%) !default;
125122

126123

127124
// Pagination

‎src/resources/formats/html/bootstrap/themes/spacelab.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,
9797
}
9898
}
9999

100-
&.bg-light {
100+
&.bg-light, &.navbar-default {
101101
.nav-link,
102102
.navbar-brand {
103103
text-shadow: 1px 1px 0 rgba(255, 255, 255, .1);

‎src/resources/formats/html/bootstrap/themes/superhero.scss‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ $nav-tabs-link-active-border-color: body-mix(80%) !default;
113113

114114
// Navbar
115115

116-
$navbar-dark-color: rgba($contrast-bg, .75) !default;
117-
$navbar-dark-hover-color: $contrast-bg !default;
118116

119117
// Pagination
120118

0 commit comments

Comments
 (0)