0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

11351 Commits

Author SHA1 Message Date
Silumesii Maboshe
ae5badc9fb Removed the 'View javascript docs' link because it is the page we are currently on. Copy tweak for intro paragraphy of the javascript docs. 2011-11-07 09:09:17 +02:00
Silumesii Maboshe
4af6dac20e Use 'fluid-container' instead of 'container-fluid' in the docs. 2011-11-07 09:06:13 +02:00
Rod Vagg
1b43c87eaf removed twipsy options 2011-11-07 12:11:08 +11:00
Rod Vagg
d725ac2feb Merge remote-tracking branch 'twitter/master' into poveropt
Conflicts:
	js/bootstrap-popover.js
2011-11-07 12:02:51 +11:00
Jacob Thornton
b15e24e3d4 don't include data-content/data-title as specifications for options in twipsy/popover 2011-11-06 13:49:00 -08:00
Rod Vagg
4d2e32e809 tests & docs & twipsy too 2011-11-06 13:20:09 +11:00
Rod Vagg
3628eb79ae Merge branch 'master' into poveropt 2011-11-06 12:41:55 +11:00
Jacob Thornton
c3c700fd02 rebuild 2011-11-05 17:07:55 -07:00
Jacob Thornton
5d1c721636 Merge branch 'master' of https://github.com/twitter/bootstrap 2011-11-05 17:07:39 -07:00
Jacob Thornton
f03679805e update to jquery 1.7 + add toggle method to twipsy/popover 2011-11-05 17:06:41 -07:00
Jacob Thornton
8f353bcae6 Merge pull request #557 from JulianBirch/master
Fixed compilation under dotLess
2011-11-05 15:31:41 -07:00
Julian Birch
c53347db79 Add a missing bracket back in. (Prevents dotLess from compiling.) 2011-11-05 04:25:31 +00:00
Rod Vagg
f6a258ef36 optionable selectors for title & content elements 2011-11-05 10:50:08 +11:00
Jacob Thornton
32086c7de5 add the tab-pane class back to example 2011-11-04 13:46:03 -07:00
Jacob Thornton
e87daa9078 make .tab-content backwards compat with 1.3 2011-11-04 13:44:25 -07:00
Jacob Thornton
0a268389ce Merge branch 'master' of https://github.com/twitter/bootstrap 2011-11-04 13:35:31 -07:00
Jacob Thornton
de44b4c653 fix > & bug and point to 1.1.4 less version 2011-11-04 13:34:44 -07:00
Jacob Thornton
36b5864412 Merge pull request #537 from hermanschutte/master
Small change to correct the incorrect description for bootstrap-buttons.js in the Javascript section
2011-11-04 11:20:41 -07:00
Jacob Thornton
77a315d69d Merge branch 'master' of https://github.com/twitter/bootstrap 2011-11-04 11:18:06 -07:00
Jacob Thornton
913d84d7d3 update button comment 2011-11-04 11:17:28 -07:00
Jacob Thornton
ec8d783799 Merge pull request #544 from nikcub/master
bump version number in docs
2011-11-04 11:14:01 -07:00
Nik Cubrilovic
3b611357aa bump version number in docs 2011-11-05 00:17:12 +11:00
Herman Schutte
79a01b7fcb Add correct description for bootstrap-buttons.js in Javascript section 2011-11-04 09:34:12 +02:00
Jacob Thornton
a560eb651d remove preserve-3d 2011-11-03 18:40:18 -07:00
Jacob Thornton
f92759b36d update 1.4 docs 2011-11-03 17:39:50 -07:00
Mark Otto
5a702cc6ee no idea 2011-11-03 17:14:19 -07:00
Jacob Thornton
2187703144 rebuild 2011-11-03 17:08:12 -07:00
Jacob Thornton
9defc21218 Merge branch 'master' of https://github.com/twitter/bootstrap into dev 2011-11-03 17:06:13 -07:00
Jacob Thornton
869f11305a update 1.3 to 1.4 stuffs 2011-11-03 17:03:03 -07:00
Jacob Thornton
1b4b97d530 rebuild css, add preserve-3d for faster animations, fix whitespace in mixins.less 2011-11-03 14:45:53 -07:00
Jacob Thornton
f285048b34 Merge pull request #525 from mchung/patch-1
Fixed typo in Makefile
2011-11-02 10:13:58 -07:00
Marc Chung
09743c8996 Fixed typo in Makefile 2011-11-02 00:38:44 -07:00
Mark Otto
d811808494 fix tipsies, modals, and popovers from overlaying topbar 2011-11-02 00:04:43 -07:00
Mark Otto
0e91eddb66 fix pagination inconsistencies 2011-11-01 23:57:48 -07:00
Mark Otto
2534fee753 adding unofficial github buttons 2011-11-01 13:56:00 -07:00
Mark Otto
5c86074fa9 Merge branch 'kriansa-patch1' into dev
Conflicts:
	bootstrap.css
2011-10-31 23:28:05 -07:00
Mark Otto
602919aae8 tweak alignment for IE7 and chrome 2011-10-31 23:27:20 -07:00
Mark Otto
f4ba190821 Merge branch 'patch1' of https://github.com/kriansa/bootstrap into kriansa-patch1 2011-10-31 23:22:55 -07:00
Mark Otto
a21363a749 Merge branch 'dev' of github.com:twitter/bootstrap into dev
Conflicts:
	bootstrap.css
2011-10-31 23:22:13 -07:00
Mark Otto
98007b8394 remove fixed height from select elements for IE7 2011-10-31 23:18:36 -07:00
Jacob Thornton
8f726dc6ef issue #240 - firefox drop css transition events :{o 2011-10-31 22:44:42 -07:00
Mark Otto
f459f826af recompiling and pushing just to be sure 2011-10-31 21:46:45 -07:00
Mark Otto
31ea003046 remove alt tab styles for now, too complicated to accomplish both static and tabble; fix up CSS a bit 2011-10-31 21:45:46 -07:00
Mark Otto
ac9073e1e4 Merge branch '2.0-left-and-right-tabs' of https://github.com/avalanche123/bootstrap into avalanche123-2.0-left-and-right-tabs 2011-10-31 21:25:21 -07:00
Mark Otto
27b8e5e4fc small docs tweak 2011-10-31 21:24:57 -07:00
Mark Otto
02bf27592c overhaul the table styles and update those everywhere in the docs, update the button docs, spec out the forms docs 2011-10-31 19:37:10 -07:00
Mark Otto
ba597ef845 updating table documentation, jumping to dev to bring over new table styles from there 2011-10-31 16:32:13 -07:00
Mark Otto
3f512adf95 updated docs and type styles for blockquotes and a few fixes for type 2011-10-30 20:14:27 -07:00
Jacob Thornton
169b4b5dcb add template option and make title an optional attribute for popover 2011-10-29 19:59:51 -07:00
Jacob Thornton
640fd15464 allow the use of data attributes to define popover options 2011-10-29 19:27:02 -07:00