]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoenable IE11 in BrowserStack tests 12347/head
Chris Rebert [Fri, 17 Jan 2014 02:18:18 +0000 (18:18 -0800)] 
enable IE11 in BrowserStack tests

11 years agoNo more lists.
Julian Thilo [Wed, 22 Jan 2014 18:04:19 +0000 (19:04 +0100)] 
No more lists.

11 years agoMerge pull request #12340 from browserstack/update_bs_runner
Julian Thilo [Wed, 22 Jan 2014 16:46:41 +0000 (08:46 -0800)] 
Merge pull request #12340 from browserstack/update_bs_runner

Update browserstack-runner package

11 years agoGone, gone.
Julian Thilo [Wed, 22 Jan 2014 16:00:09 +0000 (17:00 +0100)] 
Gone, gone.

11 years agoupdate browserstack runner package 12340/head
Rahul Nawani [Wed, 22 Jan 2014 15:45:55 +0000 (21:15 +0530)] 
update browserstack runner package

11 years agoMerge pull request #12334 from Quy/master
Chris Rebert [Wed, 22 Jan 2014 06:18:44 +0000 (22:18 -0800)] 
Merge pull request #12334 from Quy/master

Reorder lead/nav of About docs page

11 years agoReorder lead info of About docs page 12334/head
Quy Ton [Wed, 22 Jan 2014 06:12:44 +0000 (22:12 -0800)] 
Reorder lead info of About docs page

11 years agoReorder nav of About docs page
Quy Ton [Wed, 22 Jan 2014 06:02:54 +0000 (22:02 -0800)] 
Reorder nav of About docs page

11 years agoMerge pull request #12326 from twbs/navbar-var
Mark Otto [Wed, 22 Jan 2014 04:50:26 +0000 (20:50 -0800)] 
Merge pull request #12326 from twbs/navbar-var

add @navbar-collapse-max-height Less variable

11 years agoMerge pull request #12327 from twbs/about-ordering
Mark Otto [Wed, 22 Jan 2014 04:15:21 +0000 (20:15 -0800)] 
Merge pull request #12327 from twbs/about-ordering

reorder sections of About docs page

11 years agoreorder sections of About docs page 12327/head
Chris Rebert [Tue, 21 Jan 2014 18:28:54 +0000 (10:28 -0800)] 
reorder sections of About docs page

most folks are probably more interested in History and Team than Branding

11 years agoadd @navbar-collapse-max-height Less variable 12326/head
Chris Rebert [Tue, 21 Jan 2014 18:23:57 +0000 (10:23 -0800)] 
add @navbar-collapse-max-height Less variable

11 years agoMerge pull request #12321 from coliff/patch-3
Julian Thilo [Tue, 21 Jan 2014 11:15:49 +0000 (03:15 -0800)] 
Merge pull request #12321 from coliff/patch-3

Update index.html

11 years agoUpdate index.html 12321/head
Christian [Tue, 21 Jan 2014 09:36:48 +0000 (18:36 +0900)] 
Update index.html

This is very minor, but to help encourage best practises it'd be best to have the input type 'email' for this email input example instead of 'text'

11 years agofix typo in README
Chris Rebert [Tue, 21 Jan 2014 08:55:56 +0000 (00:55 -0800)] 
fix typo in README

11 years agoMerge pull request #12308 from twbs/fix-12298
Mark Otto [Tue, 21 Jan 2014 04:15:37 +0000 (20:15 -0800)] 
Merge pull request #12308 from twbs/fix-12298

Fix #12298

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 21 Jan 2014 04:12:02 +0000 (22:12 -0600)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agospacing
Mark Otto [Tue, 21 Jan 2014 04:11:51 +0000 (22:11 -0600)] 
spacing

11 years agoMerge pull request #12318 from twbs/fscking-customizer
Chris Rebert [Tue, 21 Jan 2014 02:09:59 +0000 (18:09 -0800)] 
Merge pull request #12318 from twbs/fscking-customizer

Template the customizer's nav sidebar too

11 years agofix #12280 by templating the customizer's nav sidebar too 12318/head
Chris Rebert [Tue, 21 Jan 2014 02:02:15 +0000 (18:02 -0800)] 
fix #12280 by templating the customizer's nav sidebar too

The customizer is such a PITA.

11 years agoMerge pull request #12282 from XhmikosR/grunt-contrib-uglify
Chris Rebert [Tue, 21 Jan 2014 01:28:42 +0000 (17:28 -0800)] 
Merge pull request #12282 from XhmikosR/grunt-contrib-uglify

Update grunt-contrib-uglify dependency.

