Skip to content

Commit adb0221

Browse files
authored
Merge pull request #54 from webpixels/v3-dev
Updated main branch to latest version (v3.0.0)
2 parents bb2c590 + ff71eab commit adb0221

160 files changed

Lines changed: 1197 additions & 3213 deletions

File tree

Some content is hidden

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

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ script
1515
package-lock.json
1616

1717
# we ignore this because everything in src/ is copied out in script/prepublish
18-
src/
18+
scss/

README.md

Lines changed: 7 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,31 @@
11
<p align="center"><a href="https://webpixels.io?ref=github" target="_blank"><img src="https://webpixels.s3.eu-central-1.amazonaws.com/public/github/logo.png" width="200" height=""></a></p>
22

3-
<h3 align="center">Webpixels CSS <sup>2</sup></h3>
3+
<h3 align="center">Webpixels CSS <sup>3</sup></h3>
44

55
<p align="center">
66
Utility and component-centric Design System based on Bootstrap for fast, responsive UI development.
77
<br>
8-
<a href="https://docs.webpixels.io"><strong>Explore Documentation »</strong></a>
9-
<br>
10-
<br>
11-
<a href="https://github.com/orgs/webpixels/discussions">Community</a>
12-
·
13-
<a href="https://webpixels.io/library">Components</a>
14-
·
15-
<a href="https://webpixels.io/blog/">Blog</a>
8+
<a href="https://webpixels.io/docs?ref=github"><strong>Documentation »</strong></a>
169
</p>
1710

18-
<p align="center"><a href="https://webpixels.io?ref=github" target="_blank"><img src="https://webpixels.s3.eu-central-1.amazonaws.com/public/github/products/css.png" ></a></p>
19-
20-
## Install via npm
21-
22-
For most projects (and to take advantage of the customization features), you'll want to install Webpixels CSS and its peer-dependencies via npm.
23-
24-
```txt
25-
npm install -D @webpixels/css@2.0.0 bootstrap@5.3.3
26-
```
27-
28-
This will automatically install the latest Bootstrap version, so you don't need to do that manually.
29-
30-
## Create the Sass files
31-
32-
In your `scss` folder create two new files and name them:
33-
34-
- main.scss
35-
- utility.scss
36-
37-
### Import the base styles and components
38-
39-
In your main.scss, you’ll import the source Sass files. Bootstrap is automatically loaded when you use the source files, so you don't need to worry about what Bootstrap files should you incorporate in your styles.
40-
41-
```scss
42-
@import "@webpixels/css/main";
43-
```
44-
45-
### Import the utility classes
46-
47-
In Webpixels CSS you'll notice that we don't create custom styles, but rather make use of the utility classes. We are using the new Bootstrap Utility API to generate a comprehensive list of classes.
48-
49-
In your utility.scss you'll import all the utilities:
50-
51-
```scss
52-
@import "@webpixels/css/utility";
53-
```
11+
---
5412

5513
## Documentation
5614

57-
Check out our [documentation website](https://learn.webpixels.io?ref=github).
58-
59-
## Build Tools
15+
Check out our [documentation website](https://webpixels.io/docs?ref=github).
6016

61-
If you want to see how it works, check out these functional examples of using Bootstrap and Webpixels in common JS frameworks like Parcel, Vite, and more!
62-
63-
[See all examples](https://github.com/webpixels/css/tree/master/examples)
64-
65-
## UI components library
17+
## UI Blocks
6618

6719
Explore, copy, use and mix hundreds of carefully crafted components made just for Bootstrap.
6820

69-
[Explore components](https://webpixels.io/components?ref=github)
70-
71-
## Beautiful designer-made templates
72-
73-
Get your new web design project started with these amazing templates, or copy and paste elements into your existing projects to give them a creative boost.
74-
75-
[Explore templates](https://webpixels.io/templates?ref=github)
21+
[Explore components](https://webpixels.io/library?ref=github)
7622

7723
## Community
7824

7925
Get updates on the development of our CSS tool and chat with the project maintainers and community members.
8026

8127
- Follow [@webpixels_](https://twitter.com/intent/user?screen_name=webpixels_) on Twitter (X)
82-
- Get inspired through our designs on [Dribbble](https://dribbble.com/webpixels)
83-
- Read and subscribe to [The Official Webpixels Blog](https://webpixels.io/blog)
28+
- Read and subscribe to [The Official Blog](https://webpixels.io/blog)
8429
- Join our community on [GitHub](https://github.com/orgs/webpixels/discussions)
8530

8631
## Thank you

cli/init.js

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

cli/make.js

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

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@webpixels/css",
33
"description": "Utility and component-centric design system based on Bootstrap for fast, responsive UI development.",
4-
"version": "2.0.4",
5-
"version_short": "2.0",
4+
"version": "3.0.0-beta.2",
5+
"version_short": "3.0",
66
"license": "MIT",
7-
"style": "dist/index.css",
8-
"sass": "index.scss",
7+
"style": "dist/all.css",
8+
"sass": "all.scss",
99
"keywords": [
1010
"webpixels",
1111
"bootstrap",
@@ -45,7 +45,7 @@
4545
"devDependencies": {
4646
"@popperjs/core": "^2.11.8",
4747
"autoprefixer": "^10.4.20",
48-
"bootstrap": "^5.3.3",
48+
"bootstrap": "^5.3.8",
4949
"find-unused-sass-variables": "^6.0.0",
5050
"fs-extra": "^11.3.0",
5151
"install": "^0.13.0",

scss/_accordion.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "bootstrap/scss/accordion";

scss/_alert.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "bootstrap/scss/alert";
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
//
2-
// Badge
3-
//
1+
@import "bootstrap/scss/badge";
42

53
.badge {
64
--#{$prefix}badge-text-transform: #{$badge-text-transform};
75
--#{$prefix}badge-line-height: #{$badge-line-height};
86

97
text-transform: var(--#{$prefix}badge-text-transform);
108
line-height: var(--#{$prefix}badge-line-height);
11-
129
}
1310

1411
// Size variations
1512
.badge-xs {
1613
--#{$prefix}badge-padding-x: .5rem;
1714
--#{$prefix}badge-padding-y: .1rem;
18-
font-size: 70%;
15+
font-size: 75%;
1916
}
2017

2118
.badge-md {

scss/_breadcrumb.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "bootstrap/scss/breadcrumb";

0 commit comments

Comments
 (0)