]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 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

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

12 years agofix #12007 by clarifying target of dropdown events 12319/head
Chris Rebert [Tue, 21 Jan 2014 02:39:13 +0000 (18:39 -0800)] 
fix #12007 by clarifying target of dropdown events

12 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

12 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.

12 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.

12 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

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

12 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

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

12 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

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

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

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

12 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

12 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

12 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"

12 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.

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

12 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

12 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

12 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

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

12 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

12 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

12 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

12 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

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

12 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

12 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

12 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

12 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

12 years agoremove confusing comment
Mark Otto [Sun, 19 Jan 2014 18:23:00 +0000 (10:23 -0800)] 
remove confusing comment

12 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

12 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

12 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

12 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

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

12 years agoFix #12025 and minify styles 12025/head
Zlatan Vasović [Sun, 19 Jan 2014 11:52:31 +0000 (12:52 +0100)] 
Fix #12025 and minify styles

12 years agoexpo callout copy
Mark Otto [Sun, 19 Jan 2014 07:17:00 +0000 (09:17 +0200)] 
expo callout copy

12 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

12 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

12 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

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

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

12 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

12 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

12 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

12 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

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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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. :)

12 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

12 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.

12 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

12 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

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

12 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.

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

12 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

12 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.

12 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`

12 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

12 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

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

12 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

12 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

12 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

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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 years agoMerge pull request #12265 from twbs/ie-11
Chris Rebert [Fri, 17 Jan 2014 01:00:46 +0000 (17:00 -0800)] 
Merge pull request #12265 from twbs/ie-11

enable IE11 in Sauce tests

12 years agoMerge pull request #12264 from twbs/mavericks-safari-7
Chris Rebert [Fri, 17 Jan 2014 00:10:50 +0000 (16:10 -0800)] 
Merge pull request #12264 from twbs/mavericks-safari-7

upgrade to Safari 7 in Sauce tests

12 years agoenable IE11 in Sauce tests 12265/head
Chris Rebert [Thu, 16 Jan 2014 23:35:08 +0000 (15:35 -0800)] 
enable IE11 in Sauce tests

12 years agoMerge pull request #12262 from twbs/osx-firefox
Chris Rebert [Thu, 16 Jan 2014 23:25:50 +0000 (15:25 -0800)] 
Merge pull request #12262 from twbs/osx-firefox

re-enable OS X Firefox in Sauce tests

12 years agogrunt
Mark Otto [Thu, 16 Jan 2014 23:03:34 +0000 (15:03 -0800)] 
grunt

12 years agoupgrade to Safari 7 in Sauce tests 12264/head
Chris Rebert [Thu, 16 Jan 2014 22:51:41 +0000 (14:51 -0800)] 
upgrade to Safari 7 in Sauce tests

12 years agore-enable OS X Firefox in Sauce tests 12262/head
Chris Rebert [Thu, 16 Jan 2014 22:47:11 +0000 (14:47 -0800)] 
re-enable OS X Firefox in Sauce tests

12 years agoadd missing paren
fat [Thu, 16 Jan 2014 22:28:21 +0000 (14:28 -0800)] 
add missing paren

12 years agotooltip subpixel test fixes
fat [Thu, 16 Jan 2014 22:25:28 +0000 (14:25 -0800)] 
tooltip subpixel test fixes

12 years agoremove flaky pos bottom test which is effect by unit scroll pos
fat [Thu, 16 Jan 2014 21:44:08 +0000 (13:44 -0800)] 
remove flaky pos bottom test which is effect by unit scroll pos

12 years agonew qunit
fat [Thu, 16 Jan 2014 21:33:09 +0000 (13:33 -0800)] 
new qunit

12 years agoMerge pull request #12260 from patricker/patch-1
Chris Rebert [Thu, 16 Jan 2014 18:55:22 +0000 (10:55 -0800)] 
Merge pull request #12260 from patricker/patch-1

Update javascript.html to fix Tabs example