11 years agoMerge pull request #12317 from twbs/grunt-task-license
Chris Rebert [Tue, 21 Jan 2014 00:58:11 +0000 (16:58 -0800)] 
Merge pull request #12317 from twbs/grunt-task-license

clarify Grunt task licensing

11 years agoclarify Grunt task licensing 12317/head
Chris Rebert [Tue, 21 Jan 2014 00:00:52 +0000 (16:00 -0800)] 
clarify Grunt task licensing

11 years agoslap a lang attr on <html> in the Getting Started basic template
Chris Rebert [Tue, 21 Jan 2014 00:53:29 +0000 (16:53 -0800)] 
slap a lang attr on <html> in the Getting Started basic template

for consistency with docs/examples/starter-template/index.html

11 years agonitpick phrasing
Chris Rebert [Mon, 20 Jan 2014 23:05:25 +0000 (15:05 -0800)] 
nitpick phrasing

11 years agoupgrade #callout-navbar-overflow from info to warning
Chris Rebert [Mon, 20 Jan 2014 23:02:48 +0000 (15:02 -0800)] 
upgrade #callout-navbar-overflow from info to warning

11 years agofix markup typo, duh
Julian Thilo [Mon, 20 Jan 2014 23:00:52 +0000 (00:00 +0100)] 
fix markup typo, duh

11 years agofix #12311
Julian Thilo [Mon, 20 Jan 2014 22:51:13 +0000 (23:51 +0100)] 
fix #12311

11 years agofix #12314
Julian Thilo [Mon, 20 Jan 2014 22:36:52 +0000 (23:36 +0100)] 
fix #12314

11 years agoMerge pull request #12303 from twbs/doc-s3
Chris Rebert [Mon, 20 Jan 2014 21:56:58 +0000 (13:56 -0800)] 
Merge pull request #12303 from twbs/doc-s3

document S3 cache more fully

11 years agoMerge pull request #12307 from twbs/bye-site-baseurl
Chris Rebert [Mon, 20 Jan 2014 21:55:07 +0000 (13:55 -0800)] 
Merge pull request #12307 from twbs/bye-site-baseurl

docs: use relative URLs instead of site.baseurl

11 years agoCorrected tag for Alert JS animation example from <a> to <button>
nkav [Sun, 19 Jan 2014 19:19:20 +0000 (14:19 -0500)] 
Corrected tag for Alert JS animation example from <a> to <button>

Also removed href attribute and added type="button"

11 years agoUpdate grunt-contrib-uglify dependency. 12282/head
XhmikosR [Sun, 19 Jan 2014 09:50:40 +0000 (11:50 +0200)] 
Update grunt-contrib-uglify dependency.

11 years agofix #12298 12308/head
Chris Rebert [Mon, 20 Jan 2014 07:07:32 +0000 (23:07 -0800)] 
fix #12298

11 years agodocs: use relative URLs instead of site.baseurl 12307/head
Chris Rebert [Mon, 20 Jan 2014 06:50:09 +0000 (22:50 -0800)] 
docs: use relative URLs instead of site.baseurl

11 years agoMerge pull request #12306 from twbs/raw-files.min.js
Chris Rebert [Mon, 20 Jan 2014 06:36:08 +0000 (22:36 -0800)] 
Merge pull request #12306 from twbs/raw-files.min.js

rename raw-files.js to raw-files.min.js

11 years agorename raw-files.js to raw-files.min.js 12306/head
Chris Rebert [Mon, 20 Jan 2014 06:28:25 +0000 (22:28 -0800)] 
rename raw-files.js to raw-files.min.js

it's not /technically/ minified, but close enough
it's autogenerated, not terribly human-readable, and not meant to be directly modified

11 years agogrunt build-raw-files dist
Chris Rebert [Mon, 20 Jan 2014 06:27:01 +0000 (22:27 -0800)] 
grunt build-raw-files dist

11 years agoMerge pull request #12304 from Quy/master
Chris Rebert [Mon, 20 Jan 2014 06:21:29 +0000 (22:21 -0800)] 
Merge pull request #12304 from Quy/master

Replace page.base_url with relative url

11 years agoReplace page.base_url with relative url 12304/head
Quy Ton [Mon, 20 Jan 2014 05:03:17 +0000 (21:03 -0800)] 
Replace page.base_url with relative url

11 years agodocument S3 cache more fully; fixes #12289 12303/head
Chris Rebert [Mon, 20 Jan 2014 02:28:31 +0000 (18:28 -0800)] 
document S3 cache more fully; fixes #12289

