]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Julian Thilo [Wed, 15 Jan 2014 21:18:35 +0000 (22:18 +0100)]
Set Jekyll encoding and tweak Windows notes
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
Mark Otto [Wed, 15 Jan 2014 05:46:46 +0000 (21:46 -0800)]
Merge pull request #12231 from twbs/callouts
callout severity tweaks
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
Mark Otto [Wed, 15 Jan 2014 05:44:38 +0000 (21:44 -0800)]
Fixes #12210: badges in xs buttons
Chris Rebert [Wed, 15 Jan 2014 05:26:19 +0000 (21:26 -0800)]
clarify docs regarding non-mixable components
Chris Rebert [Wed, 15 Jan 2014 05:03:49 +0000 (21:03 -0800)]
downgrade .img-responsive cross-reference callout from warning to info
Chris Rebert [Wed, 15 Jan 2014 05:02:56 +0000 (21:02 -0800)]
upgrade form-group + input-group callout from info to warning
Chris Rebert [Wed, 15 Jan 2014 05:02:06 +0000 (21:02 -0800)]
downgrade <label>-related callouts from danger 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
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
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
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
Chris Rebert [Wed, 15 Jan 2014 03:57:01 +0000 (19:57 -0800)]
more detailed QUnit test results in Sauce
Chris Rebert [Tue, 14 Jan 2014 22:25:25 +0000 (14:25 -0800)]
add missing semicolon
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.
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
Chris Rebert [Tue, 14 Jan 2014 21:25:27 +0000 (13:25 -0800)]
add copyright notice to raw-files.js
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
Zlatan Vasović [Tue, 14 Jan 2014 13:29:02 +0000 (14:29 +0100)]
Link the blog post instead of main blog page
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
Zlatan Vasović [Tue, 14 Jan 2014 12:41:21 +0000 (13:41 +0100)]
Rename uglify.js to uglify.min.js for consistency
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
Chris Rebert [Tue, 14 Jan 2014 05:58:27 +0000 (21:58 -0800)]
sort out attribution banners of docs assets; fixes #11976
Chris Rebert [Tue, 14 Jan 2014 05:31:40 +0000 (21:31 -0800)]
avoid redundant banner in minified docs CSS
Chris Rebert [Tue, 14 Jan 2014 05:07:17 +0000 (21:07 -0800)]
add a title/description to customizer.js's attribution comment
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
Chris Rebert [Tue, 14 Jan 2014 03:21:07 +0000 (19:21 -0800)]
upgrade to QUnit v1.0.0
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.
Chris Rebert [Tue, 14 Jan 2014 01:50:17 +0000 (17:50 -0800)]
update to Holder.js
5b79144fa
Chris Rebert [Mon, 13 Jan 2014 09:06:48 +0000 (01:06 -0800)]
preserve third-party attribution comments when minifying docs JS
Chris Rebert [Mon, 13 Jan 2014 10:37:55 +0000 (02:37 -0800)]
document subheading syntax
Chris Rebert [Sun, 12 Jan 2014 22:53:21 +0000 (14:53 -0800)]
grunt dist build-customizer
XhmikosR [Sun, 12 Jan 2014 22:46:23 +0000 (14:46 -0800)]
update to FileSaver.js version 2013-12-27 /
0055d054ac
Refs #12196
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
XhmikosR [Sun, 12 Jan 2014 22:32:45 +0000 (14:32 -0800)]
update less.js to v1.6.1 & use accurate filename; refs #12196
XhmikosR [Sun, 12 Jan 2014 22:21:02 +0000 (14:21 -0800)]
update holder.js to v2.3; refs #12196
Chris Rebert [Sun, 12 Jan 2014 01:15:08 +0000 (17:15 -0800)]
rm lingering reference to Recess in the docs
Refs
c0200426ee72b165de400db740a60bae5d344b3c
Mark Otto [Sat, 11 Jan 2014 22:49:03 +0000 (14:49 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 11 Jan 2014 22:48:47 +0000 (14:48 -0800)]
grunt dist
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
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
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.
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
Mark Otto [Sat, 11 Jan 2014 02:57:01 +0000 (18:57 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
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
Chris Rebert [Sat, 11 Jan 2014 02:56:39 +0000 (18:56 -0800)]
refer to correct component
Mark Otto [Sat, 11 Jan 2014 02:47:51 +0000 (18:47 -0800)]
docs mention for #12188
Chris Rebert [Fri, 10 Jan 2014 23:33:04 +0000 (15:33 -0800)]
use height adjectives for greater clarity
Chris Rebert [Fri, 10 Jan 2014 22:41:23 +0000 (14:41 -0800)]
document #11675
Chris Rebert [Fri, 10 Jan 2014 22:34:25 +0000 (14:34 -0800)]
rm outdated `<select>` references from comments in forms.less
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
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
Mark Otto [Fri, 10 Jan 2014 02:06:46 +0000 (18:06 -0800)]
grunt dist
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
Chris Rebert [Thu, 9 Jan 2014 21:45:10 +0000 (13:45 -0800)]
mixins.less: fix typo in comment
Waynn Lue [Thu, 9 Jan 2014 20:22:31 +0000 (12:22 -0800)]
use periods for consistency in each line
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
Zlatan Vasović [Thu, 9 Jan 2014 19:33:13 +0000 (20:33 +0100)]
Use absolute instead of relative URLs
Chris Rebert [Thu, 9 Jan 2014 19:11:13 +0000 (11:11 -0800)]
grunt dist
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
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
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"
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)
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
Waynn Lue [Thu, 9 Jan 2014 08:11:01 +0000 (00:11 -0800)]
missing a period after "Twitter, Inc"
Chris Rebert [Thu, 9 Jan 2014 05:15:37 +0000 (21:15 -0800)]
bump grunt-contrib-jade to v0.9.1
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')
Chris Rebert [Thu, 9 Jan 2014 02:39:45 +0000 (18:39 -0800)]
grunt build-customizer
Chris Rebert [Thu, 9 Jan 2014 02:39:08 +0000 (18:39 -0800)]
grunt dist
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
Chris Rebert [Wed, 8 Jan 2014 05:43:12 +0000 (21:43 -0800)]
add support for '//===' for <h3>s in bs-lessdoc
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)
Chris Rebert [Mon, 9 Dec 2013 05:25:25 +0000 (21:25 -0800)]
JSCS can be dumb sometimes
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
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
Eduardo [Wed, 8 Jan 2014 15:43:56 +0000 (16:43 +0100)]
updated path docs-assets to docs/assets
XhmikosR [Fri, 27 Dec 2013 04:08:40 +0000 (06:08 +0200)]
Use single quotes in the jqueryCheck too.
XhmikosR [Mon, 30 Dec 2013 06:25:52 +0000 (08:25 +0200)]
Remove extra newline from banner.
XhmikosR [Fri, 27 Dec 2013 04:14:28 +0000 (06:14 +0200)]
Use the docs banner for all the docs generated files.
XhmikosR [Fri, 27 Dec 2013 04:01:56 +0000 (06:01 +0200)]
Turn advanced optimizations off until it's fixed in clean-css.
XhmikosR [Sun, 22 Dec 2013 07:25:18 +0000 (09:25 +0200)]
Minify docs CSS too.
XhmikosR [Tue, 10 Dec 2013 22:29:42 +0000 (00:29 +0200)]
docs-assets: concatenate and minify all javascript files.
Mark Otto [Wed, 8 Jan 2014 08:52:51 +0000 (00:52 -0800)]
Merge pull request #12151 from wangsai/no-preboot
no preboot
wangsai [Wed, 8 Jan 2014 08:22:50 +0000 (16:22 +0800)]
no preboot
Chris Rebert [Wed, 8 Jan 2014 06:34:09 +0000 (22:34 -0800)]
extract glyphicons.yml generator out of Gruntfile into separate module
Chris Rebert [Wed, 8 Jan 2014 06:15:48 +0000 (22:15 -0800)]
extract raw-files.js generator out of Gruntfile into separate module
Chris Rebert [Wed, 8 Jan 2014 04:05:09 +0000 (20:05 -0800)]
Merge pull request #12149 from twbs/bump-grunt-contrib-less
bump grunt-contrib-less to v0.9.0
Chris Rebert [Wed, 8 Jan 2014 03:50:58 +0000 (19:50 -0800)]
bump grunt-contrib-less to v0.9.0
Chris Rebert [Wed, 8 Jan 2014 03:34:49 +0000 (19:34 -0800)]
enable CSSLint in test suite; fixes #12094
Chris Rebert [Wed, 8 Jan 2014 03:10:31 +0000 (19:10 -0800)]
adjust filename to indicate that customize JS is minified
Chris Rebert [Wed, 8 Jan 2014 03:05:29 +0000 (19:05 -0800)]
grunt dist build-customizer
Chris Rebert [Wed, 8 Jan 2014 02:57:15 +0000 (18:57 -0800)]
have customizer output Bootstrap Theme too; fixes #12003
Chris Rebert [Wed, 8 Jan 2014 02:38:37 +0000 (18:38 -0800)]
make customizer compilation code more generic
Chris Rebert [Wed, 8 Jan 2014 01:08:40 +0000 (17:08 -0800)]
fix #12143
Chris Rebert [Tue, 7 Jan 2014 22:02:45 +0000 (14:02 -0800)]
Merge pull request #12147 from ZDroid/double
Drop redundant 'the'
Zlatan Vasović [Tue, 7 Jan 2014 21:40:23 +0000 (22:40 +0100)]
Drop redundant 'the'
Julian Thilo [Tue, 7 Jan 2014 21:24:45 +0000 (22:24 +0100)]
Fix #12073: Consistent order of variations
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
Chris Rebert [Tue, 7 Jan 2014 08:31:27 +0000 (00:31 -0800)]
Merge pull request #12057 from ZDroid/nl
'use strict' on new line
Chris Rebert [Tue, 7 Jan 2014 08:27:54 +0000 (00:27 -0800)]
Merge pull request #12135 from leoj3n/patch-2
Improve wording in CONTRIBUTING.md