Skip to content

Commit

Permalink
Merge pull request #2 from apalfrey/develop
Browse files Browse the repository at this point in the history
Bugfixes for 1.0.1
  • Loading branch information
apalfrey committed Mar 2, 2021
2 parents 78e6c01 + fdcb099 commit 592d082
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 16 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[![Dependencies](https://img.shields.io/david/apalfrey/select2-bootstrap-5-theme?style=for-the-badge)](https://david-dm.org/apalfrey/select2-bootstrap-5-theme)

[Select2](https://github.com/select2/select2) v4 theme for Bootstrap 5, inspired by [select2-bootstrap4-theme](https://github.com/ttskch/select2-bootstrap4-theme)
**Currently only works for Select2 v4.1.0**

## Examples
https://apalfrey.github.io/select2-bootstrap-5-theme/
Expand All @@ -14,8 +15,8 @@ https://apalfrey.github.io/select2-bootstrap-5-theme/
### CDN

```html
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/select2@4.0.13/dist/css/select2.min.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].0/dist/select2-bootstrap-5-theme.min.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].1/dist/select2-bootstrap-5-theme.min.css" />
```

### Package Managers
Expand Down
3 changes: 2 additions & 1 deletion dist/select2-bootstrap-5-theme.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Select2 v4 Bootstrap 5 theme v1.0.0
* Select2 v4 Bootstrap 5 theme v1.0.1
*/
.select2-container--bootstrap-5 {
display: block;
Expand Down Expand Up @@ -195,6 +195,7 @@
.select2-container--bootstrap-5 .select2-selection--multiple .select2-selection__rendered {
display: flex;
flex-direction: row;
flex-wrap: wrap;
margin: 0;
list-style: none;
}
Expand Down
4 changes: 2 additions & 2 deletions dist/select2-bootstrap-5-theme.min.css

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion docs/select2-bootstrap-5-theme.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Select2 v4 Bootstrap 5 theme v1.0.0
* Select2 v4 Bootstrap 5 theme v1.0.1
*/
.select2-container--bootstrap-5 {
display: block;
Expand Down Expand Up @@ -195,6 +195,7 @@
.select2-container--bootstrap-5 .select2-selection--multiple .select2-selection__rendered {
display: flex;
flex-direction: row;
flex-wrap: wrap;
margin: 0;
list-style: none;
}
Expand Down
5 changes: 1 addition & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ const compile = ( style ) => {
.pipe( sass( {
precision: 6,
outputStyle: style,
errLogToConsole: true,
includePaths: [
"node_modules"
]
errLogToConsole: true
} ) )
.pipe( postcss( [
autoprefixer( {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "select2-bootstrap-5-theme",
"description": "Select2 v4 theme for Bootstrap 5",
"version": "1.0.0",
"version": "1.0.1",
"license": "MIT",
"author": "Andrew Palfrey <[email protected]>",
"repository": {
Expand All @@ -27,7 +27,7 @@
],
"main": "",
"style": "dist/select2-bootstrap-5-theme.css",
"sass": "scss/select2-bootstrap-5-theme.scss",
"sass": "src/select2-bootstrap-5-theme.scss",
"dependencies": {
"bootstrap": "5.0.0-beta2"
},
Expand Down
1 change: 1 addition & 0 deletions src/_multiple.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.select2-selection__rendered {
display: flex;
flex-direction: row;
flex-wrap: wrap;
margin: 0;
list-style: none;

Expand Down
8 changes: 4 additions & 4 deletions src/select2-bootstrap-5-theme.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*!
* Select2 v4 Bootstrap 5 theme v1.0.0
* Select2 v4 Bootstrap 5 theme v1.0.1
*/

@import "bootstrap/scss/functions";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/mixins";
@import "node_modules/bootstrap/scss/functions";
@import "node_modules/bootstrap/scss/variables";
@import "node_modules/bootstrap/scss/mixins";

@import "variables";

Expand Down

0 comments on commit 592d082

Please sign in to comment.