11 years agoMerge pull request #12295 from ZDroid/types
Chris Rebert [Sun, 19 Jan 2014 23:43:52 +0000 (15:43 -0800)] 
Merge pull request #12295 from ZDroid/types

Improve grunt config and vars

11 years agogrunt build-customizer-vars-form
Chris Rebert [Sun, 19 Jan 2014 23:28:30 +0000 (15:28 -0800)] 
grunt build-customizer-vars-form

11 years agos3_cache.py: fix name in USAGE message
Chris Rebert [Sun, 19 Jan 2014 23:12:09 +0000 (15:12 -0800)] 
s3_cache.py: fix name in USAGE message

11 years agoImprove grunt config and vars 12295/head
Zlatan Vasović [Sun, 19 Jan 2014 14:04:29 +0000 (15:04 +0100)] 
Improve grunt config and vars

11 years agoMerge pull request #12302 from Quy/master
Julian Thilo [Sun, 19 Jan 2014 21:35:06 +0000 (13:35 -0800)] 
Merge pull request #12302 from Quy/master

More "LESS" to "Less" changes

11 years agoMore "LESS" to "Less" changes 12302/head
Quy Ton [Sun, 19 Jan 2014 21:27:51 +0000 (13:27 -0800)] 
More "LESS" to "Less" changes

11 years agoMerge pull request #12297 from Quy/master
Julian Thilo [Sun, 19 Jan 2014 16:15:10 +0000 (08:15 -0800)] 
Merge pull request #12297 from Quy/master

Additional changes to #12275 and #12292

11 years agoAdditional changes to #12275 and #12292 12297/head
Quy Ton [Sun, 19 Jan 2014 15:41:14 +0000 (07:41 -0800)] 
Additional changes to #12275 and #12292

11 years agoMake head elements order uniform across templates and examples
Julian Thilo [Sun, 19 Jan 2014 14:59:21 +0000 (15:59 +0100)] 
Make head elements order uniform across templates and examples

11 years agoMerge pull request #12292 from ZDroid/meta
Julian Thilo [Sun, 19 Jan 2014 14:54:34 +0000 (06:54 -0800)] 
Merge pull request #12292 from ZDroid/meta

Improve <meta> tags

11 years agoImprove <meta> tags 12292/head
Zlatan Vasović [Sun, 19 Jan 2014 12:27:17 +0000 (13:27 +0100)] 
Improve <meta> tags

11 years agoMerge pull request #12288 from twbs/x-ua-compat
Mark Otto [Sun, 19 Jan 2014 04:45:45 +0000 (20:45 -0800)] 
Merge pull request #12288 from twbs/x-ua-compat

add X-UA-Compatible <meta> to basic template

11 years agoadd X-UA-Compatible <meta> to basic template 12288/head
Chris Rebert [Sun, 19 Jan 2014 02:39:46 +0000 (18:39 -0800)] 
add X-UA-Compatible <meta> to basic template

11 years agomake WP8 device-width hack code fully consistent between docs HTML & docs JS
Chris Rebert [Sun, 19 Jan 2014 02:35:47 +0000 (18:35 -0800)] 
make WP8 device-width hack code fully consistent between docs HTML & docs JS

11 years agogrammar: fix plural possessive
Chris Rebert [Sun, 19 Jan 2014 01:17:53 +0000 (17:17 -0800)] 
grammar: fix plural possessive

11 years agofix anomalous indentation
Chris Rebert [Sun, 19 Jan 2014 01:13:16 +0000 (17:13 -0800)] 
fix anomalous indentation

11 years agoDustin' the docs: Typos, Grammar, etc. in css.html
Julian Thilo [Sun, 19 Jan 2014 00:46:17 +0000 (01:46 +0100)] 
Dustin' the docs: Typos, Grammar, etc. in css.html

11 years agoAdded WAI-ARIA roles to examples/theme/index.html (document, main)
westurner [Wed, 15 Jan 2014 03:14:11 +0000 (21:14 -0600)] 
Added WAI-ARIA roles to examples/theme/index.html (document, main)

https://en.wikipedia.org/wiki/WAI-ARIA

http://www.w3.org/TR/wai-aria/roles

11 years agoMerge pull request #12287 from Quy/master
Mark Otto [Sun, 19 Jan 2014 00:21:39 +0000 (16:21 -0800)] 
Merge pull request #12287 from Quy/master

Add table's .info variant to migration guide

11 years agoAdd table's .info variant to migration guide 12287/head
Quy Ton [Sun, 19 Jan 2014 00:08:39 +0000 (16:08 -0800)] 
Add table's .info variant to migration guide

