Mark Otto
|
d23006a6bd
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
|
2012-12-21 18:59:14 -08:00 |
|
Mark Otto
|
ccafc8a010
|
Explore adding icon to readme
|
2012-12-21 18:58:59 -08:00 |
|
Mark Otto
|
558bc52432
|
Add docs readme icon
|
2012-12-21 18:54:36 -08:00 |
|
fat
|
818c56f078
|
rewrite makefile to make a bit more "efficient" + rebuild
|
2012-12-21 17:42:24 -08:00 |
|
fat
|
82a758344d
|
add direction prop to carousel slide event
|
2012-12-21 17:31:54 -08:00 |
|
fat
|
e194c3e4f4
|
rebuild
|
2012-12-21 17:25:31 -08:00 |
|
fat
|
5da30ee5fb
|
Merge branch 'marcelkorpel-master' into 2.3.0-wip
|
2012-12-21 17:24:45 -08:00 |
|
fat
|
d5345f806c
|
Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel-master
|
2012-12-21 17:19:36 -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
|
704dfb2f1d
|
Merge pull request #6360 from Quy/2.3.0-wip
Miscellaneous changes to docs
|
2012-12-21 00:28:07 -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
|
5d4e718446
|
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
|
2012-12-20 20:56:00 -08:00 |
|
Mark Otto
|
5508d3d5b3
|
Remove reset.less now that Normalize 2 is fully integrated
|
2012-12-20 20:52:43 -08:00 |
|
Mark Otto
|
7b7581d44a
|
Finish migrating to Normalize 2:
* Port print styles from reset.less to scaffolding.less
* Port responsive image styles from reset.less to scaffolding.less
|
2012-12-20 20:52:20 -08:00 |
|
Mark Otto
|
c1e82732cf
|
Update new example name and links
|
2012-12-20 20:27:07 -08:00 |
|
Mark Otto
|
d6d828154a
|
Merge pull request #6354 from cvrebert/3.0.0-wip
add comment regarding caveat of #6199 impl per discussion in/of 14844db862
|
2012-12-20 15:33:52 -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
|
43d130762b
|
Fixes #6352: marketing-alternate broken nav in FF17
|
2012-12-20 14:40:39 -08:00 |
|
Mark Otto
|
69f6149489
|
Normalize indentation from 4 to 2 spaces
|
2012-12-20 14:11:40 -08:00 |
|
Mark Otto
|
1c33b857a6
|
Convert normalize comments to // style
|
2012-12-20 14:08:09 -08:00 |
|
Mark Otto
|
be74ad7e0d
|
Merge branch '3.0.0-wip' into bs3-normalize
Conflicts:
less/bootstrap.less
|
2012-12-20 14:02:54 -08:00 |
|
Mark Otto
|
8eb1549842
|
remove .hide specificity override from grid classes
|
2012-12-20 13:57:14 -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
|
a5e04c0799
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/templates/pages/base-css.mustache
less/dropdowns.less
less/forms.less
|
2012-12-20 13:47:36 -08:00 |
|
Mark Otto
|
5e4f663e69
|
Undo important on hide/show utilties; punt to 3.0
|
2012-12-20 13:46:07 -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 |
|
Chris Rebert
|
30f72e69e3
|
add comment regarding caveat of #6199 impl per discussion in/of 14844db862
|
2012-12-20 11:00:47 -08:00 |
|
Yohn
|
a6705246d0
|
Update js/tests/unit/bootstrap-tooltip.js
|
2012-12-20 04:36:57 -05:00 |
|
Yohn
|
e21b6459ad
|
fixes tooltip('toggle')
|
2012-12-20 04:34:28 -05:00 |
|
Mark Otto
|
30d8eb3ed5
|
Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip
|
2012-12-20 01:34:19 -08:00 |
|
Mark Otto
|
0a1434b23b
|
Merge branch 'dropdown-selectors' of https://github.com/blakeembrey/bootstrap into blakeembrey-dropdown-selectors
|
2012-12-20 01:34:10 -08:00 |
|
Mark Otto
|
3f493f0d0d
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
|
2012-12-20 01:30:43 -08:00 |
|
Mark Otto
|
f706acb11c
|
Fixes #6339: Use important flag on .hide and .show utility classes
|
2012-12-20 01:30:32 -08:00 |
|
Mark Otto
|
cdb25e11ef
|
lighter buttons closer to todays versions
|
2012-12-20 01:21:09 -08:00 |
|
fat
|
5abe33f5d8
|
reset carousel in the case that it is reinstantiated twice
|
2012-12-20 01:13:03 -08:00 |
|
fat
|
6b67a83631
|
Merge branch '2.2.3' into 2.3.0-wip
|
2012-12-20 01:05:55 -08:00 |
|
fat
|
2c9f43f685
|
if carousel element already open, don't reopen it duh bruh bruh
|
2012-12-20 01:05:07 -08:00 |
|
Mark Otto
|
c00f29e4d4
|
Fixes #6236: Fix popover font-size in input groups
|
2012-12-20 00:54:58 -08:00 |
|
Mark Otto
|
4e54e7bb35
|
Remove dropdown submenu docs
|
2012-12-20 00:27:46 -08:00 |
|
Mark Otto
|
cc6974b74e
|
Remove dropdown submenu CSS
|
2012-12-20 00:27:05 -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 |
|
Mark Otto
|
9726fded1c
|
Get on that carousel indicator lifestyle with some new hawtness
|
2012-12-19 23:52:38 -08:00 |
|
Mark Otto
|
5d776bcfd2
|
Merge branch '2.2.3' of github.com:twitter/bootstrap into 2.2.3
|
2012-12-19 23:39:40 -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 |
|