Giuliano Velli
f5fd5e7523
Added Medias code and documentation
...
Added media.less and edited bootstrap.less and responsive.less to manage media components.
Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos
Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-20 17:55:22 +02: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
Mark Otto
178a9f3b51
fix some text around media queries in the docs
2012-04-18 09:37:07 -07:00
Mark Otto
48e6d88889
Merge pull request #3128 from codler/patch-2
...
Add -ms-user-select
2012-04-18 09:22:38 -07:00
Han Lin Yap
c09602d172
add -ms-user-select
2012-04-18 11:38:14 +03:00
Jacob Thornton
f3cf4cbaae
rebuild
2012-04-16 17:36:03 -07:00
Jacob Thornton
ba202d77ba
Merge pull request #3104 from iamnirav/2.0.3-wip
...
Allow updater function in bootstrap-typeahead.js (updates the value of the input field) to be overridden
2012-04-16 17:35:32 -07:00
Nirav Sanghani
031fa47f68
Update new typeahead method docs to be a bit clearer.
2012-04-16 17:27:34 -07:00
Nirav Sanghani
d5a95315eb
Update typeahead docs to reflect new option.
2012-04-16 17:24:51 -07:00
Nirav Sanghani
8e8b1ad03d
Allow updater function (updates the value of the input field) to be overridden.
2012-04-16 17:05:35 -07:00
Jacob Thornton
2881269e16
lots of property ordering
2012-04-16 16:34:08 -07:00
Jacob Thornton
a3ec868ac2
few more property orders
2012-04-16 15:37:17 -07:00
Jacob Thornton
457859feba
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
2012-04-16 15:09:26 -07:00
Jacob Thornton
498b7d984a
a few property reordering things
2012-04-16 15:09:05 -07:00
Mark Otto
5fa0fcc888
fix modal per #3086
2012-04-16 14:38:22 -07:00
Mark Otto
41b695b8cd
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-04-15 17:25:38 -07:00
Mark Otto
a184806538
nuke line
2012-04-15 17:25:32 -07:00
Jacob Thornton
6cf9906a60
build bootstrap.js and bootstrap.min.js into docs
2012-04-15 17:03:33 -07:00
Mark Otto
5c5310dc87
remove @gridRowWidth var since we don't use it anywhere
2012-04-15 16:57:11 -07:00
Mark Otto
b67a2d8a59
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-04-15 16:48:26 -07:00
Mark Otto
d374fe92e5
simplify the left margin for offset grid columns
2012-04-15 16:48:17 -07:00
Jacob Thornton
6506ede632
add bootstrap + bootstrap.min.js to gh-pages for @remy
2012-04-15 16:45:13 -07:00
Jacob Thornton
0b8042656f
fixes #2941 + whitespace in collapse
2012-04-15 16:15:32 -07:00
Mark Otto
13e4d1d5ac
fix #2990 : text wrapping in .uneditable-input
2012-04-15 00:35:30 -07:00
Jacob Thornton
cad8f2b43a
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-04-15 00:20:50 -07:00
Jacob Thornton
e985681758
add zip to git ignore, and fix gh-pages make
2012-04-15 00:19:25 -07:00
Jacob Thornton
2a6894d834
simplify make - move zipping to gh-pages only
2012-04-15 00:16:09 -07:00
Mark Otto
6c221d65e3
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-04-15 00:06:35 -07:00
Mark Otto
a4c2332eb1
move js tooltip link
2012-04-15 00:06:11 -07:00
Jacob Thornton
c262ead6ed
change comments to preserve for yui
2012-04-14 23:51:08 -07:00
Jacob Thornton
be0efcfcfc
whitespace
2012-04-14 23:38:11 -07:00
Jacob Thornton
1ca1ef94ee
fix opera bug \o/ !!!! #1776
2012-04-14 23:24:19 -07:00
Mark Otto
9e9be2dc0d
fix #2989 : clear .checkbox/.radio floats
2012-04-14 23:19:42 -07:00
Jacob Thornton
cf4924764c
rebuild with tooltip formatting change
2012-04-14 23:11:19 -07:00
Jacob Thornton
19469aa52c
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
2012-04-14 23:10:41 -07:00
Jacob Thornton
b14455b03a
add tests for mouseout delay in tooltip
2012-04-14 23:10:03 -07:00
Mark Otto
2dbce887df
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-04-14 23:07:51 -07:00
Mark Otto
a6f27ebed4
ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous
2012-04-14 23:06:00 -07:00