Skip to content

Commit 749de1e

Browse files
committed
bug fix + optimized files
1 parent b3c90c9 commit 749de1e

Some content is hidden

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

48 files changed

+1555
-746
lines changed

dist/main.css

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

dist/main.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/utility.css

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

dist/utility.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.

main.scss

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/*!
2+
* Webpixels CSS v2.0.0-beta.4 (https://webpixels.io/)
3+
* Copyright 2023 Webpixels
4+
* Licensed under MIT (https://github.com/webpixels/css/blob/main/LICENSE)
5+
*/
6+
7+
8+
// Include functions first (so you can manipulate colors, SVGs, calc, etc)
9+
@import "bootstrap/scss/functions";
10+
11+
// Include any default variable overrides here
12+
@import "./variables";
13+
14+
// Include remainder of required Bootstrap stylesheets (including any separate color mode stylesheets)
15+
@import "bootstrap/scss/variables";
16+
@import "bootstrap/scss/variables-dark";
17+
18+
// Include any default map overrides here
19+
@import "./maps";
20+
21+
// Include remainder of required parts
22+
@import "bootstrap/scss/maps";
23+
@import "bootstrap/scss/mixins";
24+
@import "bootstrap/scss/root";
25+
26+
// Additional core parts
27+
@import "./core/root";
28+
@import "./core/reboot";
29+
@import "./core/type";
30+
31+
// Bootstrap components
32+
@import "bootstrap/scss/reboot";
33+
@import "bootstrap/scss/type";
34+
@import "bootstrap/scss/images";
35+
@import "bootstrap/scss/containers";
36+
@import "bootstrap/scss/grid";
37+
@import "bootstrap/scss/tables";
38+
@import "bootstrap/scss/forms";
39+
@import "bootstrap/scss/buttons";
40+
@import "bootstrap/scss/transitions";
41+
@import "bootstrap/scss/dropdown";
42+
@import "bootstrap/scss/button-group";
43+
@import "bootstrap/scss/nav";
44+
@import "bootstrap/scss/navbar";
45+
@import "bootstrap/scss/card";
46+
@import "bootstrap/scss/accordion";
47+
@import "bootstrap/scss/breadcrumb";
48+
@import "bootstrap/scss/pagination";
49+
@import "bootstrap/scss/badge";
50+
@import "bootstrap/scss/alert";
51+
@import "bootstrap/scss/progress";
52+
@import "bootstrap/scss/list-group";
53+
@import "bootstrap/scss/close";
54+
@import "bootstrap/scss/toasts";
55+
@import "bootstrap/scss/modal";
56+
@import "bootstrap/scss/tooltip";
57+
@import "bootstrap/scss/popover";
58+
@import "bootstrap/scss/carousel";
59+
@import "bootstrap/scss/spinners";
60+
@import "bootstrap/scss/offcanvas";
61+
@import "bootstrap/scss/placeholders";
62+
63+
// Webpixels components
64+
@import "./components";
65+
@import "./forms";
66+
67+
// Helpers
68+
@import "bootstrap/scss/helpers";

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "@webpixels/css",
33
"description": "Utility and component-centric design system based on Bootstrap for fast, responsive UI development.",
4-
"version": "1.2.5",
5-
"version_short": "1.2",
4+
"version": "2.0.0-beta.4",
5+
"version_short": "2.0",
66
"license": "MIT",
77
"style": "dist/index.css",
88
"sass": "index.scss",

scss/_functions.scss

Lines changed: 0 additions & 15 deletions
This file was deleted.

scss/_root.scss

Lines changed: 0 additions & 17 deletions
This file was deleted.

scss/components/_avatar.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
}
3636

3737
// Sizes
38-
.avatar-xs {
38+
.avatar-2xl {
3939
--#{$prefix}avatar-size: #{$avatar-size-2xl};
4040
--#{$prefix}avatar-font-size: #{$avatar-font-size-2xl};
4141
}

scss/components/_badge.scss

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Badge
33
//
44

5-
@import "bootstrap/scss/badge";
6-
75
.badge {
86
--#{$prefix}badge-text-transform: #{$badge-text-transform};
97
--#{$prefix}badge-line-height: #{$badge-line-height};
@@ -21,13 +19,13 @@
2119
}
2220

2321
.badge-md {
24-
--#{$prefix}badge-padding-x: .4rem;
25-
--#{$prefix}badge-padding-y: .1rem;
22+
--#{$prefix}badge-padding-x: .675rem;
23+
--#{$prefix}badge-padding-y: .375rem;
2624
}
2725

2826
.badge-lg {
29-
--#{$prefix}badge-padding-x: .6rem;
30-
--#{$prefix}badge-padding-y: .1rem;
27+
--#{$prefix}badge-padding-x: 1rem;
28+
--#{$prefix}badge-padding-y: .875rem;
3129
@include font-size($badge-lg-font-size);
3230
}
3331

0 commit comments

Comments
 (0)