Skip to content

Commit

Permalink
added holder.js library;
Browse files Browse the repository at this point in the history
fixed issue with dropdowns;
fixed jquery-ui vs bootstrap-button conflicts;
fixed typeahead styling;
updated version number;
  • Loading branch information
andrew-ml committed Oct 7, 2014
1 parent 4d8bdb3 commit f05e2a8
Show file tree
Hide file tree
Showing 13 changed files with 11,203 additions and 11,241 deletions.
17 changes: 9 additions & 8 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,6 @@ module.exports = function (grunt) {
},
dist: {
src: [
'<%= bower_conf.directory %>/bootstrap/dist/js/bootstrap.js',

'<%= bower_conf.directory %>/bootstrap-switch/dist/js/bootstrap-switch.js',
'<%= bower_conf.directory %>/bootstrap-tagsinput/dist/bootstrap-tagsinput.js',
'<%= bower_conf.directory %>/typeahead.js/dist/typeahead.bundle.js',
'<%= bower_conf.directory %>/videojs/dist/video-js/video.js',
'<%= bower_conf.directory %>/select2/select2.js',

'<%= bower_conf.directory %>/jquery-ui/ui/jquery.ui.core.js',
'<%= bower_conf.directory %>/jquery-ui/ui/jquery.ui.widget.js',
'<%= bower_conf.directory %>/jquery-ui/ui/jquery.ui.mouse.js',
Expand All @@ -82,6 +74,15 @@ module.exports = function (grunt) {
'<%= bower_conf.directory %>/jquery-ui/ui/jquery.ui.effect.js',
'<%= bower_conf.directory %>/jquery-ui-touch-punch/jquery.ui.touch-punch.js',

'<%= bower_conf.directory %>/bootstrap/dist/js/bootstrap.js',

'<%= bower_conf.directory %>/bootstrap-switch/dist/js/bootstrap-switch.js',
'<%= bower_conf.directory %>/bootstrap-tagsinput/dist/bootstrap-tagsinput.js',
'<%= bower_conf.directory %>/holderjs/holder.js',
'<%= bower_conf.directory %>/typeahead.js/dist/typeahead.bundle.js',
'<%= bower_conf.directory %>/videojs/dist/video-js/video.js',
'<%= bower_conf.directory %>/select2/select2.js',

'js/*.js',
'!js/application.js'
],
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To get started, check out [getting started page](http://designmodo.github.io/Fla

Three quick start options are available:

- [Download the latest release](https://github.com/designmodo/Flat-UI/archive/2.2.0.zip).
- [Download the latest release](https://github.com/designmodo/Flat-UI/archive/2.2.1.zip).
- Clone the repo: `git clone https://github.com/designmodo/Flat-UI.git`.
- Install with [Bower](http://bower.io): `bower install flat-ui`.

Expand Down
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flat-ui",
"version": "2.2.0",
"version": "2.2.1",
"main": [
"less/flat-ui.less",
"dist/css/flat-ui.css",
Expand All @@ -19,6 +19,7 @@
"jquery-ui": "~1.10.4",
"bootstrap": "~3.2.0",
"bootstrap-switch": "~3.0.2",
"holderjs": "~2.4.0",
"html5shiv": "~3.7.2",
"jquery-ui-touch-punch": "*",
"respond": "~1.4.2",
Expand Down
64 changes: 3 additions & 61 deletions dist/css/flat-ui.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/flat-ui.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/css/flat-ui.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit f05e2a8

Please sign in to comment.