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

2912 Commits

Author SHA1 Message Date
Mark Otto
b6b354ceaa #3255: typo in components for tabbable tabs 2012-04-30 15:42:55 -07:00
Mark Otto
51153766f5 Merge branch 'anirvan-master' into 2.0.4-wip 2012-04-30 15:41:47 -07:00
Mark Otto
59ec4c7154 make responsive input fields not wrap for fluid input prepend/append by setting block back to inline-block (oversight of 2.0.3) 2012-04-30 15:40:49 -07:00
Mark Otto
c204bc66d6 #3237: change to CSS comments in responsive docs 2012-04-30 15:33:35 -07:00
Mark Otto
6e9756ebb6 #3228: update docs to list dependencies from 2.0.3 for compiling via make 2012-04-30 15:30:56 -07:00
Mark Otto
ad46b0980c expand input css tests to fixed width grid 2012-04-30 15:06:26 -07:00
Anirvan Chatterjee
ec56940c51 several spelling corrections 2012-04-27 10:48:59 -07:00
Matt Morgan
bf9d8fcc07 Alter typeahead to accept synchronous/asynchronous data source via function/callback 2012-04-26 14:09:20 -04:00
Allen Bargi
ab178060be let's reuse color variables, instead of hardcoding colors. 2012-04-26 17:38:47 +03:00
Jacob Thornton
b261f9781b Merge pull request #3226 from aziz/patch-6
No need to specify units when a value is 0, thanks to RECESS
2012-04-25 22:19:49 -07:00
Jacob Thornton
ffb4d9025b rebuild with typeahead change 2012-04-25 22:15:39 -07:00
Jacob Thornton
fc509e14b2 revert position -> offset for typeahead position 2012-04-25 22:14:39 -07:00
Jacob Thornton
a29e5a9dd6 fix #3234 2012-04-25 21:52:05 -07:00
Allen Bargi
99c3b7810b No need to specify units when a value is 0, thanks to RECESS 2012-04-25 18:16:59 +03:00
Jacob Thornton
aaabe2a46c fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild) 2012-04-24 18:06:41 -07:00
Mark Otto
66ac6e14db heading 2012-04-24 06:53:48 -07:00
Mark Otto
7b282798a3 officially drop support for offset on thumbnails since it breaks BC 2012-04-24 06:52:57 -07:00
Mark Otto
5be84ad0b7 restore margins on thumbnails, add comments about it's changes and how responsive affects it 2012-04-24 06:45:21 -07:00
Mark Otto
f9744ff522 make component animations work cross browsers with opacity mixin, restore float on thumbnails > li 2012-04-24 06:39:14 -07:00
Jacob Thornton
e659dc7e1b Merge branch '2.0.3-wip'
Conflicts:
	Makefile
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
2012-04-24 02:21:45 -07:00
Jacob Thornton
839ef3a030 2.0.2 -> 2.0.3 2012-04-24 02:19:02 -07:00
Mark Otto
79d7092a39 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-24 02:12:09 -07:00
Mark Otto
d8aaf50798 implement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect, but mostly solid 2012-04-24 02:11:59 -07:00
Jacob Thornton
fc871a4821 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-24 02:02:28 -07:00
Jacob Thornton
73453c7f79 changes for build in preperation for 2.0.3 release 2012-04-24 02:02:06 -07:00
Mark Otto
1c2db11d58 fix ie7 button group toggles and button borders 2012-04-24 01:46:20 -07:00
Mark Otto
805ca03457 fix #3179: cut off radios and checkboxes 2012-04-24 01:33:00 -07:00
Mark Otto
7f6f3ff462 fix #3202: add cursor to .accordion-toggle 2012-04-24 01:23:24 -07:00
Mark Otto
f805a6080c Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-23 10:06:45 -07:00
Mark Otto
419e50e339 fix up buttons after recess property order 2012-04-23 10:06:35 -07:00
Jacob Thornton
b8b1ffde05 hr to var in makefil 2012-04-23 04:16:27 -07:00
Jacob Thornton
c408d8961b rewrite server.js, fix travis 2012-04-23 03:44:32 -07:00
Jacob Thornton
c896a182e1 increase length of waitfor timeout for phantom 2012-04-23 03:18:13 -07:00
Mark Otto
091a97c01c white bg on docs again 2012-04-23 03:06:30 -07:00
Mark Otto
176e0b1169 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-23 03:05:22 -07:00
Mark Otto
99a916d5eb remove background color from radios and checkboxes for IEs 2012-04-23 03:05:10 -07:00
Mark Otto
192cb575da fix typo 2012-04-22 23:56:36 -07:00
Jacob Thornton
f84882122e style changes to phantom integration 2012-04-19 17:40:58 -07:00
Jacob Thornton
03f78f7a60 run qunit tests in phantomjs for travis-ci 2012-04-19 17:34:07 -07:00
Jacob Thornton
1160935446 make a few changes to package.json (add make test to makefile) 2012-04-19 16:38:43 -07:00
Jacob Thornton
de9271bfd1 Merge pull request #3157 from caniszczyk/2.0.3-wip
Add TravisCI support and update README
2012-04-19 16:35:27 -07:00
Chris Aniszczyk
c99dcd2e93 Add Travis CI Support
Continous integration is nice, fixes #3155

Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2012-04-19 16:09:59 -07:00
Mark Otto
fd009597b6 mention responsive css in navbar responsive section 2012-04-19 09:28:40 -07:00
Jacob Thornton
f89394b8ef make build prettier - hopefully this works, maybe some makefile bro's can improve 2012-04-18 22:49:31 -07:00
Jacob Thornton
edb52a82d8 make bootstrap compile with Recess instead of Less 2012-04-18 16:16:42 -07:00
Jacob Thornton
bc07e2adae allow for pushstate in scrollspy 2012-04-18 13:35:14 -07:00
Jacob Thornton
b627898919 Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-18 13:15:58 -07:00
Jacob Thornton
8f98c4fbf6 offset -> position #3088 2012-04-18 13:15:13 -07:00
Mark Otto
47b6e6bd80 fix #3111, badge and label alignment with surrounding text 2012-04-18 09:47:30 -07:00
Mark Otto
62a0f5fdcb Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-18 09:37:12 -07:00