11 years agolink to docs license
Mark Otto [Sat, 18 Jan 2014 22:50:45 +0000 (14:50 -0800)] 
link to docs license

11 years agoMerge pull request #12219 from ZDroid/rn
Mark Otto [Sat, 18 Jan 2014 22:49:00 +0000 (14:49 -0800)] 
Merge pull request #12219 from ZDroid/rn

Rename docs/LICENSE-DOCS to docs/LICENSE

11 years agoMerge pull request #12248 from twbs/bg-variant
Mark Otto [Sat, 18 Jan 2014 22:47:29 +0000 (14:47 -0800)] 
Merge pull request #12248 from twbs/bg-variant

refactoring: add & use .bg-variant() mixin

11 years agoFix typos, sentences in getting-started.html
Julian Thilo [Sat, 18 Jan 2014 22:45:24 +0000 (23:45 +0100)] 
Fix typos, sentences in getting-started.html

11 years agoRun grunt dist after adding 'a' requirement to the text emphasis classes 12248/head
Mark Otto [Sat, 18 Jan 2014 22:40:48 +0000 (14:40 -0800)] 
Run grunt dist after adding 'a' requirement to the text emphasis classes

11 years agoMerge branch 'master' into bg-variant
Mark Otto [Sat, 18 Jan 2014 22:40:17 +0000 (14:40 -0800)] 
Merge branch 'master' into bg-variant

Conflicts:
less/mixins.less

11 years agoMerge pull request #12286 from watilde/fixes-panel
Mark Otto [Sat, 18 Jan 2014 22:29:11 +0000 (14:29 -0800)] 
Merge pull request #12286 from watilde/fixes-panel

Fixes #12263: Remove border radius when it's not both ends in panel

11 years agoMerge pull request #12249 from twbs/modal-md
Mark Otto [Sat, 18 Jan 2014 22:28:45 +0000 (14:28 -0800)] 
Merge pull request #12249 from twbs/modal-md

add & use @modal-md Less var for uniformity

11 years agoMerge pull request #12247 from twbs/text-emphasis-variant
Mark Otto [Sat, 18 Jan 2014 22:28:33 +0000 (14:28 -0800)] 
Merge pull request #12247 from twbs/text-emphasis-variant

refactoring: add & use .text-emphasis-variant() mixin

11 years agoMerge branch 'master' into modal-md 12249/head
Mark Otto [Sat, 18 Jan 2014 22:12:04 +0000 (14:12 -0800)] 
Merge branch 'master' into modal-md

11 years agoMerge branch 'master' into bg-variant
Mark Otto [Sat, 18 Jan 2014 22:11:55 +0000 (14:11 -0800)] 
Merge branch 'master' into bg-variant

11 years agoMerge branch 'master' into text-emphasis-variant 12247/head
Mark Otto [Sat, 18 Jan 2014 22:11:36 +0000 (14:11 -0800)] 
Merge branch 'master' into text-emphasis-variant

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

11 years agomove migration docs to new separate page, leave callout on getting started page;...
Mark Otto [Sat, 18 Jan 2014 22:09:09 +0000 (14:09 -0800)] 
move migration docs to new separate page, leave callout on getting started page; fixes #12244

11 years agoFix holder.js links in examples
Julian Thilo [Sat, 18 Jan 2014 21:58:05 +0000 (22:58 +0100)] 
Fix holder.js links in examples

Replaces links to holder.js with links to the new docs.min.js.
The uncompressed holder.js file is now in docs/assets/js/vendor,
which is excluded from Jekyll builds. In turn, Holder is now
included in docs.min.js, which is smaller than holder.js,
so this should make everybody happy. :)

11 years agoremove border radius when it's not both ends in panel 12286/head
Daijiro Wachi [Sat, 18 Jan 2014 21:43:57 +0000 (06:43 +0900)] 
remove border radius when it's not both ends in panel

11 years agoMerge pull request #12281 from XhmikosR/vendor
Mark Otto [Sat, 18 Jan 2014 19:42:34 +0000 (11:42 -0800)] 
Merge pull request #12281 from XhmikosR/vendor

Move docs third-party libraries to a separate folder.

11 years agokill bottom margin on last docs section
Mark Otto [Sat, 18 Jan 2014 19:33:50 +0000 (11:33 -0800)] 
kill bottom margin on last docs section

11 years agoMake spelling of Less uniform throughout the docs
Julian Thilo [Sat, 18 Jan 2014 17:40:47 +0000 (18:40 +0100)] 
Make spelling of Less uniform throughout the docs

