Skip to content
This repository was archived by the owner on Feb 15, 2023. It is now read-only.

Commit cc4c195

Browse files
committed
Re-introduce select.css for the search highlight
1 parent 77bc16c commit cc4c195

File tree

6 files changed

+31
-5
lines changed

6 files changed

+31
-5
lines changed

Diff for: Gruntfile.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var bower = require('bower');
33
module.exports = function(grunt) {
44
grunt.loadNpmTasks('grunt-contrib-clean');
55
grunt.loadNpmTasks('grunt-contrib-concat');
6+
grunt.loadNpmTasks('grunt-contrib-copy');
67
grunt.loadNpmTasks('grunt-hustler');
78
grunt.loadNpmTasks('grunt-karma');
89
grunt.loadNpmTasks('grunt-conventional-changelog');
@@ -67,11 +68,20 @@ module.exports = function(grunt) {
6768
],
6869
dest: 'dist/select.js'
6970
}
71+
},
72+
73+
copy: {
74+
dist: {
75+
files: [{
76+
src: 'src/select.css',
77+
dest: 'dist/select.css'
78+
}]
79+
}
7080
}
7181
});
7282

7383
grunt.registerTask('default', ['test']);
74-
grunt.registerTask('build', ['bower', 'clean', 'ngTemplateCache', 'concat']);
84+
grunt.registerTask('build', ['bower', 'clean', 'ngTemplateCache', 'concat', 'copy']);
7585
grunt.registerTask('test', ['build', 'karma:once']);
7686
grunt.registerTask('test:watch', ['build', 'karma:watch']);
7787
grunt.registerTask('test:travis', ['build', 'karma:travis']);

Diff for: LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013 AngularUI
3+
Copyright (c) 2013-2014 AngularUI
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

Diff for: README.md

+12-3
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,23 @@ See the [online demo](http://plnkr.co/edit/GtOOWE?p=preview).
1010
- Support themes from Select2 (default theme) and Selectize (default, Bootstrap 2 & 3 themes)
1111
- Keyboard support
1212
- jQuery not required (except for old browsers)
13+
- Small code base: 250 lines of JavaScript vs 20 KB for select2.min.js
1314

1415
For the roadmap, check [issue #3](https://github.com/angular-ui/ui-select/issues/3) and the [Wiki page](https://github.com/angular-ui/ui-select/wiki/Roadmap).
1516

16-
## Browser support
17+
## Browser compatibility
1718

1819
Starting from Internet Explorer 8 and Firefox 3.6 included.
1920

2021
## Installation using [Bower](http://bower.io/)
2122

2223
- `bower install angular-ui-select`
23-
- Inside your HTML add `<script src="bower_components/ui-select/dist/select.js"></script>`
24-
- Add one of the themes supported by Select2 `<link rel="stylesheet" href=".../select2.css">` or Selectize `<link rel="stylesheet" href=".../selectize.*.css">`
24+
- Inside your HTML add
25+
- select.js: `<script src="bower_components/ui-select/dist/select.js"></script>`
26+
- select.css: `<link rel="stylesheet" href="bower_components/ui-select/dist/select.css">`
27+
- Add one of the supported themes:
28+
- Select2 (version ~3.4.5): `<link rel="stylesheet" href=".../select2.css">`
29+
- Selectize (version ~0.8.5): `<link rel="stylesheet" href=".../selectize.*.css">`
2530
- Check the [online demo](http://plnkr.co/edit/GtOOWE?p=preview) to see how to use ui-select
2631

2732
## Run the tests
@@ -37,3 +42,7 @@ To run the tests:
3742
grunt build # Build dist/select.js
3843
grunt test # Launches Karma
3944
```
45+
46+
## Contributing
47+
48+
When issuing a pull request, please exclude changes in the "dist" folder to avoid merge conflicts.

Diff for: dist/select.css

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.ui-select-highlight {
2+
font-weight: bold;
3+
}

Diff for: package.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"grunt": "~0.4.2",
77
"grunt-contrib-clean": "~0.4.0",
88
"grunt-contrib-concat": "~0.1.2",
9+
"grunt-contrib-copy": "~0.5.0",
910
"grunt-hustler": "~4.0.6",
1011
"grunt-karma": "~0.7.2",
1112
"karma": "~0.11.14",

Diff for: src/select.css

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.ui-select-highlight {
2+
font-weight: bold;
3+
}

0 commit comments

Comments
 (0)