Skip to content

Commit

Permalink
Bump version to 0.1.0-beta.9.
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Kissling committed Aug 31, 2016
1 parent 6a62caf commit 5cbe8dc
Show file tree
Hide file tree
Showing 25 changed files with 2,032 additions and 1,486 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ bower_components
node_modules
.sass-cache
.grunt
.idea
tmp
25 changes: 18 additions & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ module.exports = function(grunt) {

sass: {
options: {
style: 'expanded',
outputStyle: 'expanded',
sourcemap: 'none',
// Increase Sass' default (5) precision to 9 to match Less output.
// Increase Sass' number "precision" to 8 to match Less output.
//
// @see https://github.com/twbs/bootstrap-sass#sass-number-precision
// @see https://github.com/sass/node-sass/issues/673#issue-57581701
// @see https://github.com/sass/sass/issues/1122
precision: 9
precision: 8
},
dist: {
files: {
Expand Down Expand Up @@ -48,11 +48,11 @@ module.exports = function(grunt) {
bump: {
options: {
files: [
'package.json',
'bower.json'
'package.json'
],
push: false,
createTag: false
createTag: false,
commit: false
}
},

Expand Down Expand Up @@ -143,7 +143,7 @@ module.exports = function(grunt) {
processors: [
// Autoprefixer browser settings as required by Bootstrap
//
// @see https://github.com/twbs/bootstrap-sass/tree/master/#sass-autoprefixer
// @see https://github.com/twbs/bootstrap-sass#sass-autoprefixer
require('autoprefixer')({browsers: [
"Android 2.3",
"Android >= 4",
Expand Down Expand Up @@ -177,6 +177,17 @@ module.exports = function(grunt) {
dest: 'src/select2-bootstrap.less'
}]
}
},

// Only used to generate CSS for the tests.
less: {
test: {
options: {
sourceMap: false
},
src: 'src/build.less',
dest: 'tmp/select2-bootstrap.css'
}
}

});
Expand Down
73 changes: 50 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
A [Select2](https://select2.github.io/) v4 [Theme](https://select2.github.io/examples.html#themes) for Bootstrap 3
![select2-bootstrap-theme version](https://img.shields.io/badge/select2--bootstrap--theme-v0.1.0--beta.8-brightgreen.svg)
![select2-bootstrap-theme version](https://img.shields.io/badge/select2--bootstrap--theme-v0.1.0--beta.9-brightgreen.svg)
[![License](http://img.shields.io/badge/License-MIT-blue.svg)](http://opensource.org/licenses/MIT)

Demonstrations available at
Demonstrations available at
[select2.github.io/select2-bootstrap-theme](http://select2.github.io/select2-bootstrap-theme/)

##### Compatibility
#### Compatibility

Tested with Bootstrap v3.3.6 and Select2 v4.0.3 in latest Chrome, Firefox and Safari (Mac) and Internet Explorer 11 and 10.
Built and tested with Bootstrap v3.3.7 and Select2 v4.0.3 in latest Chrome, Firefox and Safari (Mac) and Internet Explorer 11 and 10.

##### Installation
#### Installation

You can [download select2-bootstrap-theme from this GitHub repo](https://github.com/select2/select2-bootstrap-theme/releases), install it using Bower or npm, or source it directly from CDNJS.

###### Install using Bower or npm
##### Install using Bower or npm

You may install select2-bootstrap-theme with [Bower](https://bower.io/) or [npm](https://www.npmjs.com/):

Expand All @@ -25,13 +25,13 @@ bower install select2-bootstrap-theme
npm install select2-bootstrap-theme
```

###### Source select2-bootstrap-theme from CDNJS
##### Source select2-bootstrap-theme from CDNJS

select2-bootstrap-theme [is also available on CDNJS](https://cdnjs.com/libraries/select2-bootstrap-theme/).

##### Usage
#### Usage

The Select2 Bootstrap Theme only works with Select2 v4.x. Applying the theme requires `select2-bootstrap.css` referenced after the default `select2.css` that comes with Select2:
select2-bootstrap-theme only works with Select2 v4.x. Applying the theme requires `select2-bootstrap.css` referenced after the default `select2.css` that comes with Select2:

```html
<link rel="stylesheet" href="select2.css">
Expand All @@ -46,49 +46,76 @@ $( "#dropdown" ).select2({
});
```

##### Changelog
You may also set it as the default theme for all Select2 widgets like so:

###### 0.1.0-beta.8
```js
$.fn.select2.defaults.set( "theme", "bootstrap" );
```

#### Changelog

##### 0.1.0-beta.9

* Built on Bootstrap 3 v3.3.7 and corresponding bootstrap-sass.
* Prefixed all Sass and Less variables with `s2bs` to avoid conflicts and improve customizability as select2-bootstrap-theme does not "force" you to use (specific) Bootstrap Sass/Less variables anymore; a nice side effect is that we now also provide (a raw) documentation for the inherited Bootstrap variables in one place.
* Added Sass and Less variables to override select2-bootstrap-themes default `font-size`, `color` and vertical `padding` for `.select2-results__group`. [[#19](https://github.com/select2/select2-bootstrap-theme/issues/19)]
* Added Sass and Less variables replacing hardcoded values in styles for `.select2-selection__clear`, `.select2-selection__choice__remove` and `.select2-selection__choice`.
* Added padding to root level `.select2-results__option` – fixes alignment of `.select2-results__message` and `.select2-results__option--load-more`. [[#28](https://github.com/select2/select2-bootstrap-theme/issues/28)]
* Removed `font-family` definition for `.select2-container--bootstrap .select2-selection`. [[#50](https://github.com/select2/select2-bootstrap-theme/issues/50)]
* Added Select2 and Bootstrap as dependencies in `bower.json` – fingers crossed, low hopes. [[#52](https://github.com/select2/select2-bootstrap-theme/issues/52)]
* Added "repository" to `bower.json`.
* Sass is now compiled using [LibSass](https://github.com/sass/libsass/)/[node-sass](https://github.com/sass/node-sass) instead of [Ruby Sass](https://github.com/sass/sass) (and [grunt-sass](https://github.com/sindresorhus/grunt-sass) instead of [grunt-contrib-sass](https://github.com/gruntjs/grunt-contrib-sass)).
* Decreased Sass number precision from 9 to 8 – now Sass numbers really matches its Less counterpart.
* Added Grunt task to compile Less and altered Less test (via [grunt-contrib-less](https://github.com/gruntjs/grunt-contrib-less)).
* Switched Sass and Less source tab size/indention from four to two spaces.
* Updated development dependencies: Autoprefixer to v6.4.0 (was v6.3.6), diff to v2.2.3 (was v2.2.2), grunt-gh-pages to v1.2.0 (was v1.1.0).
* Docs: Added "plain" (not nested in an `<optgroup>`) options to the "State" Select2.
* Docs: Updated AnchorJS to v3.2.1 (was v3.1.1), Bootstrap to v3.3.7 (was v3.3.6), jQuery to v1.12.4 (was v1.11.2).
* Docs: Enabled pagination for AJAX examples (in context of [#28](https://github.com/select2/select2-bootstrap-theme/issues/28)).
* Docs: Brought back demo pages for different Select2 releases (covering all of 4.0.x via [cdnjs](https://cdnjs.com/libraries/select2)).
* Docs: Removed empty `<option>` from the "Select2 multi append Radiobutton" demo (which resulted in problems tracked in [11](https://github.com/select2/select2-bootstrap-theme/issues/11)).

##### 0.1.0-beta.8

* Fixed bower.jsons "main" field [[#45](https://github.com/select2/select2-bootstrap-theme/pull/45)].
* Do no re-assign the `$form-control-default-box-shadow`, `$form-control-focus-box-shadow`, and `$form-control-transition` Sass variables if they are already assigned [[#45](https://github.com/select2/select2-bootstrap-theme/pull/45)].
* Fixed bower.jsons "main" field. [[#45](https://github.com/select2/select2-bootstrap-theme/pull/45)]
* Do no re-assign the `$form-control-default-box-shadow`, `$form-control-focus-box-shadow`, and `$form-control-transition` Sass variables if they are already assigned. [[#45](https://github.com/select2/select2-bootstrap-theme/pull/45)]

###### 0.1.0-beta.7
##### 0.1.0-beta.7

* Fixed version number in distribution files.

###### 0.1.0-beta.6
##### 0.1.0-beta.6

* Fixed a bug where math would not compile correctly in Less v2.6.0 [[#36](https://github.com/select2/select2-bootstrap-theme/pull/36)].
* Fixed a bug where math would not compile correctly in Less v2.6.0. [[#36](https://github.com/select2/select2-bootstrap-theme/pull/36)]
* Fixed version number for Bower and NPM.
* Docs: Updated AnchorJS to latest version.

###### 0.1.0-beta.5
##### 0.1.0-beta.5

* Updated all development dependencies.
* Added Browsersync, Autoprefixer (as required by bootstrap-sass) and scss2less to the build process.
* Built on Bootstrap 3 v3.3.6 and corresponding bootstrap-sass.
* Rewrote the sizing class CSS to work with `containerCssClass` option available with the full Select2 build. [[#34](https://github.com/select2/select2-bootstrap-theme/issues/34)]
* Added copyright and license information. [[#43](https://github.com/select2/select2-bootstrap-theme/issues/43)]

###### 0.1.0-beta.4
##### 0.1.0-beta.4

* Added missing styles for `.select2-container--focus`. [[#18](https://github.com/select2/select2-bootstrap-theme/issues/18)]
* Added support for Bootstrap's [`.form-inline`](http://getbootstrap.com/css/#forms-inline). [[#13](https://github.com/select2/select2-bootstrap-theme/pull/13)]
* Added basic styles for `.select2-selection__clear` in `.select2-selection--multiple`. [[#11](https://github.com/select2/select2-bootstrap-theme/issues/11)]
* Brought Less source in line with the Sass version and fixed Less patch file and test. [[3e86f34](https://github.com/select2/select2-bootstrap-theme/commit/3e86f34f6c94302cd8b4d6c3d751c5fb70fe61f6)]

###### 0.1.0-beta.3
##### 0.1.0-beta.3

* Fixed specifity problems with `.form-control.select2-hidden-accessible`.

###### 0.1.0-beta.2
##### 0.1.0-beta.2

* Added Less version.

###### 0.1.0-beta.1
##### 0.1.0-beta.1

##### Contributing
#### Contributing

The project offers [Less](http://lesscss.org/) and [Sass](http://sass-lang.com/) sources for building `select2-bootstrap.css`; both make use of variables from either [Bootstrap](https://github.com/twbs/bootstrap) (Less) or [Bootstrap for Sass](https://github.com/twbs/bootstrap-sass). The demo pages are built using [Jekyll](http://jekyllrb.com/) and there are a bunch of [Grunt](http://gruntjs.com/) tasks to ease development.

Expand All @@ -109,6 +136,6 @@ Develop in `src/select2-bootstrap.scss` and test your changes using `grunt watch

`grunt scss2less` helps in converting the Sass source to its Less counterpart (and overwrites the existing `src/select2-bootstrap.less`), but doesn't do the full job – please review the changes to the Less source file and make the necessary adjustments.

##### Copyright and license
#### Copyright and license

The license is available within the repository in the [LICENSE](LICENSE) file.
14 changes: 11 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,18 @@
"node_modules",
"components"
],
"dependencies": {
"bootstrap": "^3.3.4",
"select2": "^4.0.0"
},
"devDependencies": {
"bootstrap": "^3.3.6",
"bootstrap-sass": "bootstrap-sass-official#^3.3.6",
"bootstrap": "^3.3.7",
"bootstrap-sass": "^3.3.7",
"respond": "^1.4.2",
"anchor-js": "^3.1.1"
"anchor-js": "^3.2.1"
},
"repository": {
"type": "git",
"url": "[email protected]:select2/select2-bootstrap-theme.git"
}
}
Loading

0 comments on commit 5cbe8dc

Please sign in to comment.