Skip to content

Commit 5e9d23c

Browse files
AndreiIgnaAndreiIgna
committed
Updated - Bootstrap to v5.1, colors as bg- class
1 parent b4a3d54 commit 5e9d23c

8 files changed

Lines changed: 439 additions & 386 deletions

File tree

‎components.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -208,33 +208,33 @@ <h6 class="card-text">Named colors</h6>
208208
<h6 class="card-text">Light colors</h6>
209209
<div class="row mb-4">
210210
<div class="col my-1">
211-
<div class="p-2 rounded bg-primary-light">
211+
<div class="p-2 rounded bg-purple-300">
212212
<p class="mb-2"><code>#xxx</code></p>
213-
<p class="text-white mb-0">primary-light</p>
213+
<p class="text-white mb-0">purple-300</p>
214214
</div>
215215
</div>
216216
<div class="col my-1">
217-
<div class="p-2 rounded bg-primary-lighter">
217+
<div class="p-2 rounded bg-purple-100">
218218
<p class="mb-2"><code>#xxx</code></p>
219-
<p class="mb-0">primary-lighter</p>
219+
<p class="mb-0">purple-100</p>
220220
</div>
221221
</div>
222222
<div class="col my-1">
223-
<div class="p-2 rounded bg-secondary-light">
223+
<div class="p-2 rounded bg-gray-400">
224224
<p class="mb-2"><code>#xxx</code></p>
225-
<p class="mb-0">secondary-light</p>
225+
<p class="mb-0">gray-400</p>
226226
</div>
227227
</div>
228228
<div class="col my-1">
229-
<div class="p-2 rounded bg-info-light">
229+
<div class="p-2 rounded bg-blue-100">
230230
<p class="mb-2"><code>#xxx</code></p>
231-
<p class="mb-0">info-light</p>
231+
<p class="mb-0">blue-100</p>
232232
</div>
233233
</div>
234234
<div class="col my-1">
235-
<div class="p-2 rounded bg-success-light">
235+
<div class="p-2 rounded bg-green-100">
236236
<p class="mb-2"><code>#xxx</code></p>
237-
<p class="mb-0">success-light</p>
237+
<p class="mb-0">green-100</p>
238238
</div>
239239
</div>
240240
<div class="col my-1">
@@ -553,7 +553,7 @@ <h5 class="subtitle">Layered Design</h5>
553553
<ul class="nicer-list">
554554
<li><a href="#">Submenu</a></li>
555555
<li><a href="#">Support</a></li>
556-
<li><span class="badge badge-outline-dark js-version">v1.5.2</span></li>
556+
<li><span class="badge badge-outline-dark js-version">v1.5.3</span></li>
557557
</ul>
558558
</div>
559559
<div class="col-xs-6 col-md-3">

‎dist/layered.css‎

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/layered.js‎

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/layered.js.LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap v5.0.2 (https://getbootstrap.com/)
2+
* Bootstrap v5.1.0 (https://getbootstrap.com/)
33
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
55
*/

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ <h5 class="subtitle">Layered Design</h5>
204204
<ul class="nicer-list">
205205
<li><a href="#">Submenu</a></li>
206206
<li><a href="#">Support</a></li>
207-
<li><span class="badge badge-outline-dark js-version">v1.5.2</span></li>
207+
<li><span class="badge badge-outline-dark js-version">v1.5.3</span></li>
208208
</ul>
209209
</div>
210210
<div class="col-xs-6 col-md-3">

‎package-lock.json‎

Lines changed: 381 additions & 368 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
@@ -1,6 +1,6 @@
11
{
22
"name": "@layered/layered-design",
3-
"version": "1.5.2",
3+
"version": "1.5.3",
44
"description": "Layered design system, based on Bootstrap",
55
"style": "dist/layered.css",
66
"sass": "src/layered.scss",

‎src/layered.scss‎

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,51 @@
1111
@import "~bootstrap/scss/functions";
1212
@import "~bootstrap/scss/variables";
1313

14-
@import 'utilities';
15-
1614
@import "~bootstrap/scss/mixins";
1715
@import "~bootstrap/scss/utilities";
1816

17+
$all-colors: map-merge-multiple($blues, $indigos, $purples, $pinks, $reds, $oranges, $yellows, $greens, $teals, $cyans, $grays);
18+
19+
$utilities: map-merge(
20+
$utilities,
21+
(
22+
"background-color": map-merge(
23+
map-get($utilities, "background-color"),
24+
(
25+
values: map-merge(
26+
map-get(map-get($utilities, "background-color"), "values"),
27+
(
28+
$all-colors
29+
),
30+
),
31+
),
32+
),
33+
)
34+
);
35+
36+
// temp
37+
.bg-primary-light {
38+
background-color: $purple-300;
39+
}
40+
.bg-primary-lighter {
41+
background-color: $purple-100;
42+
}
43+
.bg-secondary-light {
44+
background-color: $gray-300;
45+
}
46+
.bg-info-light {
47+
background-color: $blue-100;
48+
}
49+
.bg-success-light {
50+
background-color: $green-100;
51+
}
52+
.bg-warning-light {
53+
background-color: $orange-100;
54+
}
55+
.bg-danger-light {
56+
background-color: $red-100;
57+
}
58+
1959

2060
// Bootstrap Layout & components
2161
@import "~bootstrap/scss/root";

0 commit comments

Comments
 (0)