11 years agoFix typo in index.html
Julian Thilo [Sat, 18 Jan 2014 17:15:37 +0000 (18:15 +0100)] 
Fix typo in index.html

11 years agoMove docs third-party libraries to a separate folder. 12281/head
XhmikosR [Fri, 17 Jan 2014 09:48:19 +0000 (11:48 +0200)] 
Move docs third-party libraries to a separate folder.

11 years agocopy
Mark Otto [Sat, 18 Jan 2014 03:04:14 +0000 (19:04 -0800)] 
copy

11 years agopresent browser compatibility info in a table 12279/head
Chris Rebert [Sat, 18 Jan 2014 01:12:52 +0000 (17:12 -0800)] 
present browser compatibility info in a table

11 years agofix #12277
Chris Rebert [Fri, 17 Jan 2014 22:27:54 +0000 (14:27 -0800)] 
fix #12277

Thanks to @Quy for pointing these out.

11 years agoadd namespace `.bs` also to the event `dismiss.modal`
Tobias Lindig [Fri, 17 Jan 2014 12:21:57 +0000 (13:21 +0100)] 
add namespace `.bs` also to the event `dismiss.modal`

11 years agoMerge pull request #12276 from twbs/grunt-contrib-qunit
Chris Rebert [Fri, 17 Jan 2014 20:06:12 +0000 (12:06 -0800)] 
Merge pull request #12276 from twbs/grunt-contrib-qunit

bump grunt-contrib-qunit to v0.4.0

11 years agobump grunt-contrib-qunit to v0.4.0 12276/head
Chris Rebert [Fri, 17 Jan 2014 19:56:53 +0000 (11:56 -0800)] 
bump grunt-contrib-qunit to v0.4.0

11 years agofix #12274
Chris Rebert [Fri, 17 Jan 2014 19:51:53 +0000 (11:51 -0800)] 
fix #12274

11 years agoMerge pull request #12275 from ZDroid/ncss
Chris Rebert [Fri, 17 Jan 2014 19:43:18 +0000 (11:43 -0800)] 
Merge pull request #12275 from ZDroid/ncss

Replace Normalize with Normalize.css

11 years agoReplace Normalize with Normalize.css 12275/head
Zlatan Vasović [Fri, 17 Jan 2014 19:22:32 +0000 (20:22 +0100)] 
Replace Normalize with Normalize.css

11 years agoMerge pull request #12271 from tlindig/modal_remove_needless_space
Julian Thilo [Fri, 17 Jan 2014 14:29:12 +0000 (06:29 -0800)] 
Merge pull request #12271 from tlindig/modal_remove_needless_space

remove needless space character

11 years agoremove needless space character 12271/head
Tobias Lindig [Fri, 17 Jan 2014 12:34:03 +0000 (13:34 +0100)] 
remove needless space character

11 years agoRevert "Add tooltip `viewport` option, respect bounds of the viewport"
Chris Rebert [Fri, 17 Jan 2014 04:31:19 +0000 (20:31 -0800)] 
Revert "Add tooltip `viewport` option, respect bounds of the viewport"

This reverts commit edb221a20ceabebd427e27d0432e94a227717217.
Reverting due to broken JS unit tests.

Conflicts:
docs/javascript.html

11 years agoMerge pull request #12267 from twbs/ie-10
Chris Rebert [Fri, 17 Jan 2014 04:07:43 +0000 (20:07 -0800)] 
Merge pull request #12267 from twbs/ie-10

enable IE10 for Sauce tests

11 years agoMerge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benog...
Mark Otto [Fri, 17 Jan 2014 04:01:28 +0000 (20:01 -0800)] 
Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport

Conflicts:
docs/javascript.html

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 17 Jan 2014 04:00:36 +0000 (20:00 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoSplit box-sizing reset for faster rendering
Mark Otto [Fri, 17 Jan 2014 04:00:28 +0000 (20:00 -0800)] 
Split box-sizing reset for faster rendering

11 years agoenable IE10 for Sauce tests 12267/head
Chris Rebert [Fri, 17 Jan 2014 02:17:33 +0000 (18:17 -0800)] 
enable IE10 for Sauce tests

11 years agotemporarily disable OS X Chrome Sauce test since it's being flaky
Chris Rebert [Fri, 17 Jan 2014 03:52:24 +0000 (19:52 -0800)] 
temporarily disable OS X Chrome Sauce test since it's being flaky

e.g.:
Tested http://127.0.0.1:3000/js/tests/index.html
Environment: OS X 10.9::chrome
>> Timeout, waited for more than 300000 milliseconds