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 |
|
fat
|
7f9ff0ba5b
|
add js support for carousel indicators
|
2012-12-19 23:25:25 -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
|
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
|
be5f31480b
|
Nuke all i18n tags from .mustache templates
|
2012-12-05 11:09:02 -08:00 |
|
Mark Otto
|
7e56e2265d
|
Merge branch '2.2.2-wip' into exploratory
Conflicts:
less/button-groups.less
|
2012-11-22 22:04:21 -08:00 |
|
Mark Otto
|
5d1b4206b1
|
Fixes #5986: single toggle button html examples
|
2012-11-22 12:06:36 -08:00 |
|
Mark Otto
|
ee93541421
|
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
less/buttons.less
less/forms.less
|
2012-11-04 19:59:07 -08:00 |
|
Mark Otto
|
2320a09898
|
fix modals display in docs on tablet view
|
2012-11-04 12:58:57 -08:00 |
|
Mark Otto
|
3de6f3ff88
|
Swap old icons for new in docs
|
2012-11-03 16:18:02 -07:00 |
|
Mark Otto
|
a249d1c8ee
|
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/scaffolding.html
docs/templates/pages/scaffolding.mustache
|
2012-11-03 13:44:01 -07:00 |
|
Bradly Feeley
|
46b5e0cbc6
|
Fixing various spelling typos in the docs.
|
2012-11-02 16:34:21 -06:00 |
|
Mark Otto
|
1477e081d4
|
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/getting-started.html
docs/templates/pages/getting-started.mustache
less/accordion.less
less/alerts.less
less/breadcrumbs.less
less/buttons.less
less/code.less
less/dropdowns.less
less/forms.less
less/navbar.less
less/progress-bars.less
less/responsive-navbar.less
less/tables.less
less/thumbnails.less
less/tooltip.less
less/wells.less
|
2012-11-02 09:36:51 -07:00 |
|
Bradly Feeley
|
cbf1dace2f
|
Fixing typos in affix options area in the docs.
|
2012-10-30 11:46:18 -07:00 |
|
Jacob Thornton
|
ac6625de5f
|
add updater function and rebuild
|
2012-10-17 21:37:34 -07:00 |
|
Mark Otto
|
57eb2a8018
|
more hellip on modals
|
2012-10-16 20:28:07 -07:00 |
|
Mark Otto
|
0ac50d28b5
|
fixes #5519: hellip in modal code
|
2012-10-16 20:18:50 -07:00 |
|
Mark Otto
|
463eae25b0
|
clarify js docs individual or compiled section
|
2012-10-16 12:37:36 -05:00 |
|
Mark Otto
|
e73cd15fc8
|
copy and style changes to improve docs rendering on mobile devices
|
2012-10-02 17:01:18 -07:00 |
|
Mark Otto
|
4ab7b77aa3
|
Merge branch '2.1.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/labels-badges.less
less/navbar.less
less/tables.less
|
2012-10-01 23:41:00 -07:00 |
|
Mark Otto
|
fd1e9b1498
|
fix copy on modal popover button doodad
|
2012-10-01 13:28:54 -07:00 |
|
Mark Otto
|
26386ad615
|
remove tabbable tabs on left, right, and bottom; instead, from here out use stacked pills or tabs
|
2012-10-01 00:05:18 -07:00 |
|
Mark Otto
|
bbd543db53
|
Merge branch '2.1.2-wip' into exploratory
Conflicts:
docs/getting-started.html
docs/templates/pages/getting-started.mustache
|
2012-09-30 22:45:39 -07:00 |
|
Mark Otto
|
8ecffcb32f
|
fixes #5334: html snippet comments
|
2012-09-28 10:39:15 -07:00 |
|
Mark Otto
|
ad96435d27
|
Merge branch '2.1.2-wip' into box-sizing-exercise
|
2012-09-26 16:02:33 -07:00 |
|
Mark Otto
|
cd5ae9e030
|
change up carousel
|
2012-09-26 11:20:27 -07:00 |
|
Jacob Thornton
|
aec8b08930
|
update docs for tooltip html + the dropdown methods api
|
2012-09-24 23:32:55 -07:00 |
|
Mark Otto
|
cedb3c7c56
|
fixes #5173: proper popover offsets; added docs examples to enable tests in the future
|
2012-09-17 23:03:32 -07:00 |
|
Mark Otto
|
e1deba30aa
|
fixes #5097: js docs typos
|
2012-09-12 16:22:52 -07:00 |
|
Geoff Young
|
76e42edb29
|
Updated sample markup to reflect live demo.
|
2012-09-09 18:58:23 -04:00 |
|
Mark Otto
|
209852c805
|
fixes #4902: proper accordion html example
|
2012-09-01 12:03:55 -07:00 |
|
Mark Otto
|
303a33f15c
|
fixes #4664: spelling mistake in alerts docs
|
2012-08-27 15:48:54 -07:00 |
|
Mark Otto
|
b444582ccd
|
fixes #4671: mention collapsing parents in docs for affix plugin
|
2012-08-27 15:20:50 -07:00 |
|
Mark Otto
|
5da217b96e
|
fixed #4598, typo, manually
|
2012-08-22 20:23:58 -07:00 |
|
Mark Otto
|
55facf1f2e
|
fixes #4473: docs example typo for js affix plugin
|
2012-08-21 12:58:48 -07:00 |
|
Mark Otto
|
4e979f084d
|
fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs
|
2012-08-19 21:12:52 -07:00 |
|
Mark Otto
|
8e271d664b
|
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
|
2012-08-19 11:54:05 -07:00 |
|
Mark Otto
|
c531a75ff0
|
fixes #4451 manually: add .fade to modal example in both mustache and html
|
2012-08-19 11:53:55 -07:00 |
|
Jacob Thornton
|
45dddc59a1
|
add click option for tooltip, popover - make click default for popover
|
2012-08-18 19:54:30 -07:00 |
|
Jacob Thornton
|
44e35e9dfa
|
fix component
|
2012-08-18 19:33:46 -07:00 |
|
Jacob Thornton
|
937cfa6a88
|
add note about .nav
|
2012-08-18 19:32:50 -07:00 |
|
Jacob Thornton
|
ae9a2bd93a
|
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
|
2012-08-14 21:06:39 -07:00 |
|
Jacob Thornton
|
dee57462e2
|
get affix actually working and update docs
|
2012-08-14 21:06:08 -07:00 |
|
Andreas Cederström
|
2df0a0fdeb
|
now with 13 custom jquery plugins
|
2012-08-14 13:58:12 +02:00 |
|
Mark Otto
|
3c89f7bb5f
|
fix chevron on js docs and run make after table changes
|
2012-08-07 23:07:53 -07:00 |
|