]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoadd debug for browserstack-runner 12252/head
Rahul Nawani [Thu, 16 Jan 2014 06:26:08 +0000 (11:56 +0530)] 
add debug for browserstack-runner

11 years agoupdate browserstack-runner package
Rahul Nawani [Thu, 16 Jan 2014 06:25:44 +0000 (11:55 +0530)] 
update browserstack-runner package

11 years agoindentation and page header changes
Mark Otto [Wed, 15 Jan 2014 21:24:34 +0000 (13:24 -0800)] 
indentation and page header changes

11 years agoMerge branch 'master' into docs_derp
Mark Otto [Wed, 15 Jan 2014 21:08:35 +0000 (13:08 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
docs/components.html
docs/css.html

11 years agoMerge pull request #12232 from twbs/mixing-docs
Mark Otto [Wed, 15 Jan 2014 05:47:24 +0000 (21:47 -0800)] 
Merge pull request #12232 from twbs/mixing-docs

clarify docs regarding non-mixable components

11 years agoMerge pull request #12231 from twbs/callouts
Mark Otto [Wed, 15 Jan 2014 05:46:46 +0000 (21:46 -0800)] 
Merge pull request #12231 from twbs/callouts

callout severity tweaks

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 15 Jan 2014 05:45:10 +0000 (21:45 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
docs/assets/js/customize.min.js

11 years agoFixes #12210: badges in xs buttons
Mark Otto [Wed, 15 Jan 2014 05:44:38 +0000 (21:44 -0800)] 
Fixes #12210: badges in xs buttons

11 years agoclarify docs regarding non-mixable components 12232/head
Chris Rebert [Wed, 15 Jan 2014 05:26:19 +0000 (21:26 -0800)] 
clarify docs regarding non-mixable components

11 years agodowngrade .img-responsive cross-reference callout from warning to info 12231/head
Chris Rebert [Wed, 15 Jan 2014 05:03:49 +0000 (21:03 -0800)] 
downgrade .img-responsive cross-reference callout from warning to info

11 years agoupgrade form-group + input-group callout from info to warning
Chris Rebert [Wed, 15 Jan 2014 05:02:56 +0000 (21:02 -0800)] 
upgrade form-group + input-group callout from info to warning

11 years agodowngrade <label>-related callouts from danger to warning
Chris Rebert [Wed, 15 Jan 2014 05:02:06 +0000 (21:02 -0800)] 
downgrade <label>-related callouts from danger to warning

11 years agoupgrade tooltip/popover-in-groups callout from info to warning
Chris Rebert [Wed, 15 Jan 2014 05:01:09 +0000 (21:01 -0800)] 
upgrade tooltip/popover-in-groups callout from info to warning

11 years agorevert unnecessary customizations of Blob.js & FileSaver.js
Chris Rebert [Wed, 15 Jan 2014 04:37:11 +0000 (20:37 -0800)] 
revert unnecessary customizations of Blob.js & FileSaver.js

Per https://github.com/eligrey/Blob.js/pull/20
& https://github.com/eligrey/FileSaver.js/pull/63
The library author has deemed the existing /*! @source URL */ comments to be
sufficient attribution, and these already survive minification.

Refs ea591748edee4f8fe722274b71787ccf2b052c4a

11 years agoMerge pull request #12213 from twbs/browserstack
Chris Rebert [Wed, 15 Jan 2014 04:44:47 +0000 (20:44 -0800)] 
Merge pull request #12213 from twbs/browserstack

tests: run BrowserStack in parallel with Sauce Labs

11 years agoMerge pull request #12229 from twbs/richer-results
Chris Rebert [Wed, 15 Jan 2014 04:21:54 +0000 (20:21 -0800)] 
Merge pull request #12229 from twbs/richer-results

more detailed QUnit test results in Sauce

11 years agomore detailed QUnit test results in Sauce 12229/head
Chris Rebert [Wed, 15 Jan 2014 03:57:01 +0000 (19:57 -0800)] 
more detailed QUnit test results in Sauce

11 years agoMerge branch 'master' into docs_derp
Mark Otto [Tue, 14 Jan 2014 23:53:06 +0000 (15:53 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
docs/_includes/old-bs-docs.html

11 years agoDon't copy-pasta all the Sass docs because fuck keeping that up to date. Instead...
Mark Otto [Tue, 14 Jan 2014 23:52:40 +0000 (15:52 -0800)] 
Don't copy-pasta all the Sass docs because fuck keeping that up to date. Instead, point to https://github.com/twbs/bootstrap-sass/blob/master/README.md.

11 years agoadd missing semicolon
Chris Rebert [Tue, 14 Jan 2014 22:25:25 +0000 (14:25 -0800)] 
add missing semicolon

11 years agotests: run BrowserStack in parallel with Sauce Labs 12213/head
Chris Rebert [Tue, 14 Jan 2014 02:19:37 +0000 (18:19 -0800)] 
tests: run BrowserStack in parallel with Sauce Labs

Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-31922999
and internal twbs team discussion.
Effectively reverts the deletions from #11701.

11 years agoMerge pull request #12224 from twbs/raw-files-banner
Chris Rebert [Tue, 14 Jan 2014 21:28:50 +0000 (13:28 -0800)] 
Merge pull request #12224 from twbs/raw-files-banner

add copyright notice to raw-files.js

11 years agoadd copyright notice to raw-files.js 12224/head
Chris Rebert [Tue, 14 Jan 2014 21:25:27 +0000 (13:25 -0800)] 
add copyright notice to raw-files.js

11 years agoMerge pull request #12220 from ZDroid/link
Julian Thilo [Tue, 14 Jan 2014 14:03:35 +0000 (06:03 -0800)] 
Merge pull request #12220 from ZDroid/link

Link the blog post instead of main blog page

11 years agoLink the blog post instead of main blog page 12220/head
Zlatan Vasović [Tue, 14 Jan 2014 13:29:02 +0000 (14:29 +0100)] 
Link the blog post instead of main blog page

11 years agoMerge pull request #12218 from ZDroid/docs.js
Chris Rebert [Tue, 14 Jan 2014 12:49:58 +0000 (04:49 -0800)] 
Merge pull request #12218 from ZDroid/docs.js

Rename uglify.js to uglify.min.js for consistency

11 years agoRename uglify.js to uglify.min.js for consistency 12218/head
Zlatan Vasović [Tue, 14 Jan 2014 12:41:21 +0000 (13:41 +0100)] 
Rename uglify.js to uglify.min.js for consistency

11 years agoheader masthead changes
Mark Otto [Tue, 14 Jan 2014 06:59:09 +0000 (22:59 -0800)] 
header masthead changes

11 years agomake page headers like masthead
Mark Otto [Tue, 14 Jan 2014 06:54:22 +0000 (22:54 -0800)] 
make page headers like masthead

11 years agoMerge branch 'master' into docs_derp
Mark Otto [Tue, 14 Jan 2014 06:43:18 +0000 (22:43 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
docs/assets/css/pack.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js

11 years agoMerge pull request #12215 from twbs/attribution-comments
Mark Otto [Tue, 14 Jan 2014 06:38:47 +0000 (22:38 -0800)] 
Merge pull request #12215 from twbs/attribution-comments

sort out attribution banners of docs assets

11 years agosort out attribution banners of docs assets; fixes #11976 12215/head
Chris Rebert [Tue, 14 Jan 2014 05:58:27 +0000 (21:58 -0800)] 
sort out attribution banners of docs assets; fixes #11976

11 years agoavoid redundant banner in minified docs CSS
Chris Rebert [Tue, 14 Jan 2014 05:31:40 +0000 (21:31 -0800)] 
avoid redundant banner in minified docs CSS

11 years agoadd a title/description to customizer.js's attribution comment
Chris Rebert [Tue, 14 Jan 2014 05:07:17 +0000 (21:07 -0800)] 
add a title/description to customizer.js's attribution comment

11 years agoMerge pull request #12214 from twbs/slightly-newer-qunit
Chris Rebert [Tue, 14 Jan 2014 03:28:23 +0000 (19:28 -0800)] 
Merge pull request #12214 from twbs/slightly-newer-qunit

upgrade to QUnit v1.0.0

11 years agoupgrade to QUnit v1.0.0 12214/head
Chris Rebert [Tue, 14 Jan 2014 03:21:07 +0000 (19:21 -0800)] 
upgrade to QUnit v1.0.0

11 years agoRevert accidental overzealousness from 16eccc43d9
Chris Rebert [Tue, 14 Jan 2014 03:09:49 +0000 (19:09 -0800)] 
Revert accidental overzealousness from 16eccc43d9

Let's not confuse the archaeologists & historians.

11 years agoupdate to Holder.js 5b79144fa
Chris Rebert [Tue, 14 Jan 2014 01:50:17 +0000 (17:50 -0800)] 
update to Holder.js 5b79144fa

11 years agopreserve third-party attribution comments when minifying docs JS
Chris Rebert [Mon, 13 Jan 2014 09:06:48 +0000 (01:06 -0800)] 
preserve third-party attribution comments when minifying docs JS

11 years agodocument subheading syntax
Chris Rebert [Mon, 13 Jan 2014 10:37:55 +0000 (02:37 -0800)] 
document subheading syntax

11 years agoMerge branch 'master' into docs_derp
Mark Otto [Mon, 13 Jan 2014 00:10:57 +0000 (16:10 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
docs/assets/js/docs.min.js

11 years agogrunt dist build-customizer
Chris Rebert [Sun, 12 Jan 2014 22:53:21 +0000 (14:53 -0800)] 
grunt dist build-customizer

11 years agoupdate to FileSaver.js version 2013-12-27 / 0055d054ac
XhmikosR [Sun, 12 Jan 2014 22:46:23 +0000 (14:46 -0800)] 
update to FileSaver.js version 2013-12-27 / 0055d054ac

Refs #12196

11 years agoadd Blob.js separate from filesaver.js
Chris Rebert [Sun, 12 Jan 2014 22:38:30 +0000 (14:38 -0800)] 
add Blob.js separate from filesaver.js

Blob.js version 2013-12-27 / 0055d054acbca43eff44fc25c891055440685d9c
Refs #12196

11 years agoupdate less.js to v1.6.1 & use accurate filename; refs #12196
XhmikosR [Sun, 12 Jan 2014 22:32:45 +0000 (14:32 -0800)] 
update less.js to v1.6.1 & use accurate filename; refs #12196

11 years agoupdate holder.js to v2.3; refs #12196
XhmikosR [Sun, 12 Jan 2014 22:21:02 +0000 (14:21 -0800)] 
update holder.js to v2.3; refs #12196

11 years agoFormatting and docs changes
Mark Otto [Sun, 12 Jan 2014 08:04:24 +0000 (00:04 -0800)] 
Formatting and docs changes

11 years agoImprove spacing and alignment of sections and their headings
Mark Otto [Sun, 12 Jan 2014 07:15:37 +0000 (23:15 -0800)] 
Improve spacing and alignment of sections and their headings

11 years agobrand guidelines cleanup
Mark Otto [Sun, 12 Jan 2014 03:42:10 +0000 (19:42 -0800)] 
brand guidelines cleanup

11 years agohomepage improvements
Mark Otto [Sun, 12 Jan 2014 03:35:40 +0000 (19:35 -0800)] 
homepage improvements

11 years agoMerge branch 'master' into docs_derp
Mark Otto [Sun, 12 Jan 2014 03:13:10 +0000 (19:13 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
docs/getting-started.html

11 years agorm lingering reference to Recess in the docs
Chris Rebert [Sun, 12 Jan 2014 01:15:08 +0000 (17:15 -0800)] 
rm lingering reference to Recess in the docs

Refs c0200426ee72b165de400db740a60bae5d344b3c

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 11 Jan 2014 22:49:03 +0000 (14:49 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agogrunt dist
Mark Otto [Sat, 11 Jan 2014 22:48:47 +0000 (14:48 -0800)] 
grunt dist

11 years agoMerge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR...
Mark Otto [Sat, 11 Jan 2014 22:48:04 +0000 (14:48 -0800)] 
Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets

Conflicts:
package.json

11 years agoMerge pull request #12193 from ZDroid/migration
Mark Otto [Sat, 11 Jan 2014 21:08:24 +0000 (13:08 -0800)] 
Merge pull request #12193 from ZDroid/migration

Update docs per `.container-fluid` addition

11 years agoUpdate docs per `.container-fluid` addition 12193/head
Zlatan Vasović [Sat, 11 Jan 2014 21:04:33 +0000 (22:04 +0100)] 
Update docs per `.container-fluid` addition
- Remove `.container-fluid` from "removed classes".
- Container isn't fluid by default (`.container`) and `.row` isn't percentage-based, so update docs.

11 years agoDon't test Linux browsers since we don't support them officially and they're failing...
Mark Otto [Sat, 11 Jan 2014 03:04:11 +0000 (19:04 -0800)] 
Don't test Linux browsers since we don't support them officially and they're failing our tests

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 11 Jan 2014 02:57:01 +0000 (18:57 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #12171: Ensure panel groups have a bottom margin since we nuke it on child...
Mark Otto [Sat, 11 Jan 2014 02:56:44 +0000 (18:56 -0800)] 
Fixes #12171: Ensure panel groups have a bottom margin since we nuke it on child panels

11 years agorefer to correct component
Chris Rebert [Sat, 11 Jan 2014 02:56:39 +0000 (18:56 -0800)] 
refer to correct component

11 years agodocs mention for #12188
Mark Otto [Sat, 11 Jan 2014 02:47:51 +0000 (18:47 -0800)] 
docs mention for #12188

11 years agouse height adjectives for greater clarity
Chris Rebert [Fri, 10 Jan 2014 23:33:04 +0000 (15:33 -0800)] 
use height adjectives for greater clarity

11 years agodocument #11675
Chris Rebert [Fri, 10 Jan 2014 22:41:23 +0000 (14:41 -0800)] 
document #11675

11 years agorm outdated `<select>` references from comments in forms.less
Chris Rebert [Fri, 10 Jan 2014 22:34:25 +0000 (14:34 -0800)] 
rm outdated `<select>` references from comments in forms.less

11 years agoClarify that the focus docs styles are not in the repo, per https://github.com/twbs...
Mark Otto [Fri, 10 Jan 2014 05:21:51 +0000 (21:21 -0800)] 
Clarify that the focus docs styles are not in the repo, per https://github.com/twbs/bootstrap-sass/issues/497

11 years agoMerge branch 'master' into docs_derp
Mark Otto [Fri, 10 Jan 2014 04:33:55 +0000 (20:33 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
docs/assets/css/docs.css

11 years agoFixes #11990 and #12159: Make range inputs block level and 100% wide by default
Mark Otto [Fri, 10 Jan 2014 02:07:14 +0000 (18:07 -0800)] 
Fixes #11990 and #12159: Make range inputs block level and 100% wide by default

11 years agogrunt dist
Mark Otto [Fri, 10 Jan 2014 02:06:46 +0000 (18:06 -0800)] 
grunt dist

11 years agomore derp
Mark Otto [Fri, 10 Jan 2014 02:05:04 +0000 (18:05 -0800)] 
more derp

11 years agoMerge pull request #12175 from waynn/patch-3
Mark Otto [Thu, 9 Jan 2014 22:28:27 +0000 (14:28 -0800)] 
Merge pull request #12175 from waynn/patch-3

use periods for consistency in each line

11 years agomixins.less: fix typo in comment
Chris Rebert [Thu, 9 Jan 2014 21:45:10 +0000 (13:45 -0800)] 
mixins.less: fix typo in comment

11 years agouse periods for consistency in each line 12175/head
Waynn Lue [Thu, 9 Jan 2014 20:22:31 +0000 (12:22 -0800)] 
use periods for consistency in each line

11 years agoMerge pull request #12174 from ZDroid/absolute-urls
Chris Rebert [Thu, 9 Jan 2014 19:54:56 +0000 (11:54 -0800)] 
Merge pull request #12174 from ZDroid/absolute-urls

Use absolute instead of relative URLs

11 years agoUse absolute instead of relative URLs 12174/head
Zlatan Vasović [Thu, 9 Jan 2014 19:33:13 +0000 (20:33 +0100)] 
Use absolute instead of relative URLs

11 years agogrunt dist
Chris Rebert [Thu, 9 Jan 2014 19:11:13 +0000 (11:11 -0800)] 
grunt dist

11 years agoMerge pull request #12164 from thomaswelton/issue-12162
Chris Rebert [Thu, 9 Jan 2014 19:07:42 +0000 (11:07 -0800)] 
Merge pull request #12164 from thomaswelton/issue-12162

Fix value of svg font ID & removed hard coding

11 years agoMerge pull request #12163 from ZDroid/wrong-paths
Chris Rebert [Thu, 9 Jan 2014 17:59:30 +0000 (09:59 -0800)] 
Merge pull request #12163 from ZDroid/wrong-paths

Update paths in bower.json

11 years agoMerge pull request #12160 from waynn/patch-2
Chris Rebert [Thu, 9 Jan 2014 17:56:07 +0000 (09:56 -0800)] 
Merge pull request #12160 from waynn/patch-2

missing a period after "Twitter, Inc"

11 years agoUpdate paths in bower.json 12163/head
Zlatan Vasović [Thu, 9 Jan 2014 10:20:23 +0000 (11:20 +0100)] 
Update paths in bower.json

- Replace `*.html`, `docs/assets` and `examples` with `docs` (new directory)
- Instead of `_*`, it's just `_config.yml`, without regex (speeds up bower download a few milliseconds)

11 years agoAdd new varaible @icon-font-svg-id and set it to be the correct SVG font ID, used... 12164/head
thomaswelton [Thu, 9 Jan 2014 10:16:27 +0000 (10:16 +0000)] 
Add new varaible @icon-font-svg-id and set it to be the correct SVG font ID, used new variable in glyphicons.less

11 years agomissing a period after "Twitter, Inc" 12160/head
Waynn Lue [Thu, 9 Jan 2014 08:11:01 +0000 (00:11 -0800)] 
missing a period after "Twitter, Inc"

11 years agobump grunt-contrib-jade to v0.9.1
Chris Rebert [Thu, 9 Jan 2014 05:15:37 +0000 (21:15 -0800)] 
bump grunt-contrib-jade to v0.9.1

11 years agoJSHint is on crack?
Chris Rebert [Thu, 9 Jan 2014 02:45:40 +0000 (18:45 -0800)] 
JSHint is on crack?

Linting docs/grunt/bs-raw-files-generator.js ...ERROR
[L3:C5] W079: Redefinition of 'btoa'.
var btoa = require('btoa')

11 years agogrunt build-customizer
Chris Rebert [Thu, 9 Jan 2014 02:39:45 +0000 (18:39 -0800)] 
grunt build-customizer

11 years agogrunt dist
Chris Rebert [Thu, 9 Jan 2014 02:39:08 +0000 (18:39 -0800)] 
grunt dist

11 years agoMerge pull request #11158 from twbs/templated-customizer
Chris Rebert [Thu, 9 Jan 2014 02:36:32 +0000 (18:36 -0800)] 
Merge pull request #11158 from twbs/templated-customizer

Autogenerate the customizer's variables form

11 years agoadd support for '//===' for <h3>s in bs-lessdoc 11158/head
Chris Rebert [Wed, 8 Jan 2014 05:43:12 +0000 (21:43 -0800)] 
add support for '//===' for <h3>s in bs-lessdoc

11 years agoUse JS & Jade to generate the customizer variables form HTML from variables.less...
Chris Rebert [Fri, 18 Oct 2013 02:52:16 +0000 (19:52 -0700)] 
Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095

also updates variables file organization (courtesy @mdo)

11 years agoJSCS can be dumb sometimes
Chris Rebert [Mon, 9 Dec 2013 05:25:25 +0000 (21:25 -0800)] 
JSCS can be dumb sometimes

11 years agoMerge pull request #12150 from twbs/extract-from-gruntfile
Chris Rebert [Wed, 8 Jan 2014 19:01:03 +0000 (11:01 -0800)] 
Merge pull request #12150 from twbs/extract-from-gruntfile

cleanup Gruntfile by extracting executable code

11 years agoMerge pull request #12155 from Dudytz/master
Julian Thilo [Wed, 8 Jan 2014 16:20:18 +0000 (08:20 -0800)] 
Merge pull request #12155 from Dudytz/master

updated path docs-assets to docs/assets

11 years agoupdated path docs-assets to docs/assets 12155/head
Eduardo [Wed, 8 Jan 2014 15:43:56 +0000 (16:43 +0100)] 
updated path docs-assets to docs/assets

11 years agoUse single quotes in the jqueryCheck too. 11977/head
XhmikosR [Fri, 27 Dec 2013 04:08:40 +0000 (06:08 +0200)] 
Use single quotes in the jqueryCheck too.

11 years agoRemove extra newline from banner.
XhmikosR [Mon, 30 Dec 2013 06:25:52 +0000 (08:25 +0200)] 
Remove extra newline from banner.

11 years agoUse the docs banner for all the docs generated files.
XhmikosR [Fri, 27 Dec 2013 04:14:28 +0000 (06:14 +0200)] 
Use the docs banner for all the docs generated files.

11 years agoTurn advanced optimizations off until it's fixed in clean-css.
XhmikosR [Fri, 27 Dec 2013 04:01:56 +0000 (06:01 +0200)] 
Turn advanced optimizations off until it's fixed in clean-css.

11 years agoMinify docs CSS too.
XhmikosR [Sun, 22 Dec 2013 07:25:18 +0000 (09:25 +0200)] 
Minify docs CSS too.

11 years agodocs-assets: concatenate and minify all javascript files.
XhmikosR [Tue, 10 Dec 2013 22:29:42 +0000 (00:29 +0200)] 
docs-assets: concatenate and minify all javascript files.

11 years agoMerge pull request #12151 from wangsai/no-preboot
Mark Otto [Wed, 8 Jan 2014 08:52:51 +0000 (00:52 -0800)] 
Merge pull request #12151 from wangsai/no-preboot

no preboot