Jacob Thornton
5e5965ca6f
Merge branch 'accessibility' into 2.1.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
2012-06-02 16:11:35 -07:00
Jacob Thornton
ebc6935663
2.0.3 -> 2.0.4
2012-06-01 11:04:27 -07:00
Jacob Thornton
5657ab46c5
Merge branch '2.0.4-wip'
2012-06-01 10:53:47 -07:00
Jacob Thornton
4eaeea81fd
rebuild and fix test
2012-05-31 10:24:23 -07:00
Jacob Thornton
bcd5097c02
Merge pull request #3655 from jorgenfb/8dda83906d72ade81ecf9b21d55b5a2922589d30
...
Updated unit test for tooltips. Now using is() instead of hasClass()
2012-05-31 09:03:53 -07:00
Mark Otto
7875e4833c
fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing
2012-05-28 17:32:24 -07:00
Mark Otto
f53a038088
remake after merging IE7/8 bugfix for animations
2012-05-28 17:17:55 -07:00
Mark Otto
6fc5674466
Merge branch 'raymccoy-no-filters' into 2.0.4-wip
2012-05-28 17:17:36 -07:00
Mark Otto
9699e1d707
scope float right dropdown menus to immediate children
2012-05-28 01:13:24 -07:00
Mark Otto
241cbd478d
Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder
...
2.0.4 wip fix placeholder
2012-05-28 01:00:23 -07:00
Jacob Thornton
a85c8fe74e
add note about contributing
2012-05-27 20:07:58 -07:00
Corey Innis
8a06339501
fixes .placeholder to work as a "grouped selector"
...
adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`
the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.
2012-05-27 18:12:08 -07:00
Mark Otto
287086758b
add tracking but for production only
2012-05-26 23:17:23 -07:00
Mark Otto
cc8b260ed8
adding google analytics tracking to docs
2012-05-26 16:35:28 -07:00
Mark Otto
a7529e158b
remove color from labels
2012-05-25 09:19:10 -07:00
Mark Otto
7dbcd0be9a
fix navbar button for mobile tapping (turn to button instead of adding href=#), streamline less docs page
2012-05-24 21:30:43 -07:00
Mark Otto
aaf1825b49
fix example code for carousel
2012-05-24 20:26:08 -07:00
Mark Otto
fe30bd6055
make bootstrap like google maps a bit more
2012-05-24 20:18:52 -07:00
Mark Otto
76ee212343
make nested cols code match given example
2012-05-24 20:16:25 -07:00
Mark Otto
c1c679b644
#3592 : clarify grid sizing in grid docs
2012-05-24 20:13:59 -07:00
Mark Otto
7fa9f605d6
recompile after adding ms-placeholder
2012-05-24 19:18:06 -07:00
Mark Otto
72e3b3beb3
Merge branch 'ademaro-patch-1' into 2.0.4-wip
2012-05-24 19:17:49 -07:00
Ademaro
34e5bc5f1d
ie support placeholder color ( http://msdn.microsoft.com/en-us/library/ie/hh772745(v=vs.85).aspx )
2012-05-24 13:57:02 +04:00
Mark Otto
19489496c1
remove redeclared font styles from <p> and rebuild
2012-05-23 00:05:30 -07:00
Mark Otto
5d27fbb32d
Merge branch 'pvorb-patch-1' into 2.0.4-wip
2012-05-23 00:05:13 -07:00
Mark Otto
3b6b6eb242
fix field state mixin
2012-05-23 00:04:54 -07:00
Tomás Arribas
642f75141d
Do not use filters in fade animations
2012-05-21 02:56:57 +02:00
Jørgen Borgesen
8dda83906d
Swapped out .hasClass() with .is() when checking for multiple classes
2012-05-20 20:10:21 +02:00
Jørgen Borgesen
e388a5e475
Added unit test to check that tooltips is not showed when leave event is triggered before show delay has expired AND the hide delay is set to 0
2012-05-20 19:59:53 +02:00
Paul Vorbach
faf2866f96
Remove re-declaration of font-fam, font-size, and line-height in p
2012-05-20 11:54:21 +03:00
Mark Otto
78790da03c
fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas
2012-05-17 22:00:49 -07:00
Mark Otto
e5187e12c4
fix modal example per #3510
2012-05-17 21:48:13 -07:00
Mark Otto
1dbf4c92ce
manually resolve #3516 : type in less docs
2012-05-17 21:45:45 -07:00
Jacob Thornton
b1d7c34086
remove log
2012-05-17 00:45:28 -07:00
Jacob Thornton
9889948f58
abandon activedescendant because it was awful
2012-05-17 00:39:14 -07:00
Jacob Thornton
a7b49a7d92
nearly everything working with activedescendant... then decide it's wrong.
2012-05-17 00:23:11 -07:00
Jacob Thornton
10c6db4b14
add proper role to dialog markup and cleanup modal logging
2012-05-16 19:43:22 -07:00
Jacob Thornton
4b53778150
Merge branch 'master' into 2.0.4-wip
2012-05-16 19:10:49 -07:00
Jacob Thornton
a404ac33bb
modal accessibility tab control
2012-05-16 19:09:57 -07:00
Mark Otto
5ecab6112c
version bump on docs home
2012-05-15 10:59:06 -07:00
Mark Otto
e009ed23fc
move navbar and update paths so it sits in tests
2012-05-15 09:45:53 -07:00
Mark Otto
67f81a2ed5
clarify button type on dismiss icons
2012-05-15 09:41:06 -07:00
Mark Otto
0679f24606
example incorrect for modal dismiss button
2012-05-15 09:37:28 -07:00
Mark Otto
3a27b4e6f6
remake again after pull
2012-05-15 09:07:55 -07:00
Mark Otto
6be09df1bf
Merge branch '2.0.4-wip-forms' of github.com:twitter/bootstrap into 2.0.4-wip-forms
2012-05-15 09:07:31 -07:00
Mark Otto
a9d4b667ff
finish fixing uneditable-input and remake
2012-05-15 09:07:19 -07:00
Mark Otto
532569fe59
updated forms to rearrange focus state, reinstate uneditable-input, and a few other cleanup tidbits
2012-05-15 09:04:44 -07:00
Mark Otto
ecf84bdac5
correct regressions against 2.0.3
2012-05-15 00:17:02 -07:00
Mark Otto
87f6e426b3
three columns
2012-05-14 23:50:34 -07:00
Mark Otto
c8cafa5d5a
move forms test to less/tests
2012-05-14 23:45:25 -07:00
