10a83b1e62
Modifies the Makefile to use local npm install **when available**
...
The change introduced in 5bd8cdca9
2013-01-14 09:01:19 -05:00
2a151d9e2f
Moves one @printf statement to be more accurate.
2013-01-14 08:58:47 -05:00
25803a966b
Replaces some @echo recipes by @printf.
...
The echo command does not understand the -n argument on Mac OS X.
This is due to the fact that:
- Makefile calls /bin/sh to execute a command
- in Mac OS X, /bin/sh is a link to bash
- in Mac OS X, bash is compiled with --enable-strict-posix-default
Therefore, the echo command does not have the -n argument.
printf on the other hand is a builtin function that works well on Mac OS X and Linux.
2013-01-14 08:58:16 -05:00
5204f206b9
Splits the progress @echo statements in the Makefile.
2013-01-14 08:57:44 -05:00
337741fc9a
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2013-01-14 00:33:16 -08:00
0f9073c5cd
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
2013-01-14 00:11:55 -08:00
f9ee99cf6f
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
2013-01-14 00:11:55 -08:00
5ae1df617f
Merge pull request #6568 from Yohn/patch-12
...
Updating docs -> popover to show container option
2013-01-14 00:03:55 -08:00
a23eb06536
fix typo
2013-01-13 15:32:51 -05:00
ecc24953a5
fix typo
2013-01-13 15:32:03 -05:00
98aeb0acf1
added container options to docs for popover
2013-01-13 15:23:22 -05:00
fdd1daeae1
added container options to docs for popover
2013-01-13 15:21:31 -05:00
d247f71217
Reset docs jumbotron button to blue defaults
2013-01-13 04:27:51 -08:00
cecabeadec
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
2013-01-13 04:26:52 -08:00
7d8d5c7838
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
2013-01-13 04:26:52 -08:00
76ed6b0b2c
Remove comment out code and simplify what's left for button group toggles
2013-01-13 04:05:34 -08:00
1916eb7c7f
Fix btn link hover and tweak dropdown border/shadows
2013-01-13 04:04:16 -08:00
0b31cfc90e
Fix up .brand in navbar of docs
2013-01-12 20:10:42 -08:00
01db5db2f6
white text on buttons on hover for links
2013-01-12 20:08:13 -08:00
4b34f4947a
Update Holder.js 1.6 to 1.9
2013-01-12 19:49:15 -08:00
ea1a12593d
Nuke shadow on pagination
2013-01-12 19:46:47 -08:00
8670021935
fixed navbars fixings
2013-01-12 19:44:51 -08:00
1ea647ce98
Remove shadows from active links in navbar
2013-01-12 19:02:58 -08:00
7bcd02c167
Tweak button
2013-01-12 19:02:48 -08:00
583fc4b962
buttons and button group flattening improvements
2013-01-12 18:52:06 -08:00
fb4fc323a2
remove font-sizes from button group btn sizes
2013-01-12 17:54:30 -08:00
a9a66e9c34
finetune buttons flattened colors
2013-01-12 17:51:57 -08:00
ff02043bbc
Flatten navbar
2013-01-12 14:31:18 -08:00
a33d45f308
Merge branch '3.0.0-wip' into bs3-flatten
2013-01-12 14:16:49 -08:00
24f7df15e6
Remove mention of Extend page from readme and index page
2013-01-12 13:57:41 -08:00
b1f0a7e62b
Remove Extend page from the docs entirely
...
* Information was old and out of date on compiling Bootstrap
* Information was also not directly related to Bootstrap with background info on Less and apps for compiling (Google it, yo)
* Starter template and recommended HTML is already in use on the Getting Started page
2013-01-12 13:46:07 -08:00
7a3f078fb4
Remove parent div from pagination component
...
* No more div.pagination; it's now just ul.pagination
* No more .pagination-right or .pagination-centered
* Sizes remain
* Any further customization, such as alignment, should be done on the individual application or site level.
2013-01-12 13:15:19 -08:00
6f275c6148
Update extend page to point to readme for compiling.
...
Note that we'll be dropping this page entirely as it's out of date and other compiling options are not recommended for contributing back to the project.
2013-01-12 12:41:01 -08:00
a809daf284
Keyboard accessibility in documentation
...
Removed unnecessary (?) and harmful (from a keyboard access point of
view) tabindex=-1 in the documentation examples.
2013-01-12 17:04:51 +00:00
77c68e4bc2
Cleaned up dirty CSS
...
Used recess rather than less
2013-01-12 11:02:13 +00:00
a7231854c9
Address #6459 and add mention of disabled links in dropdowns to le docs
2013-01-12 00:33:12 -08:00
8a16746542
Merge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0
...
update 2.3.0 docs to reflect #5786
2013-01-12 00:29:34 -08:00
3773b99969
Merge pull request #6463 from cvrebert/input-required-docs-fix-3.0.0
...
update 3.0.0 docs to reflect #5786
2013-01-12 00:29:23 -08:00
e195457728
Merge pull request #6472 from RWOverdijk/patch-1
...
Update composer.json
2013-01-12 00:21:08 -08:00
d034ec74c4
fix username navbar text in fluid example for responsive variations
2013-01-12 00:20:13 -08:00
aaf80d410a
fix username navbar text in fluid example for responsive variations
2013-01-12 00:20:13 -08:00
19e2ad0eb6
Fixes #6538 : Add th support to all the .table-rounded selectors
2013-01-11 23:38:53 -08:00
6f894c62a5
Fixes #6528 : Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active
2013-01-11 23:35:22 -08:00
42efd9f730
Address #6545 : clarify initialization of tooltips in docs
2013-01-11 20:58:24 -08:00
4de3a77a64
Fixes #6547 : Make blockquotes use multiple of @baseFontSize
2013-01-11 20:55:09 -08:00
88e816956a
Fixes #6552 : example fix for button group
2013-01-11 20:52:39 -08:00
b242ff7851
Fixes #6553 : example fix for validation states
2013-01-11 20:51:11 -08:00
767a293b4d
Increase input group margin on bottom and vertically center to match inputs
2013-01-11 20:46:21 -08:00
56a24027c3
Fixes #6473 : Make .input-prepend and .input-append inline-block to match other form states
2013-01-11 20:42:44 -08:00
d3b3b4c48f
Fixes #6474 : remove duplicate .btn border colors to make @btn-border work
2013-01-11 20:40:17 -08:00
Nicolas Dudebout