Skip to content

Commit a0fc3ef

Browse files
PanderMusubiPanderMusubi
committed
upgrade Bootstrap 5.3.5 including Bootswatch
1 parent 802b10a commit a0fc3ef

File tree

111 files changed

+18107
-4295
lines changed

Some content is hidden

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

111 files changed

+18107
-4295
lines changed

‎CHANGES.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Changelog
22
=========
33

4+
- Upgrade to Bootstrap 5.3.5, including Bootswatch (adding theme Brite).
5+
46
2.4.2
57
-----
68

‎examples/bootstrap5/app.py‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -101,31 +101,32 @@ class BootswatchForm(FlaskForm):
101101
default='default',
102102
choices=[
103103
('default', 'none'),
104-
('cerulean', 'Cerulean 5.3.1'),
105-
('cosmo', 'Cosmo 5.3.1'),
106-
('cyborg', 'Cyborg 5.3.1'),
107-
('darkly', 'Darkly 5.3.1'),
108-
('flatly', 'Flatly 5.3.1'),
109-
('journal', 'Journal 5.3.1'),
110-
('litera', 'Litera 5.3.1'),
111-
('lumen', 'Lumen 5.3.1'),
112-
('lux', 'Lux 5.3.1'),
113-
('materia', 'Materia 5.3.1'),
114-
('minty', 'Minty 5.3.1'),
115-
('morph', 'Morph 5.3.1'),
116-
('pulse', 'Pulse 5.3.1'),
117-
('quartz', 'Quartz 5.3.1'),
118-
('sandstone', 'Sandstone 5.3.1'),
119-
('simplex', 'Simplex 5.3.1'),
120-
('sketchy', 'Sketchy 5.3.1'),
121-
('slate', 'Slate 5.3.1'),
122-
('solar', 'Solar 5.3.1'),
123-
('spacelab', 'Spacelab 5.3.1'),
124-
('superhero', 'Superhero 5.3.1'),
125-
('united', 'United 5.3.1'),
126-
('vapor', 'Vapor 5.3.1'),
127-
('yeti', 'Yeti 5.3.1'),
128-
('zephyr', 'Zephyr 5.3.1'),
104+
('brite', 'Brite 5.3.5'),
105+
('cerulean', 'Cerulean 5.3.5'),
106+
('cosmo', 'Cosmo 5.3.5'),
107+
('cyborg', 'Cyborg 5.3.5'),
108+
('darkly', 'Darkly 5.3.5'),
109+
('flatly', 'Flatly 5.3.5'),
110+
('journal', 'Journal 5.3.5'),
111+
('litera', 'Litera 5.3.5'),
112+
('lumen', 'Lumen 5.3.5'),
113+
('lux', 'Lux 5.3.5'),
114+
('materia', 'Materia 5.3.5'),
115+
('minty', 'Minty 5.3.5'),
116+
('morph', 'Morph 5.3.5'),
117+
('pulse', 'Pulse 5.3.5'),
118+
('quartz', 'Quartz 5.3.5'),
119+
('sandstone', 'Sandstone 5.3.5'),
120+
('simplex', 'Simplex 5.3.5'),
121+
('sketchy', 'Sketchy 5.3.5'),
122+
('slate', 'Slate 5.3.5'),
123+
('solar', 'Solar 5.3.5'),
124+
('spacelab', 'Spacelab 5.3.5'),
125+
('superhero', 'Superhero 5.3.5'),
126+
('united', 'United 5.3.5'),
127+
('vapor', 'Vapor 5.3.5'),
128+
('yeti', 'Yeti 5.3.5'),
129+
('zephyr', 'Zephyr 5.3.5'),
129130
]
130131
)
131132
submit = SubmitField()

