Mark Otto
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
Mark Otto
583fc4b962
buttons and button group flattening improvements
2013-01-12 18:52:06 -08:00
Mark Otto
a33d45f308
Merge branch '3.0.0-wip' into bs3-flatten
2013-01-12 14:16:49 -08:00
Mark Otto
24f7df15e6
Remove mention of Extend page from readme and index page
2013-01-12 13:57:41 -08:00
Mark Otto
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
Mark Otto
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
Mark Otto
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
Mark Otto
a7231854c9
Address #6459 and add mention of disabled links in dropdowns to le docs
2013-01-12 00:33:12 -08:00
Mark Otto
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
Mark Otto
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
Mark Otto
42efd9f730
Address #6545 : clarify initialization of tooltips in docs
2013-01-11 20:58:24 -08:00
Mark Otto
88e816956a
Fixes #6552 : example fix for button group
2013-01-11 20:52:39 -08:00
Mark Otto
b242ff7851
Fixes #6553 : example fix for validation states
2013-01-11 20:51:11 -08:00
Mark Otto
91dd77939b
Add text alignment utility classes
2013-01-09 18:56:08 -08:00
Chris Rebert
206205a6b2
update docs to reflect #5786
2013-01-05 17:36:20 -08:00
Chris Rebert
684c9d8d05
update docs to reflect #5786
2013-01-05 17:14:22 -08:00
Mark Otto
3d04d9ba75
Super lame typo on my part, sorry @necolas :)
2012-12-28 19:24:13 -06:00
Mark Otto
5a2dc0b897
Improve documentation for new form validation styles
2012-12-28 14:47:55 -06:00
Mark Otto
f69d12af3d
Merge pull request #6407 from aurnik/master
...
Fix link to File structure anchor
2012-12-28 11:10:46 -08:00
Aurnik Islam
aa997e274e
Fix link to File structure anchor
2012-12-27 01:49:09 -08:00
Mark Otto
dc5c6d6be8
Simplify form validation states while enabling them to be applied to one field at a time.
2012-12-26 15:57:52 -06:00
Mark Otto
d0baa99aed
Remove .text-info and .info form validation states
2012-12-26 14:59:58 -06:00
Mark Otto
2ef4fde09f
Drop .input-block-level modifier as inputs are already width: 100%;
2012-12-26 14:19:48 -06:00
Mark Otto
12b738bf30
Add grid column example to form input sizing
2012-12-26 14:13:44 -06:00
Mark Otto
070109abc1
Remove .controls-row; instead, folks should use .row and .span* for all their grid input sizing needs when multiple inputs per line are required
2012-12-26 14:09:36 -06:00
Mark Otto
330b143b40
Add longer tooltip example to docs, tighten up line-height on tooltip; run make
2012-12-26 09:36:07 -06:00
Mark Otto
9749d6afc2
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2012-12-26 09:21:34 -06:00
fat-kun
b9c7f29134
Merge pull request #6378 from Yohn/patch-7
...
fixes tooltip insert problems
2012-12-24 16:17:25 -08:00
Yohn
340d90138c
Update docs/templates/pages/javascript.mustache
2012-12-24 19:03:13 -05:00
Mark Otto
c063f7c9c2
Update docs to reflect latest on .clearfix
2012-12-24 02:08:45 -08:00
Mark Otto
d206ec1659
Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger
2012-12-24 02:06:28 -08:00
Yohn
dfbac13ad1
data-toggle instead of rel for tooltip and popover
2012-12-23 07:04:24 -05:00
Yohn
68ff08cc91
Update docs/templates/pages/javascript.mustache
2012-12-23 04:23:18 -05:00
Jake Spurlock
0834bd51ec
Update docs/templates/pages/javascript.mustache
...
Adding spaces around the pipes. Makes it consistent with the rest of the docs.
2012-12-22 21:03:58 -08:00
Mark Otto
f74990d898
Version bump
2012-12-22 16:10:06 -08:00
fat
2c0ed072b0
shifting focus to parent and adding aria menuitem for dropdown
2012-12-22 13:57:57 -08:00
fat
fad0fb683b
allow multiple trigger types in tooltip and popover + default tooltip to hover & focus
2012-12-22 13:24:37 -08:00
fat
ddd59f22c7
update mustace to reflect changes to data-slide-to
2012-12-21 20:19:33 -08:00
fat
24a36df9f6
add support for [data-slide-to] attr on carousel
2012-12-21 19:45:19 -08:00
Mark Otto
dc32555f5b
Fixes #6370 : Add comment to docs on typeahead and autocomplete
2012-12-21 15:46:10 -08:00
Mark Otto
c11f41ba04
flatten buttons and forms
2012-12-21 00:50:28 -08:00
Mark Otto
7c04d573d0
update docs regarding normalize and clearfix
2012-12-20 21:44:45 -08:00
Quy Ton
a27bf30f0d
Miscellaneous changes to docs
2012-12-20 21:38:53 -08:00
Mark Otto
c1e82732cf
Update new example name and links
2012-12-20 20:27:07 -08:00
Mark Otto
a24e47b5b8
Update the examples index:
...
* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
2012-12-20 15:08:05 -08:00
Mark Otto
6bd5dc7d9f
Add important flag to .show/.hide utility classes; remove .hide requirement from modals
2012-12-20 13:53:38 -08:00
Mark Otto
00ff34b9e6
fix up code snippet
2012-12-20 13:41:45 -08:00
Mark Otto
b6575cc72e
fix up code snippet
2012-12-20 13:41:08 -08:00
Mark Otto
4e54e7bb35
Remove dropdown submenu docs
2012-12-20 00:27:46 -08:00
Mark Otto
acde2dc1ee
Nuke third lines form carousel examples
2012-12-20 00:20:00 -08:00
Mark Otto
72f13e2870
Merge branch '2.2.3' 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/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.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/responsive.less
less/type.less
package.json
2012-12-20 00:02:52 -08:00
fat
bbe4625672
lol we dont' have affix(refresh)
2012-12-19 23:39:26 -08:00
Mark Otto
14844db862
Holy shit, buttons, button states, and input states updated
2012-12-19 23:37:33 -08:00
fat
7f9ff0ba5b
add js support for carousel indicators
2012-12-19 23:25:25 -08:00
Mark Otto
09dde5c84a
Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/mixins.less
2012-12-19 23:18:02 -08:00
Mark Otto
afef81c0d7
remove commented out buttons css, update docs
2012-12-19 22:30:08 -08:00
Mark Otto
c38b7206eb
overhaul buttons
2012-12-19 22:25:56 -08:00
Mark Otto
a932476f80
Unfuck the fucked homepage
2012-12-19 22:07:11 -08:00
Mark Otto
65edc9cd6e
Change .jumbotron usage in docs layout to .bs-docs-jumbotron
2012-12-19 21:42:36 -08:00
Mark Otto
b6945a2168
Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones
2012-12-19 21:37:16 -08:00
Mark Otto
2011a0d50f
Drop labels from the docs
2012-12-19 21:29:57 -08:00
Mark Otto
85971ff3e8
Drop .form-search support
2012-12-19 21:12:37 -08:00
Mark Otto
51b1a027da
Merge branch 'bs3-input-groups' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-12-19 21:02:54 -08:00
Mark Otto
19a94d08d6
Remove support for multiple buttons in input groups because fuck that shit.
2012-12-19 19:33:14 -08:00
Mark Otto
529ecc5a77
Version bump
2012-12-10 18:31:04 -08:00
Mark Otto
9d985978a3
Escape HTML of section element
2012-12-10 10:55:42 -08:00
Chris Rebert
8c8a14ab59
document caveat regarding fieldset legend and #6199
2012-12-10 01:46:16 -08:00
Chris Rebert
48759eee94
document fieldset[disabled] styling added in #6199 ; per @mdo
2012-12-10 01:33:02 -08:00
Mark Otto
4245e8ebb5
Fix checkbox and radios example
2012-12-09 22:13:40 -08:00
Mark Otto
6e9bbe6232
Nested columns docs tweaks
2012-12-09 22:08:11 -08:00
Mark Otto
4c82dd3645
Refactor input groups
...
* Deprecate .input-append and .input-prepend
* Use new, single base class for component, .input-group
* Deprecate .addon for .input-group-addon
* For compatibility with all buttons, require .input-group-btn to wrap buttons and button dropdowns
* Still need to reimplement with segmented button dropdowns, but that's dependent on a refactor of those first
2012-12-09 21:46:14 -08:00
Mark Otto
6649918c7f
Merge conflicts
2012-12-08 22:45:39 -08:00
Mark Otto
b5ceca14db
Fix docs typos
2012-12-08 18:46:34 -08:00
Mark Otto
bc0b94a3fd
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
2012-12-08 17:40:42 -08:00
Quy Ton
3bd9a26c01
Apply code tag to data attribute on javascript page
2012-12-08 12:06:46 -08:00
fat
a7eb9c294a
add noConflict functionality to all bootstrap plugins
2012-12-07 17:06:01 -05:00
Mark Otto
be45a821bb
Fixes #6148 : Icons in mini buttons properly aligned
2012-12-07 09:51:01 -08:00
Quy Ton
81679981c5
Escape ×
2012-12-05 15:28:14 -08:00
Mark Otto
be5f31480b
Nuke all i18n tags from .mustache templates
2012-12-05 11:09:02 -08:00
Mark Otto
33e14fe5bf
Merge branch '2.2.2-wip' into 3.0.0-wip
...
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto
b3019d7aab
add gallery page, fill with a few screenshots to start
2012-12-04 20:30:21 -08:00
Mark Otto
12916b06aa
Fix up display of dropdown submenu examples on responsive views
2012-12-04 18:25:16 -08:00
Mark Otto
e31c7fb8a5
correct link on index page to grid system
2012-12-04 09:49:18 -08:00
Mark Otto
0f2a423b8d
Once more, update all the favicons to retina
2012-12-03 13:25:56 -08:00
Mark Otto
15a4399015
Align the touch icons attributes
2012-12-03 13:22:10 -08:00
Mark Otto
dd11d0a3fa
move around social buttons
2012-12-01 13:47:07 -08:00
Mark Otto
98b0d475ae
version bump to 3.0
2012-11-30 22:30:50 -08:00
Mark Otto
0947105656
section title change
2012-11-30 17:43:20 -08:00
Mark Otto
51b4de8eec
docs content changed
2012-11-30 16:43:31 -08:00
Mark Otto
6961b284b6
remove responsive image from css docs page
2012-11-30 16:42:48 -08:00
Mark Otto
10c14e8955
first pass at nuking scaffolding
2012-11-30 16:29:30 -08:00
Mark Otto
0fabca01db
Remove more fluid grid stuff
...
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
2012-11-30 16:18:40 -08:00
Mark Otto
adc2c779a0
grid vars updated
2012-11-30 15:43:07 -08:00
Mark Otto
e34b3730b7
form state vars
2012-11-30 15:38:31 -08:00
Mark Otto
0a93bc143d
hero unit and pagination vars
2012-11-30 15:36:16 -08:00
Mark Otto
62a2220035
navbar vars
2012-11-30 15:33:56 -08:00
Mark Otto
a09cea44ae
more vars changed
2012-11-30 15:27:13 -08:00
Mark Otto
01421ecd62
remove sprites vars, change zindex vars
2012-11-30 15:23:13 -08:00
Mark Otto
12a00f62a9
remove color variables, swap others were appropro
2012-11-30 15:18:49 -08:00
Mark Otto
0ef347706c
more vars changing
2012-11-30 15:09:57 -08:00