diff --git a/.gitignore b/.gitignore
index e65cc06..2a7940f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
build
-components
+bower_components
node_modules
.sass-cache
gh-pages
-tmp
\ No newline at end of file
+tmp
+Gemfile.lock
+.ruby-version
diff --git a/Gemfile b/Gemfile
index 109f303..896d547 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,3 @@
source "https://rubygems.org"
-gem "jekyll"
\ No newline at end of file
+gemspec
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 1d0721d..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,38 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- classifier (1.3.3)
- fast-stemmer (>= 1.0.0)
- colorator (0.1)
- commander (4.1.3)
- highline (~> 1.6.11)
- directory_watcher (1.4.1)
- fast-stemmer (1.0.2)
- highline (1.6.19)
- jekyll (1.0.3)
- classifier (~> 1.3)
- colorator (~> 0.1)
- commander (~> 4.1.3)
- directory_watcher (~> 1.4.1)
- kramdown (~> 1.0.2)
- liquid (~> 2.3)
- maruku (~> 0.5)
- pygments.rb (~> 0.5.0)
- safe_yaml (~> 0.7.0)
- kramdown (1.0.2)
- liquid (2.5.0)
- maruku (0.6.1)
- syntax (>= 1.0.0)
- posix-spawn (0.3.6)
- pygments.rb (0.5.2)
- posix-spawn (~> 0.3.6)
- yajl-ruby (~> 1.1.0)
- safe_yaml (0.7.1)
- syntax (1.0.0)
- yajl-ruby (1.1.0)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- jekyll
diff --git a/Gruntfile.js b/Gruntfile.js
index def2415..e77e85b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,20 +1,21 @@
module.exports = function(grunt) {
-
- grunt.loadNpmTasks('grunt-contrib-nodeunit');
- grunt.loadNpmTasks('grunt-contrib-sass');
+ // load all grunt tasks
+ require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
// Project configuration.
grunt.initConfig({
nodeunit: {
all: ['test/*_test.js']
},
-
+
sass: {
options: {
- style: 'expanded'
+ style: 'expanded',
+ sourcemap: 'none'
},
dist: {
files: {
+ '_jekyll/select2-bootstrap.css': 'lib/build.scss',
'docs/select2-bootstrap.css': 'lib/build.scss',
'select2-bootstrap.css': 'lib/build.scss'
}
@@ -24,7 +25,19 @@ module.exports = function(grunt) {
'tmp/select2-bootstrap.css': 'lib/build.scss'
}
}
+ },
+
+ jshint: {
+ all: ['Gruntfile.js', '*.json']
+ },
+
+ bump: {
+ options: {
+ files: ['package.json', 'bower.json', 'lib/select2-bootstrap/version.rb'],
+ push: false
+ }
}
+
});
-};
\ No newline at end of file
+};
diff --git a/Makefile b/Makefile
index 56409a5..45f7a42 100644
--- a/Makefile
+++ b/Makefile
@@ -16,4 +16,5 @@ pages_setup:
mkdir gh-pages
git init gh-pages
cd gh-pages; git remote add origin git@github.com:t0m/select2-bootstrap-css.git
+ cd gh-pages; git fetch
cd gh-pages; git checkout gh-pages
diff --git a/README.md b/README.md
index 8133fa4..63e4837 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,15 @@
# Select2 Bootstrap CSS
-This is a bare bones stylesheet for making select2 fit in with bootstrap a bit better.
+Simple CSS to make Select2 widgets fit in with Bootstrap.
+
+* NOTE: This is the legacy repo. You probably want the official one here: https://github.com/select2/select2-bootstrap-theme
+
+--------------------------------------------------
+
+
+
+* This branch (`master`) contains the legacy version for Bootstrap 2.
+* The legacy bootstrap 3 branch is here: [`bootstrap3` branch](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3).*
The LESS file is located at lib/select2-bootstrap.less, and the SCSS file is located at lib/select2-bootstrap.scss.
@@ -11,7 +20,23 @@ Tests are included to verify that LESS and SCSS compile down to the target CSS.
## Notable Changes
-Versions prior to 1.2.0 included a default width for select2 containers. Applying the class "input-default" to you select will line the select2 container up with a default bootstrap text input.
+Versions prior to 1.2.0 included a default width for select2 containers. Applying the class "input-default" to your select will line the select2 container up with a default bootstrap text input.
+
+## Compass
+
+This library can also be used as a [Compass](http://compass-style.org/) plugin.
+
+Gemfile:
+
+ gem 'select2-bootstrap-css'
+
+compass.rb:
+
+ require 'select2-bootstrap-css'
+
+Your scss file:
+
+ @import 'select2-bootstrap';
## Demos
diff --git a/_jekyll/_layouts/default.html b/_jekyll/_layouts/default.html
index 77abfa0..401d634 100644
--- a/_jekyll/_layouts/default.html
+++ b/_jekyll/_layouts/default.html
@@ -2,10 +2,10 @@
-
-
-
-
+
+
+
+
@@ -183,7 +183,7 @@ Select2 version {{ page.version }}
-
\ No newline at end of file
+