Skip to content

Commit 62ad700

Browse files
siddiisiddii
committed
grunt connect config
1 parent 37a01d8 commit 62ad700

285 files changed

Lines changed: 35178 additions & 34227 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bower.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"angular": ">= 1.0.7"
1313
},
1414
"devDependencies": {
15-
"jquery": ">=1.9.1",
16-
"bootstrap": ">=2.3.1"
15+
"bootstrap": "2.3.2"
1716
},
1817
"main": "./dist/angular-timer.js"
1918
}

‎bower_components/bootstrap/.bower.json‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
{
22
"name": "bootstrap",
3-
"version": "3.0.0",
3+
"version": "2.3.2",
44
"main": [
5-
"./dist/js/bootstrap.js",
6-
"./dist/css/bootstrap.css"
7-
],
8-
"ignore": [
9-
"**/.*"
5+
"./docs/assets/js/bootstrap.js",
6+
"./docs/assets/css/bootstrap.css"
107
],
118
"dependencies": {
12-
"jquery": ">= 1.9.0"
9+
"jquery": ">=1.8.0 <2.1.0"
1310
},
1411
"homepage": "https://github.com/twbs/bootstrap",
15-
"_release": "3.0.0",
12+
"_release": "2.3.2",
1613
"_resolution": {
1714
"type": "version",
18-
"tag": "v3.0.0",
19-
"commit": "e8a1df5f060bf7e6631554648e0abde150aedbe4"
15+
"tag": "v2.3.2",
16+
"commit": "b4c4072679943773a7582daa63f545ba818fa627"
2017
},
2118
"_source": "git://github.com/twbs/bootstrap.git",
22-
"_target": ">=2.3.1"
19+
"_target": "2.3.2",
20+
"_originalSource": "bootstrap"
2321
}

‎bower_components/bootstrap/.gitignore‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Numerous always-ignore extensions
2+
*.diff
3+
*.err
4+
*.orig
5+
*.log
6+
*.rej
7+
*.swo
8+
*.swp
9+
*.zip
10+
*.vi
11+
*~
12+
*.sass-cache
13+
14+
# OS or Editor folders
15+
.DS_Store
16+
._*
17+
Thumbs.db
18+
.cache
19+
.project
20+
.settings
21+
.tmproj
22+
*.esproj
23+
nbproject
24+
*.sublime-project
25+
*.sublime-workspace
26+
27+
# Komodo
28+
*.komodoproject
29+
.komodotools
30+
31+
# Folders to ignore
32+
.hg
33+
.svn
34+
.CVS
35+
.idea
36+
node_modules
37+
dist

‎bower_components/bootstrap/.travis.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
language: node_js
2+
node_js:
3+
- 0.6

‎bower_components/bootstrap/CHANGELOG.md‎

Lines changed: 368 additions & 0 deletions
Large diffs are not rendered by default.

‎bower_components/bootstrap/CNAME‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎bower_components/bootstrap/CONTRIBUTING.md‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,44 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
2323

2424

2525

26+
## Notes on the repo
27+
28+
As of v2.0.0, Bootstrap's documentation is powered by Mustache templates and built via `make` before each commit and release. This was done to enable internationalization (translation) in a future release by uploading our strings to the [Twitter Translation Center](http://translate.twttr.com/). Any edits to the docs should be first done in the Mustache files and then recompiled into the HTML.
29+
30+
31+
2632
## Pull requests
2733

2834
- Try to submit pull requests against the latest `*-wip` branch for easier merging
35+
- Any changes to the docs must be made to the Mustache templates, not just the compiled HTML pages
2936
- CSS changes must be done in .less files first, never just the compiled files
3037
- If modifying the .less files, always recompile and commit the compiled files bootstrap.css and bootstrap.min.css
3138
- Try not to pollute your pull request with unintended changes--keep them simple and small
3239
- Try to share which browsers your code has been tested in before submitting a pull request
3340

3441

3542

36-
## Coding standards
37-
38-
### HTML
43+
## Coding standards: HTML
3944

4045
- Two spaces for indentation, never tabs
4146
- Double quotes only, never single quotes
4247
- Always use proper indentation
4348
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
4449

45-
### CSS
50+
51+
52+
## Coding standards: CSS
4653

4754
- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
4855
- Multiple-line approach (one property and value per line)
4956
- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`)
5057
- End all lines with a semi-colon
51-
- For multiple, comma-separated selectors, place each selector on its own line
58+
- For multiple, comma-separated selectors, place each selector on it's own line
5259
- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
5360

54-
### JS
61+
62+
63+
## Coding standards: JS
5564

5665
- No semicolons
5766
- Comma first

‎bower_components/bootstrap/Gruntfile.js‎

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

‎bower_components/bootstrap/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,4 +173,4 @@
173173
incurred by, or claims asserted against, such Contributor by reason
174174
of your accepting any such warranty or additional liability.
175175

176-
END OF TERMS AND CONDITIONS
176+
END OF TERMS AND CONDITIONS

0 commit comments

Comments
 (0)