Skip to content

Commit b6e856a

Browse files
author
David Miller
committed
update bower version and dependencies
1 parent 00b5ca8 commit b6e856a

File tree

91 files changed

+1439
-831
lines changed

Some content is hidden

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

91 files changed

+1439
-831
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "startbootstrap-sb-admin-2",
3-
"version": "1.0.4",
3+
"version": "1.0.6",
44
"homepage": "http://startbootstrap.com/template-overviews/sb-admin-2/",
55
"authors": [
66
"David Miller"

bower_components/bootstrap/.bower.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bootstrap",
33
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
4-
"version": "3.3.2",
4+
"version": "3.3.4",
55
"keywords": [
66
"css",
77
"js",
@@ -20,7 +20,8 @@
2020
"dist/fonts/glyphicons-halflings-regular.eot",
2121
"dist/fonts/glyphicons-halflings-regular.svg",
2222
"dist/fonts/glyphicons-halflings-regular.ttf",
23-
"dist/fonts/glyphicons-halflings-regular.woff"
23+
"dist/fonts/glyphicons-halflings-regular.woff",
24+
"dist/fonts/glyphicons-halflings-regular.woff2"
2425
],
2526
"ignore": [
2627
"/.*",
@@ -35,11 +36,11 @@
3536
"dependencies": {
3637
"jquery": ">= 1.9.1"
3738
},
38-
"_release": "3.3.2",
39+
"_release": "3.3.4",
3940
"_resolution": {
4041
"type": "version",
41-
"tag": "v3.3.2",
42-
"commit": "bcf7dd38b5ab180256e2e4fb5da0369551b3f082"
42+
"tag": "v3.3.4",
43+
"commit": "a10eb60bc0b07b747fa0c4ebd8821eb7307bd07f"
4344
},
4445
"_source": "git://github.com/twbs/bootstrap.git",
4546
"_target": "~3.3.1",

bower_components/bootstrap/Gruntfile.js

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ module.exports = function (grunt) {
191191
src: 'dist/css/<%= pkg.name %>-theme.css'
192192
},
193193
docs: {
194-
src: 'docs/assets/css/src/docs.css'
194+
src: ['docs/assets/css/anchor.css', 'docs/assets/css/src/docs.css']
195195
},
196196
examples: {
197197
expand: true,
@@ -223,6 +223,8 @@ module.exports = function (grunt) {
223223

224224
cssmin: {
225225
options: {
226+
// TODO: disable `zeroUnits` optimization once clean-css 3.2 is released
227+
// and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly
226228
compatibility: 'ie8',
227229
keepSpecialComments: '*',
228230
advanced: false
@@ -237,8 +239,10 @@ module.exports = function (grunt) {
237239
},
238240
docs: {
239241
src: [
240-
'docs/assets/css/src/docs.css',
241-
'docs/assets/css/src/pygments-manni.css'
242+
'docs/assets/css/src/pygments-manni.css',
243+
'docs/assets/css/src/anchor.css',
244+
'docs/assets/css/src/docs.css'
245+
242246
],
243247
dest: 'docs/assets/css/docs.min.css'
244248
}
@@ -278,12 +282,17 @@ module.exports = function (grunt) {
278282

279283
copy: {
280284
fonts: {
285+
expand: true,
281286
src: 'fonts/*',
282287
dest: 'dist/'
283288
},
284289
docs: {
285-
src: 'dist/*/*',
286-
dest: 'docs/'
290+
expand: true,
291+
cwd: 'dist/',
292+
src: [
293+
'**/*'
294+
],
295+
dest: 'docs/dist/'
287296
}
288297
},
289298

@@ -323,22 +332,15 @@ module.exports = function (grunt) {
323332
}
324333
},
325334

326-
validation: {
335+
htmllint: {
327336
options: {
328-
charset: 'utf-8',
329-
doctype: 'HTML5',
330-
failHard: true,
331-
reset: true,
332-
relaxerror: [
333-
'Element img is missing required attribute src.',
334-
'Attribute autocomplete not allowed on element input at this point.',
335-
'Attribute autocomplete not allowed on element button at this point.',
336-
'Bad value separator for attribute role on element li.'
337+
ignore: [
338+
'Attribute "autocomplete" not allowed on element "button" at this point.',
339+
'Attribute "autocomplete" not allowed on element "input" at this point.',
340+
'Element "img" is missing required attribute "src".'
337341
]
338342
},
339-
files: {
340-
src: '_gh_pages/**/*.html'
341-
}
343+
src: '_gh_pages/**/*.html'
342344
},
343345

344346
watch: {
@@ -374,7 +376,7 @@ module.exports = function (grunt) {
374376
throttled: 10,
375377
maxRetries: 3,
376378
maxPollRetries: 4,
377-
urls: ['http://127.0.0.1:3000/js/tests/index.html'],
379+
urls: ['http://127.0.0.1:3000/js/tests/index.html?hidepassed'],
378380
browsers: grunt.file.readYAML('grunt/sauce_browsers.yml')
379381
}
380382
}
@@ -413,7 +415,7 @@ module.exports = function (grunt) {
413415
require('time-grunt')(grunt);
414416

415417
// Docs HTML validation task
416-
grunt.registerTask('validate-html', ['jekyll:docs', 'validation']);
418+
grunt.registerTask('validate-html', ['jekyll:docs', 'htmllint']);
417419

418420
var runSubset = function (subset) {
419421
return !process.env.TWBS_TEST || process.env.TWBS_TEST === subset;

bower_components/bootstrap/README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ To get started, check out <http://getbootstrap.com>!
2222

2323
## Quick start
2424

25-
Four quick start options are available:
25+
Five quick start options are available:
2626

27-
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.2.zip).
27+
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.4.zip).
2828
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
2929
- Install with [Bower](http://bower.io): `bower install bootstrap`.
30-
- Install with [npm](https://www.npmjs.org): `npm install bootstrap`.
30+
- Install with [npm](https://www.npmjs.com): `npm install bootstrap`.
31+
- Install with [Meteor](https://www.meteor.com/): `meteor add twbs:bootstrap`.
3132

3233
Read the [Getting started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more.
3334

@@ -90,7 +91,7 @@ Documentation for v2.3.2 has been made available for the time being at <http://g
9091

9192
Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
9293

93-
Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo).
94+
Moreover, if your pull request contains JavaScript patches or features, you must include [relevant unit tests](https://github.com/twbs/bootstrap/tree/master/js/tests). All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo).
9495

9596
Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
9697

@@ -100,10 +101,11 @@ Editor preferences are available in the [editor config](https://github.com/twbs/
100101

101102
Keep track of development and community news.
102103

103-
- Follow [@twbootstrap on Twitter](https://twitter.com/twbootstrap).
104+
- Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
104105
- Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
105106
- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
106107
- Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3)).
108+
- Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability.
107109

108110

109111

bower_components/bootstrap/bower.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bootstrap",
33
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
4-
"version": "3.3.2",
4+
"version": "3.3.4",
55
"keywords": [
66
"css",
77
"js",
@@ -20,7 +20,8 @@
2020
"dist/fonts/glyphicons-halflings-regular.eot",
2121
"dist/fonts/glyphicons-halflings-regular.svg",
2222
"dist/fonts/glyphicons-halflings-regular.ttf",
23-
"dist/fonts/glyphicons-halflings-regular.woff"
23+
"dist/fonts/glyphicons-halflings-regular.woff",
24+
"dist/fonts/glyphicons-halflings-regular.woff2"
2425
],
2526
"ignore": [
2627
"/.*",

bower_components/bootstrap/dist/css/bootstrap-theme.css

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

bower_components/bootstrap/dist/css/bootstrap-theme.min.css

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

bower_components/bootstrap/dist/css/bootstrap.css

Lines changed: 33 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bower_components/bootstrap/dist/css/bootstrap.css.map

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

0 commit comments

Comments
 (0)