Skip to content
This repository was archived by the owner on Sep 1, 2022. It is now read-only.

Commit dae8780

Browse files
committed
Use bootstrap-tags 1.1 instead of master, and ignore some files.
1 parent 4b81942 commit dae8780

File tree

9 files changed

+17
-133
lines changed

9 files changed

+17
-133
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,6 @@ moment/min/*
6161
text-encoding/index.js
6262
text-encoding/lib/encoding-indexes.js
6363

64+
# Bootstrap-tags excludes
65+
bootstrap-tags/Guardfile
66+
bootstrap-tags/sass/*.scss

bootstrap-tags/.bower.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"name": "bootstrap-tags",
3+
"version": "1.1.5",
34
"homepage": "http://github.com/maxwells/bootstrap-tags",
45
"bugs": "https://github.com/maxwells/bootstrap-tags/issues",
56
"authors": [
67
"Max Lahey <maxwellslahey@gmail.com>"
78
],
8-
"description": "Bootstrap-themed jquery tag interface",
9+
"description": "Boostrap-themed jquery tag interface",
910
"main": [
1011
"dist/js/bootstrap-tags.js",
1112
"dist/css/bootstrap-tags.css"
@@ -32,13 +33,13 @@
3233
"scripts": {
3334
"test": "grunt jasmine"
3435
},
35-
"_release": "b29420d14a",
36+
"_release": "1.1.5",
3637
"_resolution": {
37-
"type": "branch",
38-
"branch": "master",
39-
"commit": "b29420d14a273bf18fce5063bb2a432381ca05d2"
38+
"type": "version",
39+
"tag": "1.1.5",
40+
"commit": "893dd88dcc0d2c9fb1ee72b882830085ef748e7c"
4041
},
4142
"_source": "git://github.com/maxwells/bootstrap-tags.git",
42-
"_target": "master",
43+
"_target": "~1.1",
4344
"_originalSource": "bootstrap-tags"
4445
}

bootstrap-tags/Guardfile

Lines changed: 0 additions & 7 deletions
This file was deleted.

bootstrap-tags/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ $('selector').tags({
6262
option | type | description | default
6363
-------|------|-------------|---------
6464
`bootstrapVersion` | `String` | specify which version of bootstrap to format generated HTML for. Acceptable values are "2", "3" | `3`
65-
`tagData` | `Array` | a list of tags to initialize the tagging interface with | `[]`
65+
`tagData` | `Array` | a list of tags to initialize the tagging interace with | `[]`
6666
`tagSize` | `String` | describes what size input to use. Acceptable values are "lg", "md", or "sm" | `md`
6767
`readOnly` | `boolean` | whether or not to disable user input | `false`
6868
`suggestions` | `Array` | a list of terms that will populate the autosuggest feature when a user types in the first character. | `[]`
@@ -121,7 +121,7 @@ For a one off:
121121

122122
$ grunt build
123123

124-
_To build continuously_:
124+
_To build continously_:
125125

126126
$ grunt watch
127127

bootstrap-tags/bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "bootstrap-tags",
3-
"version": "1.1.5",
3+
"version": "1.1.3",
44
"homepage": "http://github.com/maxwells/bootstrap-tags",
55
"bugs": "https://github.com/maxwells/bootstrap-tags/issues",
66
"authors": [
77
"Max Lahey <maxwellslahey@gmail.com>"
88
],
9-
"description": "Bootstrap-themed jquery tag interface",
9+
"description": "Boostrap-themed jquery tag interface",
1010
"main": [
1111
"dist/js/bootstrap-tags.js",
1212
"dist/css/bootstrap-tags.css"

bootstrap-tags/dist/js/bootstrap-tags.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* bootstrap-tags 1.1.5
2+
* bootstrap-tags 1.1.0
33
* https://github.com/maxwells/bootstrap-tags
44
* Copyright 2013 Max Lahey; Licensed MIT
55
*/

bootstrap-tags/dist/js/bootstrap-tags.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bootstrap-tags/sass/bootstrap-tags.scss

Lines changed: 0 additions & 113 deletions
This file was deleted.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"bootstrap": "components/bootstrap#~3.1",
77
"bootstrap-tour": "0.9.0",
88
"codemirror": "~4.6.0",
9-
"bootstrap-tags": "master",
9+
"bootstrap-tags": "1.1",
1010
"font-awesome": "components/font-awesome#~4.2.0",
1111
"google-caja": "5669",
1212
"highlight.js": "~7",

0 commit comments

Comments
 (0)