Skip to content

Commit 0fd32ec

Browse files
committed
Merge pull request t0m#14 from michaek/master
Added LESS and SASS templates, bumped to v1.1.0.
2 parents c5c4ba2 + ac35632 commit 0fd32ec

21 files changed

+1323
-14
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
build
2+
components
3+
node_modules
4+
.sass-cache
5+
gh-pages

Gruntfile.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
module.exports = function(grunt) {
2+
3+
grunt.loadNpmTasks('grunt-contrib-nodeunit');
4+
grunt.loadNpmTasks('grunt-contrib-sass');
5+
6+
// Project configuration.
7+
grunt.initConfig({
8+
nodeunit: {
9+
all: ['test/*_test.js']
10+
},
11+
12+
sass: {
13+
options: {
14+
style: 'expanded'
15+
},
16+
dist: {
17+
files: {
18+
'docs/select2-bootstrap.css': 'lib/build.scss'
19+
}
20+
}
21+
}
22+
});
23+
24+
};

Makefile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
pages:
2+
cd gh-pages; git fetch origin
3+
cd gh-pages; git checkout gh-pages
4+
cd gh-pages; git merge origin/gh-pages
5+
rm -rf gh-pages/demo/*
6+
cp -r docs/* gh-pages/demo
7+
cd gh-pages; git add -u .
8+
cd gh-pages; git add .
9+
cd gh-pages; git commit -m "Updated gh-pages."
10+
cd gh-pages; git push origin gh-pages
11+
12+
pages_setup:
13+
mkdir gh-pages
14+
git init gh-pages
15+
cd gh-pages; git remote add origin git@github.com:t0m/select2-bootstrap-css.git

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
This is a bare bones stylesheet for making select2 fit in with bootstrap a bit better.
2-
If I have some down time I'll make this into a less file so any custom settings will
3-
carry over but for now it's targeted at the default bootstrap style.
1+
# Select2 Bootstrap CSS
2+
3+
This is a bare bones stylesheet for making select2 fit in with bootstrap a bit better.
4+
5+
The LESS file is located at lib/select2-bootstrap.less, and the SCSS file is located at lib/select2-bootstrap.scss.
6+
7+
Tests are included to verify that LESS and SCSS compile down to the target CSS. To run the tests, you'll need to install [node.js](http://nodejs.org/), [Less](http://lesscss.org/), and [SASS](http://sass-lang.com/). Then you can run:
8+
9+
npm install && bower install
10+
npm test
411

512
![preview image](http://t0m.github.com/select2-bootstrap-css/select2-preview.png)
613

bower.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"name": "select2-bootstrap-css",
3+
"version": "1.1.0",
4+
"ignore": [
5+
"**/.*",
6+
"node_modules",
7+
"components"
8+
],
9+
"devDependencies": {
10+
"bootstrap": "~2.3.1",
11+
"sass-bootstrap": "git://github.com/jlong/sass-twitter-bootstrap.git#~2.3.1"
12+
}
13+
}

docs/css/select2-spinner.gif

1.81 KB
Loading

0 commit comments

Comments
 (0)