‎flask_bootstrap/__init__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,11 @@ def create_app():
276276
277277
.. versionadded:: 2.0.0
278278
"""
279-
bootstrap_version = '5.3.2'
279+
bootstrap_version = '5.3.5'
280280
popper_version = '2.11.8'
281281
icons_version = '1.11.3'
282-
bootstrap_css_integrity = 'sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN'
283-
bootstrap_js_integrity = 'sha384-BBtl+eGJRgqQAUMxJ7pMwbEyER4l1g+O15P+16Ep7Q9Q+zqX6gSbd85u4mG4QzX+'
282+
bootstrap_css_integrity = 'sha384-SgOJa3DmI69IUzQ2PVdRZhwQ+dy64/BUtbMJw1MZ8t5HZApcHrRKUc4W0kG879m7'
283+
bootstrap_js_integrity = 'sha384-VQqxDN0EQCkWoxt/0vsQvZswzTHUVOImccYmSyhJTp7kGtPed0Qcx8rK9h9YEgx+'
284284
popper_integrity = 'sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r'
285285
popper_name = '@popperjs/core'
286286
static_folder = 'bootstrap5'

‎flask_bootstrap/static/bootstrap5/css/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.

‎flask_bootstrap/static/bootstrap5/css/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.

‎flask_bootstrap/static/bootstrap5/css/bootswatch/brite/_bootswatch.scss‎

Lines changed: 312 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,312 @@
1+
// Brite 5.3.5
2+
// Bootswatch
3+
4+
5+
// Variables
6+
7+
:root {
8+
--#{$prefix}border-width: 2px;
9+
--#{$prefix}border-color: #000;
10+
}
11+
12+
[data-bs-theme="light"],
13+
[data-bs-theme="dark"] {
14+
--#{$prefix}border-color: #000;
15+
}
16+
17+
// Mixins
18+
19+
@mixin btn-shadow(){
20+
box-shadow: 3px 3px 0 0 var(--#{$prefix}border-color);
21+
}
22+
23+
.table {
24+
border: 2px solid $black;
25+
}
26+
27+
// Navbar
28+
29+
.navbar {
30+
$navbar-border-width: 2px;
31+
font-size: $font-size-lg;
32+
font-weight: $headings-font-weight;
33+
34+
border: $navbar-border-width solid $black;
35+
36+
&.fixed-top {
37+
border-width: 0 0 $navbar-border-width 0;
38+
}
39+
40+
&.fixed-bottom {
41+
border-width: $navbar-border-width 0 0 0;
42+
}
43+
44+
.dropdown-toggle::after {
45+
margin-left: .15em;
46+
vertical-align: .15em;
47+
}
48+
49+
&-toggler {
50+
--bs-border-width: 2px;
51+
}
52+
}
53+
54+
// Buttons
55+
56+
.btn {
57+
margin: 3px 0 0 3px;
58+
border-color: $black;
59+
@include btn-shadow();
60+
transition: all .3s;
61+
transform: translate(-3px, -3px);
62+
63+
&:hover {
64+
border-color: $black;
65+
box-shadow: none;
66+
transform: translate(0, 0);
67+
}
68+
69+
&.disabled {
70+
border-color: $black;
71+
}
72+
73+
&-link,
74+
&-link:hover {
75+
color: $black;
76+
}
77+
}
78+
79+
@each $color, $value in $theme-colors {
80+
.btn-outline-#{$color} {
81+
color: $black;
82+
background-color: #{$value};
83+
box-shadow: none;
84+
transform: translate(0, 0);
85+
86+
&:hover {
87+
@include btn-shadow();
88+
transform: translate(-3px, -3px);
89+
}
90+
}
91+
92+
.btn-check + .btn-#{$color},
93+
.btn-check + .btn-outline-#{$color} {
94+
&:hover {
95+
background-color: #{$value};
96+
}
97+
}
98+
}
99+
100+
.btn-outline-dark {
101+
color: $white;
102+
}
103+
104+
.btn-group {
105+
.btn {
106+
margin-left: 0;
107+
}
108+
}
109+
110+
.btn-group,
111+
.btn-group-vertical {
112+
.btn {
113+
&:hover,
114+
&:active,
115+
&:focus {
116+
z-index: 0;
117+
}
118+
119+
}
120+
121+
> .btn-check:focus + .btn,
122+
> .btn-check:checked + .btn {
123+
z-index: 0;
124+
}
125+
}
126+
127+
.btn-check + .btn {
128+
border-color: $black;
129+
@include btn-shadow();
130+
transform: translate(-3px, -3px);
131+
}
132+
133+
.btn-check + .btn:hover {
134+
color: $black;
135+
border-color: $black;
136+
}
137+
138+
.btn-check:checked + .btn,
139+
:not(.btn-check) + .btn:active,
140+
.btn:first-child:active,
141+
.btn.active,
142+
.btn.show {
143+
border-color: $black;
144+
box-shadow: none;
145+
transform: translate(0, 0);
146+
}
147+
148+
// Typography
149+
150+
a {
151+
font-weight: $headings-font-weight;
152+
}
153+
154+
// Forms
155+
156+
.form-range {
157+
158+
&:not([disabled])::-moz-range-progress {
159+
height: .6rem;
160+
background-color: $primary;
161+
border-radius: 6px 0 0 6px;
162+
}
163+
164+
&:not([disabled])::-ms-fill-lower {
165+
height: .6rem;
166+
background-color: $primary;
167+
border-radius: 6px 0 0 6px;
168+
}
169+
170+
&::-webkit-slider-runnable-track {
171+
border: 2px solid $black;
172+
}
173+
174+
&::-moz-range-track {
175+
border: 2px solid $black;
176+
}
177+
178+
&::-webkit-slider-thumb {
179+
margin-top: -.4rem;
180+
}
181+
182+
&::-moz-range-thumb {
183+
margin-top: -.4rem;
184+
}
185+
186+
&:focus::-webkit-slider-thumb {
187+
box-shadow: none;
188+
}
189+
190+
&:focus::-moz-range-thumb {
191+
box-shadow: none;
192+
}
193+
}
194+
195+
// Navs
196+
197+
.nav-tabs {
198+
gap: 4px;
199+
padding: .4rem .4rem calc(.4rem + 2px);
200+
font-weight: $headings-font-weight;
201+
border: 2px solid $black;
202+
border-radius: $border-radius-lg;
203+
204+
.nav-link {
205+
border-width: 2px;
206+
border-radius: $border-radius;
207+
208+
&.active,
209+
&:hover {
210+
border: 2px solid $black;
211+
}
212+
}
213+
}
214+
215+
.tab-content {
216+
padding: 1rem;
217+
margin-top: 1rem;
218+
border: 2px solid $black;
219+
border-radius: $border-radius-lg;
220+
}
221+
222+
.nav-pills {
223+
gap: 4px;
224+
font-weight: $headings-font-weight;
225+
226+
.nav-link {
227+
border: 2px solid $black;
228+
}
229+
}
230+
231+
.breadcrumb {
232+
font-weight: $headings-font-weight;
233+
border: 2px solid $black;
234+
235+
a {
236+
color: $black;
237+
}
238+
}
239+
240+
.dropdown-menu {
241+
@include btn-shadow();
242+
border-radius: $border-radius;
243+
}
244+
245+
.dropdown-header {
246+
font-weight: 700;
247+
}
248+
249+
.dropdown-item:hover, .dropdown-item:focus {
250+
color: #000;
251+
}
252+
253+
@each $color, $value in $theme-colors {
254+
.list-group-item-#{$color} {
255+
color: $black;
256+
background-color: #{$value};
257+
border-color: $black;
258+
}
259+
}
260+
261+
.list-group-item-dark {
262+
color: $white;
263+
}
264+
265+
// Indicators
266+
267+
.alert {
268+
color: $black;
269+
border: 2px solid $black;
270+
@include btn-shadow();
271+
}
272+
273+
.alert-link {
274+
color: $black;
275+
}
276+
277+
.alert-dark {
278+
color: $white;
279+
}
280+
281+
@each $color, $value in $theme-colors {
282+
.alert-#{$color} {
283+
background-color: #{$value};
284+
}
285+
}
286+
287+
.badge {
288+
border: 2px solid $black;
289+
290+
&.bg-dark {
291+
color: $white;
292+
}
293+
}
294+
295+
.progress {
296+
border: 2px solid $black;
297+
298+
&-bar {
299+
border-right: 2px solid $black;
300+
}
301+
}
302+
303+
.modal {
304+
&-content {
305+
@include btn-shadow();
306+
}
307+
}
308+
309+
.vr {
310+
width: 2px;
311+
background-color: $black;
312+
}

0 commit comments

Comments
 (0)