rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Code Issues Actions Packages Releases Activity
3,135 Commits 108 Branches 89 Tags 547 MiB
5af5c2ed36
Commit Graph

2103 Commits

Author SHA1 Message Date
Mark Otto
9aa5a6db12 updated tests and homepage marketing copy 2012-06-19 13:21:35 -07:00
Jon Stevens
af88f54e5d small typo fix to docs 2012-06-18 19:56:52 -07:00
Jon Stevens
6a974f9ff7 enable the ability to destroy tooltips and popovers from elements. related to issue #3453 2012-06-18 19:25:54 -07:00
Mark Otto
b1cb556503 improve inline-block of append/prepend inputs with font-size: 0; 2012-06-14 11:56:46 -07:00
Mark Otto
cda48d41ba fix #gradientBar to .gradientBar in LESS docs 2012-06-13 22:04:02 -07:00
Mark Otto
3ead14a1e0 clarify support of select items (which is none) for input-prepend/append 2012-06-13 22:00:10 -07:00
Mark Otto
2cbff258b9 fix examples page 2012-06-11 22:33:16 -07:00
Mark Otto
1db72f8d77 Merge pull request #3810 from purwandi/develop 
Add space between attrs in docs on navbar button
 2012-06-11 22:31:58 -07:00
Mark Otto
2e6d4e9439 more rearrangement and removal of about sections in js docs 2012-06-11 22:28:10 -07:00
Mark Otto
bf875d9e36 cleanup options display in all sections, rearrange typeahead section 2012-06-11 22:19:25 -07:00
Purwandi
c7ffe6edc8 Add space on navbar button 2012-06-12 12:17:10 +07:00
Mark Otto
f453909f39 add a dropdowns section to Components (still needs work) and reformat much of the js docs 2012-06-11 21:48:41 -07:00
Mark Otto
5dd47f1196 keep tables at 13px in docs for now, clean up some modals js docs stuff 2012-06-11 20:33:00 -07:00
Mark Otto
7ed02b461b fix blockquote alignment 2012-06-11 20:20:51 -07:00
Mark Otto
a0cd886c56 rewrite the rest of the nav section 2012-06-10 21:24:13 -07:00
Mark Otto
c90c66e61f rewrite the split button dropdowns section 2012-06-10 21:00:20 -07:00
Mark Otto
081a07c168 updated button groups section 2012-06-10 20:50:49 -07:00
Mark Otto
017b7cb804 rewrite the navbar section 2012-06-10 20:39:00 -07:00
Mark Otto
0c817bf5e2 redo pagination and breadcrumbs 2012-06-10 16:46:46 -07:00
Mark Otto
3985379cca rearrange hero unit section 2012-06-10 15:14:21 -07:00
Mark Otto
f2e39233f5 rewrite alerts and progress bars sections 2012-06-10 15:12:02 -07:00
Mark Otto
4a907709ba redo icons section 2012-06-09 23:26:46 -07:00
Mark Otto
5ef2b6561a realign icons to five cols, fix buttons 2012-06-09 22:47:45 -07:00
Mark Otto
fc2481b8e5 fix form display issue in docs 2012-06-09 19:26:06 -07:00
Mark Otto
c65006601e overhaul forms docs to simplify presentation of everything, reduce text, and increase visibility of examples 2012-06-09 19:15:46 -07:00
Mark Otto
ca63ea2f26 overhaul tables docs for more streamlined content 2012-06-09 13:15:28 -07:00
Mark Otto
aff3694f28 remove mention of prettify from docs, fix docs subnav width when fixed 2012-06-09 12:58:55 -07:00
Mark Otto
550e375af0 restore scrollspy to body 2012-06-08 16:35:04 -07:00
Mark Otto
269ce715f1 overhaul js docs top sections, update subhead 2012-06-07 22:24:47 -07:00
Mark Otto
97c7a83a8f remove individual js file download buttons 2012-06-07 22:12:15 -07:00
Mark Otto
bba0b34c36 restore top navs entirely 2012-06-07 22:10:36 -07:00
Mark Otto
c1c7528dd9 drop the side nav, restore topbar 2012-06-07 21:48:03 -07:00
Mark Otto
df869f1eb0 fix grids 2012-06-07 21:45:37 -07:00
Mark Otto
ff6dd0cf56 nav and content tweaks 2012-06-07 14:01:03 -07:00
Mark Otto
860a96939a fix grid tooltips, tweaks 2012-06-07 10:58:15 -07:00
Mark Otto
a1aa2b188a more content changes to docs 2012-06-07 10:20:52 -07:00
Mark Otto
2ecbd36cbf add back left rail nav, tweak colors 2012-06-06 00:48:31 -07:00
Mark Otto
10d68406fe examples-wrap tables 2012-06-05 23:59:50 -07:00
Mark Otto
2c5ac562d2 updated type section of base css 2012-06-05 20:47:40 -07:00
Mark Otto
5a614fb86d remove sidenav 2012-06-05 19:53:54 -07:00
Mark Otto
09ec0b843e updated less page to single col 2012-06-05 18:29:26 -07:00
Mark Otto
8ee0679522 updated javascripts for first pass at single column 2012-06-05 18:25:46 -07:00
Mark Otto
53cec198c0 update layout for side nav 2012-06-05 17:17:20 -07:00
Mark Otto
22918f8f92 more tweaks to layouts and some docs styles 2012-06-05 17:16:17 -07:00
Mark Otto
dd127611e1 two col scaffolding rev 2012-06-05 00:46:16 -07:00
Mark Otto
094e65eb9d adding 20px grid, setting that on docs 2012-06-04 23:58:51 -07:00
Mark Otto
de53f62a04 more changes to js and components, playing with new docs subnav 2012-06-04 23:57:48 -07:00
Mark Otto
47e2c43401 navs tabs pills to single column 2012-06-04 23:37:18 -07:00
Mark Otto
b8d8704f90 button groups and dropdowns to single column 2012-06-04 23:34:02 -07:00
Mark Otto
446f9199c6 updated index page and footer 2012-06-04 23:31:26 -07:00
Mark Otto
f0ff20ec40 updating scaffolding page to single column 2012-06-04 23:10:30 -07:00
Mark Otto
257890f839 finish off rest of base-css page 2012-06-04 23:03:21 -07:00
Mark Otto
060100cf3a update table section to single column 2012-06-04 21:13:35 -07:00
Mark Otto
094e12f68d convert code section to new layout 2012-06-04 21:10:08 -07:00
Mark Otto
c44bd1edf4 revamp docs to have new width, start realigning the base css page to match 2012-06-04 21:08:31 -07:00
Mark Otto
632c6d22a2 add bs-docs-examples styles from other branch 2012-06-04 20:57:58 -07:00
Mark Otto
eef87c96af #3684: reset width to auto for input type='image' 2012-06-04 20:27:42 -07:00
Mark Otto
348668ec13 add misc helper classes to components css docs 2012-06-04 20:25:57 -07:00
Mark Otto
589242604f document large and small well classes 2012-06-04 18:56:50 -07:00
Mark Otto
b79c100967 add placeholder to input-prepend to confirm FF placeholder looks good 2012-06-04 18:44:50 -07:00
Mark Otto
c56eb0962a fix double @@ on less pages 2012-06-04 18:39:02 -07:00
Mark Otto
8df906e641 Merge branch 'wachunga-2.0.4-wip' into 2.1.0-wip 2012-06-04 08:47:48 -07:00
Mark Otto
9cceb0bba7 Merge branch '2.0.4-wip' of https://github.com/wachunga/bootstrap into wachunga-2.0.4-wip 2012-06-04 08:47:41 -07:00
Mark Otto
5563b8448e fix #3693: rounded corners on search form 2012-06-04 08:45:51 -07:00
Mark Otto
8eb1488861 wrap download page in form 2012-06-04 08:44:50 -07:00
Mark Otto
37ba0eba02 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-04 08:33:48 -07:00
Mark Otto
eb3a4b8f75 fix placeholder for FF by attaching input and textarea when we call the mixin 2012-06-04 08:33:42 -07:00
Jacob Thornton
82ea5847a7 adds remote source to modal. Remote source can be specified in href or by providing a remote option #936 2012-06-03 21:26:54 -07:00
Jacob Thornton
041b8bdfd3 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-03 11:24:51 -07:00
Jacob Thornton
31e8a358c3 check length so that pause, actually pauses 2012-06-03 11:24:19 -07:00
Mark Otto
ad9bfeef7a fix cut off icons 2012-06-02 22:34:20 -07:00
Mark Otto
9a4ee790e1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2012-06-02 22:14:12 -07:00
Mark Otto
9a3a297a47 update version # on homepage, crush assets 2012-06-02 22:12:45 -07:00
Jacob Thornton
2d3a0babd2 make active selector more specific #2043 and rebuild 2012-06-02 22:10:35 -07:00
Matt Morgan
af14f6db5d Merge branch 'async' into 2.1.0-wip 2012-06-03 00:33:06 -04:00
Jacob Thornton
a38bc90b48 change note to point out that boostrap.js bundles all plugins #3174 2012-06-02 21:19:56 -07:00
Jacob Thornton
ebc1fe907d only trigger $.support.transition.end when it exists 2012-06-02 21:09:13 -07:00
Jacob Thornton
3a751a63d4 fix multi carousel bug #3194 2012-06-02 21:01:45 -07:00
Jacob Thornton
555a3b0478 fix carousel when hiding a reshowing - make sure it always triggers transition end #3248 2012-06-02 20:28:08 -07:00
Jacob Thornton
0b827965d3 fix regression in typeahead #3313 2012-06-02 19:31:30 -07:00
Jacob Thornton
354f99f0bd add length to parent dropdown check #3316 2012-06-02 19:02:30 -07:00
Jacob Thornton
4ca1cba3f8 upgrade jquery to 1.7.2 #3379 2012-06-02 18:25:07 -07:00
Jacob Thornton
b07b869b26 rebuild assets 2012-06-02 18:15:23 -07:00
Jacob Thornton
806a82ef83 add relatedTarget to carousel slide event 2012-06-02 18:06:00 -07:00
Jacob Thornton
f836473129 add html option back to tooltip and popover to explicitly prevent XSS #3421 2012-06-02 17:55:10 -07:00
Jacob Thornton
fc96bc8bba rebuild doi 2012-06-02 17:30:00 -07:00
Jacob Thornton
5b401a8c16 add collapsed class to collapse invoker when it's target is collapsed #3525 2012-06-02 17:28:38 -07:00
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
4eaeea81fd rebuild and fix test 2012-05-31 10:24:23 -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
9699e1d707 scope float right dropdown menus to immediate children 2012-05-28 01:13:24 -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
19489496c1 remove redeclared font styles from <p> and rebuild 2012-05-23 00:05:30 -07:00
Mark Otto
3b6b6eb242 fix field state mixin 2012-05-23 00:04:54 -07: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
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
a9d4b667ff finish fixing uneditable-input and remake 2012-05-15 09:07:19 -07:00
Mark Otto
ecf84bdac5 correct regressions against 2.0.3 2012-05-15 00:17:02 -07:00
Mark Otto
c8cafa5d5a move forms test to less/tests 2012-05-14 23:45:25 -07:00
Mark Otto
a0809ceebe add forms test page for all html5 input types and refactor selectors 2012-05-14 23:40:06 -07:00
Mark Otto
33061a8e0b document .lead per #3213 2012-05-14 22:02:51 -07:00
Mark Otto
1b537c6f9c adding navbar example, for fixed and static navbars 2012-05-14 08:57:24 -07:00
Mark Otto
826a8714e2 #3257: share .navbar-fixed-top styles with .navbar-fixed-bottom 2012-05-13 22:11:35 -07:00
Mark Otto
ea15660973 #3420: properly scope dropdown open state to immediate children only 2012-05-13 21:52:18 -07:00
Mark Otto
332d2a7384 #3438: fix typo on i18n tag 2012-05-13 17:43:56 -07:00
Mark Otto
a2fb9ed42f #3449: make legend and form-actions the same border color 2012-05-13 17:43:04 -07:00
Mark Otto
8f44245850 document .hyphens() mixin 2012-05-13 14:31:31 -07:00
Mark Otto
7de65e0a62 #3465 part 2: add mention to docs of type button issue 2012-05-13 14:03:32 -07:00
Mark Otto
d09db29039 #3465 part 1: add type="button" to all dismiss buttons in docs 2012-05-13 14:01:57 -07:00
Mark Otto
6a89659727 #3468: 140 icons, not 120 2012-05-13 13:59:20 -07:00
Mark Otto
3a21891824 #3469: add variables for dropdown menu dividers 2012-05-13 13:58:42 -07:00
Mark Otto
526d77af61 remove wrapping <label> from all js docs 2012-05-13 11:10:08 -07:00
David Hirtle
452d8c1df0 Gradient mixins blow up in IE7/8 if you happen to use rgba() colors as params 2012-05-04 13:50:16 -07:00
Mark Otto
ef368f0076 #3263: typo in forms docs 2012-04-30 15:43:47 -07:00
Mark Otto
b6b354ceaa #3255: typo in components for tabbable tabs 2012-04-30 15:42:55 -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
Matt Morgan
bf9d8fcc07 Alter typeahead to accept synchronous/asynchronous data source via function/callback 2012-04-26 14:09:20 -04:00
Jacob Thornton
ffb4d9025b rebuild with typeahead change 2012-04-25 22:15:39 -07:00
Jacob Thornton
a29e5a9dd6 fix #3234 2012-04-25 21:52:05 -07: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
Giuliano Velli
4fbb400754 Added Medias code and documentation 
Fix for Issue #1711

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-24 17:19:17 +02: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
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
419e50e339 fix up buttons after recess property order 2012-04-23 10:06:35 -07:00
Mark Otto
091a97c01c white bg on docs again 2012-04-23 03:06:30 -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
Mark Otto
fd009597b6 mention responsive css in navbar responsive section 2012-04-19 09:28:40 -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
Jacob Thornton
f3cf4cbaae rebuild 2012-04-16 17:36:03 -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
Jacob Thornton
2881269e16 lots of property ordering 2012-04-16 16:34:08 -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
Jacob Thornton
6cf9906a60 build bootstrap.js and bootstrap.min.js into docs 2012-04-15 17:03:33 -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
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
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
Jacob Thornton
c7dc4cc573 change position of var in dropdown + cleanup makefile vars 2012-04-14 22:43:36 -07:00
Mark Otto
8dc1a0eade Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-14 22:43:26 -07:00
Mark Otto
490eb1bd16 fix #3068: compile after changing comment 2012-04-14 20:56:50 -07:00
Mark Otto
fc7ae48c95 fix #1823: styles of tabs within other tabs resolved 2012-04-14 18:47:27 -07:00
Mark Otto
def7ae7798 bump version on docs homepage to 2.0.3 2012-04-14 18:30:43 -07:00
Mark Otto
4bcb89946b merge in #2684, offset on the .makeColumn mixin 2012-04-14 18:18:11 -07:00
Jacob Thornton
82267d48ff calling pause on a slide should actually pause it - even when hovering 2012-04-14 17:49:51 -07:00
Jacob Thornton
34132f0e89 rebuild 2012-04-14 17:19:00 -07:00
Mark Otto
ce30d19c15 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-14 17:16:37 -07:00
Mark Otto
dbde2dc9e4 adding icon classes to finish off glyphicons 1.6 update 2012-04-14 17:15:16 -07:00
Jacob Thornton
3408064d00 hack for subnav 2012-04-14 17:15:03 -07:00
Mark Otto
d5063e5dc8 fix #3032: update glyphicons sprite to 1.6 release 2012-04-14 16:59:49 -07:00
Jacob Thornton
575f18aaf4 add jshint support + a few minor stylistic changes 2012-04-14 16:29:53 -07:00
Mark Otto
8575a45294 alt fix to #3029: change to single border-radii properties 2012-04-14 13:31:48 -07:00
Mark Otto
a7d8145a32 fix #3036: add bg color to inputs 2012-04-14 13:18:37 -07:00
ctalkington
0e6f12af86 add 's' to 'classe' in components docs. thanks mishmosh. 2012-04-12 15:14:54 -05:00
Bryan Petty
5b85ed181a Fixed extra margin on Navbar buttons. 2012-04-10 15:22:17 -06:00
Mark Otto
48063afb3a Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-07 23:41:27 -07:00
Mark Otto
0b2d23d443 add larger .input-* to block reset for responsive <767 2012-04-07 23:41:09 -07:00
Mark Otto
5bc601d9a8 fix typo on js docs selector 2012-04-07 23:37:58 -07:00
Jacob Thornton
08fee005a8 https://github.com/twitter/bootstrap/issues/2954 2012-04-07 21:26:46 -07:00
Mark Otto
a20cd66ba4 clean up new input append examples 2012-04-07 16:49:06 -07:00
Mark Otto
3ecf109835 fix conflicts, add docs example for two buttons on an append 2012-04-07 16:44:03 -07:00
Mark Otto
0a71f171bc readd bootstrap.zip, add @inputBorderRadius var to close #2946 2012-04-07 16:17:15 -07:00
Mark Otto
f563b1db43 update kippt screenshot 2012-04-07 15:59:14 -07:00
Mark Otto
5591a9b966 use yui-compress by default instead of regular compress 2012-04-07 14:56:37 -07:00
Mark Otto
798363eda7 fix left margin on .thumbnails for responsive <767 2012-04-07 14:31:55 -07:00
Mark Otto
10ff5f16a6 fix #2968 manually: add consolas to monospace font stack 2012-04-07 14:25:58 -07:00
Bryan Petty
4b81c0dff3 Changed .nav-collapse to clear both instead of left, and added compiled files. 2012-04-05 14:13:16 -06:00
Jacob Thornton
4953629ccd Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-04 15:13:27 -07:00
Jacob Thornton
83febb3452 remake and add isHTML check to popover as well 2012-04-04 15:02:30 -07:00
Mark Otto
2ea437f353 fix #2908: unfloat inputs using .span* in fluid row 2012-04-02 22:49:19 -07:00
Mark Otto
4462f24753 fix #2911: correct /lib/ path to /less/ 2012-04-02 22:40:06 -07:00
Mark Otto
2988de6377 fix #2913: get more specific with button group selectors 2012-04-02 22:38:12 -07:00
Bryan Petty
030265eaec Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar. 2012-04-02 02:52:06 -06:00
Mark Otto
647f1c98ed fix #2296: allow fluid thumbnails 2012-04-01 01:05:00 -07:00
Mark Otto
fe05f9aeb2 fix #2572: streamline thumbnails css to allow for offsets 2012-04-01 00:59:34 -07:00
Mark Otto
33fa705c7f fix #2811: left and right aligned tabbable tabs fixes so that .tab-content grows to match parent's width 2012-04-01 00:15:04 -07:00
Mark Otto
d652af1097 fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts 2012-03-31 23:53:54 -07:00
Mark Otto
452ddc0f0d update less docs page to reflect changes in mixins (no more default values) and variable name fix 2012-03-31 21:36:45 -07:00
Mark Otto
f37d9aeaef fix #2856: make inputs using .span* classes responsive at <767px layout 2012-03-31 21:31:01 -07:00
Mark Otto
2355fd224d remove @shadow instances and replace with escaped values, update mixins to not use a default value at all 2012-03-31 21:06:16 -07:00
Mark Otto
56ecc6ba96 clarify use of dropdowns, href, and data-target for js docs; add tests to css tests page for it's display and execution in html 2012-03-31 12:31:56 -07:00
Mark Otto
37745cd899 fix fluid grid selectors to remove > in selectors 2012-03-31 00:53:38 -07:00
Jacob Thornton
2dc979a202 MSTransitionEnd + move paren (thanks rick waldron) 2012-03-29 14:14:17 -07:00
Jacob Thornton
0665c3ebf7 move over paren just because. 2012-03-29 13:55:56 -07:00
Jacob Thornton
422d04cb2b simplify transition plugin a little 2012-03-29 13:51:23 -07:00
Jacob Thornton
30b3f47e31 remove "technique" 2012-03-29 12:48:37 -07:00
Jacob Thornton
8ea8c312ea replace UA sniffing 2012-03-29 12:35:06 -07:00
Mark Otto
a9f9949b3e rearrange other parts of forms docs 2012-03-28 19:41:23 -07:00
Mark Otto
04baa07547 document .backface-visibility and update comments and initial value 2012-03-28 18:25:27 -07:00
Mark Otto
3308d1968f fix #2846: Firefox required two clicks on selects to get to options dropdown 2012-03-28 18:18:41 -07:00
Mark Otto
d6680a50b9 start rearranging form docs and clear up messaging about required classes and default styles 2012-03-28 18:00:05 -07:00
Mark Otto
369ca13c75 fix homepage link in css-tests and remove second help text from example form 2012-03-28 17:52:03 -07:00
Mark Otto
66743676ce moving css tests to less directory 2012-03-28 17:41:40 -07:00
Mark Otto
93d42ca80e fix #2832: clarify docs on use of .tabbable and add mention of .fade 2012-03-28 17:35:06 -07:00
Mark Otto
e41584afb5 fix #2829: redeclare .pull-right for navs since they get more specific floats 2012-03-28 17:02:13 -07:00
Mark Otto
0fe68de1a4 fix second booboo 2012-03-27 09:22:15 -07:00
Mark Otto
5b3268317c Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-27 09:21:35 -07:00
Mark Otto
d27fc24aa0 fix spelling booboo 2012-03-27 09:21:13 -07:00
Andreas Cederström
5d2062a3cc Finish of close conversion from a to button 2012-03-27 08:36:34 +02:00
Mark Otto
917f11e679 update LESS docs to note @baseFontSize and @baseLineHeight must be pixels 2012-03-26 09:30:42 -07:00
Mark Otto
d4914f47c3 fix #2799, mention of text in the navbar 2012-03-26 09:25:31 -07:00
Mark Otto
cffadd8c71 add position relative to .dropup 2012-03-25 22:28:43 -07:00
Mark Otto
4449c4e9e0 update docs messaging around alerts and buttons 2012-03-25 20:44:01 -07:00
Mark Otto
473e5714f7 change all anchor alert closes to buttons 2012-03-25 20:41:59 -07:00
Mark Otto
ea437351ed add heads up note for required href on alert dismiss actions 2012-03-25 19:47:13 -07:00
Mark Otto
4893928310 add back href for alerts in components docs to make close work on iphone 2012-03-25 18:03:30 -07:00
Mark Otto
825227474b add refresh method documentation to js docs to close #2028 and #2795 2012-03-25 17:37:38 -07:00
Mark Otto
3e2e111b17 add css tests for fluid rows and inputs 2012-03-25 17:11:50 -07:00
Mark Otto
95c2877ffc remove > in fluid grid selectors, fix double padding issue on fluid layout and example 2012-03-25 16:41:46 -07:00
Mark Otto
8d52e6d458 change arrows in one pagination example because opera janks it up, per #2697 2012-03-25 14:51:54 -07:00
Mark Otto
4c3e7690ba jankify the IE7 horizontal forms a bit more to account for no labels before .controls, per #2728 2012-03-25 14:46:47 -07:00
Mark Otto
cbd77d0aeb give IE7 inline-block behavior for input-prepend/append 2012-03-25 14:37:19 -07:00
Mark Otto
d0526e31fa remove padding on .search-query for IE7-8 since it doesn't pick up large border-radius 2012-03-25 14:31:04 -07:00
Mark Otto
c0f28d81b0 Remove black border on buttons in IE7: 
1. Removed borders on .btn and increased line-height 2px to compensate
2. Set buttons to use the endColor of the gradient as the background-color by default for extra contrast between button and background
3. Set a 5% darker background-color on hover of buttons just for IE7
 2012-03-25 14:28:24 -07:00
Jacob Thornton
a62810918f fix responsive navbar 2012-03-25 13:33:36 -07:00
Mark Otto
a5552a1d70 revert bart's mixin fix 2012-03-25 12:42:47 -07:00
Mark Otto
b81a082cd1 add navbarheight support to .brand and .nav links in navbar 2012-03-25 12:32:29 -07:00
Mark Otto
6c5c29ada2 introduce .navbar-link to resolve issue with buttons in .navbar-text 2012-03-25 01:21:47 -07:00
Mark Otto
a7b8e52f8e Overhaul the responsive utility classes: 
1. Rename file from responsive-utility-classes.less to responsive-utilities.less
2. Add additional help text around the documentation for the classes in Scaffolding
3. Remove unnecessary display values on initial classes
4. Drop block values for inherit for better support on inline and table elements
5. Make use of \!important on every class to avoid classes with more specific selectors (e.g., .span* classes for the grid)
 2012-03-25 01:12:51 -07:00
Mark Otto
d1864b3608 adding 144x144 ipad touch icon 2012-03-25 00:46:03 -07:00
Mark Otto
1837b8ef2c remove height: auto on images since it interferes with inline dimensions 2012-03-25 00:20:30 -07:00
Mark Otto
223c8358ce Merge branch 'andreasbovens-master' into 2.0.3-wip 2012-03-25 00:07:09 -07:00
Jacob Thornton
3e7920820a add missing closing brace 2012-03-24 20:01:51 -07:00
Jacob Thornton
f02d017ffa return matcher value directly + cleanup first lines of files 2012-03-24 18:59:04 -07:00
Jacob Thornton
6dc59a9c3e add explict note that tooltip delay isn't applied to manual trigger type in popover/tooltip 2012-03-24 18:45:12 -07:00
Jacob Thornton
bccc2cb719 add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last 2012-03-24 18:20:09 -07:00
Jacob Thornton
ef5ac02b69 allow prevent default for show and hide event in modal 2012-03-24 17:50:21 -07:00
Andreas Bovens
de0aaff433 Added -o- and -ms- prefixes to animations CSS 
Added -o- and -ms- prefixes to make the animated progress bars to work
in the latest/upcoming versions of IE and Opera.
 2012-03-24 18:53:27 +01:00
Mark Otto
f9f03d8976 Merge branch 'bartt-master' into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap.css
	less/button-groups.less
 2012-03-23 20:56:48 -07:00
Mark Otto
c7afe382a2 fix other instances of mixins, swap use of box-shadow everywhere, include border-radius and transition 2012-03-23 20:56:04 -07:00
Mark Otto
f87e4c60e9 Merge branch '2.1.0-wip' into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-23 18:29:21 -07:00
Mark Otto
a57554222f Merge branch '2.0.3-wip' of https://github.com/andriijas/bootstrap into andriijas-2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-23 09:53:04 -07:00
Mark Otto
0b41984920 Fix #2758: Uneditable inputs in input-prepend/append 
1. Added a missing comma to the input-append's form control stack () to fix border-radius
2. Add  to the .uneditable-input in forms to remove the float as we do with all other form controls
 2012-03-23 09:47:57 -07:00
Andreas Cederström
eb4f708b91 badge-error => badge-important 2012-03-23 13:35:46 +01:00
Mark Otto
5179df1928 css tests cleanup 2012-03-23 01:31:22 -07:00
Mark Otto
de7aee2465 fix broken tables with double borders and such, add css tests page to start with table edge cases 2012-03-23 01:28:04 -07:00
Mark Otto
622b8fa3f0 adding blog link to docs homepage 2012-03-23 01:13:20 -07:00
Mark Otto
e84161076b add mention of transitions plugin requirement on collapse 2012-03-23 00:58:41 -07:00
Mark Otto
281e058ef2 fix #2613: labels hang too low 2012-03-23 00:40:10 -07:00
Mark Otto
ee3fc11add fix #2617: add negative margin to fixed-bottom navbar 2012-03-23 00:38:13 -07:00
Mark Otto
2729d15742 fix #2625 manually: account for dropup caret on large button 2012-03-23 00:37:15 -07:00
Mark Otto
b8d8ab1aad run make on merge of progress bars change 2012-03-23 00:28:58 -07:00
Mark Otto
a28fa20018 remove redundant max-width img from docs css 2012-03-22 23:49:39 -07:00
Mark Otto
c4fb703269 fix left and right tab-content alignment with width: auto; 2012-03-22 23:38:50 -07:00
Mark Otto
ac64d9405b Dropdowns overhaul: 
1. Removed broken and unused dropup examples from the navs/pills docs
2. New defaults for dropdown menus: all corners are rounded and always 1px offset from top unless otherwise specified
3. Refined active and open states for button dropdowns by adding a darker background color for each button variation when opened; also changed the opened dropdown-toggle's inset shadow to match that of an :active button
4. Generalized .dropdown.open to just .open, thus removing a few lines from button-groups.less.
5. Annnnnnnnnd I think that's it.
 2012-03-22 23:09:31 -07:00
Mark Otto
50b2245be5 restore max-width 100% for images 2012-03-22 22:06:23 -07:00
Mark Otto
ab068f6fda bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization 2012-03-22 21:33:06 -07:00
Mark Otto
bdf8a6966b remove labels and badges from customizer and replace with single file 2012-03-22 21:17:55 -07:00
Mark Otto
dbadac183d add new @formActionsBackground to customize page 2012-03-22 21:09:27 -07:00
Mark Otto
1852d077bf add shell of tests page, lighten form actions background and give it a variable 2012-03-22 21:08:41 -07:00
Mark Otto
b011daf67f finish adding remaining component variables to less docs page 2012-03-22 19:36:55 -07:00
Mark Otto
254bb40f00 remove mentions of unused button variable per #2537 2012-03-22 17:49:13 -07:00
Mark Otto
edca6f28f0 fix #2718, misaligned uneditable inputs in prepends/appends 2012-03-22 17:41:20 -07:00
Mark Otto
b7b84c7a0d remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append 2012-03-22 17:36:32 -07:00
Mark Otto
ceab161324 fix unescaped reset filter per #2575 2012-03-22 17:31:09 -07:00
Mark Otto
1a6a1828bf remove mention of siteWidth, no longer used 2012-03-22 17:23:20 -07:00
Mark Otto
42f636032c fix #2716, incorrect required markup for navbar search form 2012-03-22 17:22:19 -07:00
Mark Otto
e0c85fb69c use new font-stack mixins in base and alt font family mixins 2012-03-22 17:18:07 -07:00
Mark Otto
78e37e7d21 Merge branch 'font-variables' of https://github.com/ctalkington/bootstrap into ctalkington-font-variables 2012-03-22 17:13:58 -07:00
Mark Otto
89ea238c32 move navbarBrandColor closer to link color 2012-03-22 17:13:20 -07:00
Mark Otto
b59cb505f8 Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-22 17:12:22 -07:00
Mark Otto
fa1b3bdda4 Merge branch 'Synchro-master' into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-22 17:10:16 -07:00
Mark Otto
0e73a0e94b change spacing and fix code blocks 2012-03-22 17:09:54 -07:00
Mark Otto
d7af2714c6 remove separate badges and labels, add single file instead, remove hover from non-link badges/labels 2012-03-22 16:02:00 -07:00
Marcus Bointon
239c178b68 Clarify docs on how tabs are activated from JS, see #1000 2012-03-22 21:24:57 +01:00
Marcus Bointon
cfce34e300 Add more examples for activating tabs 
Make naming of tab id consistent
 2012-03-22 20:36:49 +01:00
Jacob Thornton
b3bf223617 filter out non matches in map 2012-03-21 23:59:27 -07:00
Jacob Thornton
20e085723b cache $(href) lookup 2012-03-21 23:51:32 -07:00
Jacob Thornton
706ee46b73 sort scrollspy to prevent flicker for unordered nav 2012-03-21 23:45:58 -07:00
Jacob Thornton
94b24aaa47 clear timeout to reset delays for tooltip/popover 2012-03-21 21:57:06 -07:00
Jacob Thornton
22963d7346 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-21 21:37:17 -07:00
Jacob Thornton
d5fb653914 top stripping leading and trailing whitespace + always use .html method 2012-03-21 21:35:02 -07:00
Marcus Bointon
2f06366399 Make changes in page templates, rebuild 2012-03-21 12:09:00 +01:00
Marcus Bointon
02a67ea59e Add note about styling tabs 
Fix typo in popover docs
 2012-03-21 11:28:23 +01:00
Marcus Bointon
a0203bc8e0 Fix and improve docs on tab config 2012-03-21 11:20:56 +01:00
Jacob Thornton
cb8dcfcebf if transitioning collapse, don't start new transition 2012-03-20 22:43:27 -07:00
Jacob Thornton
663e41d74f prevent dropdowns from closing when clicking inside form element inside dropdown 2012-03-19 23:13:55 -07:00
Jacob Thornton
63bd7cb478 fix slide logic for ie+ in carousel 2012-03-19 21:39:39 -07:00
Jacob Thornton
bce33bbb09 if parent in collapse, only grab children 2012-03-19 21:10:55 -07:00
Jacob Thornton
630ff4ff7d fix collapse bug in ie7+ for initial collapse in 2012-03-19 20:51:20 -07:00
Jacob Thornton
07d23b927e add activate to scrollspy docs 2012-03-19 20:29:22 -07:00
Jacob Thornton
67f199678c if interval is false, do not autocycle the carousel 2012-03-19 15:48:57 -07:00
Jacob Thornton
bf59220b87 ;) 2012-03-19 15:19:01 -07:00
Jacob Thornton
5a2c7eb50a select last item in scrollspy if you've reached the bottom of the document or element 2012-03-19 15:18:00 -07:00
Mark
cdd158c571 Could have sworn I added that 's'! 2012-03-18 12:49:18 -06:00
Mark
4c0905c5f2 Added URL fix from #2643 - Thanks ctalkington 2012-03-18 12:44:31 -06:00
ctalkington
2c4230e2d3 update docs to match variable addition. 2012-03-15 14:46:27 -05:00
ctalkington
99e96f64f7 update docs to match variable addition. 2012-03-15 14:39:28 -05:00
ctalkington
bf09c979ca make brand links follow navbarLinkColor but also be customizable in advanced cases. 2012-03-15 14:21:27 -05:00
Mark
d3873b0fc7 Typo Fixes for .mustache files 
Added the doc typo fixes to the .mustache files as well.
 2012-03-14 20:28:24 -06:00
Jacob Thornton
8e0afbeaa4 update hide text to h5bp technique #2586 2012-03-14 12:00:27 -07:00
Mark
6a61e81b7a Another Typo 
Fixed another typo pointed out by panahi.
 2012-03-13 13:36:58 -06:00
Mark
ffa0d2f180 Some Doc Typos 
Fixed doc typos in Components and Scaffolding.
 2012-03-13 10:35:08 -06:00
Jacob Thornton
59503e71ff 2.0.2 derp 2012-03-12 14:09:38 -07:00
Jacob Thornton
8182b1ef69 make docs again for 2.0.2 2012-03-12 14:03:24 -07:00
Jacob Thornton
1f7a64aa3d 2.0.2 2012-03-12 14:00:19 -07:00
Jacob Thornton
6d4867e799 remove commented out width 2012-03-12 13:45:36 -07:00
Jacob Thornton
56fe54df43 remove collapse class on open so that dropdowns are viewable 2012-03-12 13:37:44 -07:00
Jacob Thornton
cd89c34d99 can't have overflo: visible for "in" which is present during entirity of transition. 2012-03-12 13:31:38 -07:00
Mark Otto
7f3a2b3813 button group sizes for ie7 fixes 2012-03-12 12:44:47 -07:00
Mark Otto
e12c66aabe adding border variable for dropdowns, making dropdown carets use dropdown vars 2012-03-12 09:57:10 -07:00
Mark Otto
40fddffeec improve button docs 2012-03-12 09:38:12 -07:00
Mark Otto
5dff63d767 fix apple touch icons in examples 2012-03-12 00:21:52 -07:00
Mark Otto
685039d608 add a super jank fix for horizontal-forms and .input-prepend/append in IE7 2012-03-12 00:16:01 -07:00
Mark Otto
c35b04cccd enable buttons in input-append and input-prepend 2012-03-11 23:43:19 -07:00
Mark Otto
debc4b752f more homepage links cleanup, ditching the middots 2012-03-11 23:34:22 -07:00
Mark Otto
f4b51b373b more homepage links cleanup 2012-03-11 23:33:52 -07:00
Mark Otto
d36f3d0a59 clean up links on docs homepage and add link to direct download with docs 2012-03-11 23:33:08 -07:00
Mark Otto
7c2ed0c095 resolve #1972, allowing add-ons at beginning and end of input-prepend/append 2012-03-11 23:21:38 -07:00
Mark Otto
5eed370856 fix more spacing issues with input append/prepend 2012-03-11 23:14:36 -07:00
Mark Otto
58cb7c631d simplify code for input-prepend/append in inline and search forms 2012-03-11 23:12:45 -07:00
Mark Otto
91eef351e4 remove need for floats and IE hacks for input-prepend and input-append--boom 2012-03-11 22:58:14 -07:00
Mark Otto
0630cd62b3 rewrite the fluid grid mixin to be simpler, per #2370 2012-03-11 22:45:10 -07:00
Mark Otto
0090fa1a6e fix overflow on .collapse.in to enable dropdowns within an open collapse 2012-03-11 22:43:35 -07:00
Mark Otto
ac7f571e53 enable button groups in modal-footer by removing 5px added margin between .btn 2012-03-11 22:28:37 -07:00
Mark Otto
e5a284d442 merge #2476 to allow for custom popover arrow colors 2012-03-11 22:26:07 -07:00
Mark Otto
5a28bd1e78 fix vertical align issue with labels in IE9 2012-03-11 21:44:00 -07:00
Mark Otto
ee5d2ec91a add block level input mixin for border-box box-sizing 2012-03-11 21:21:51 -07:00
Mark Otto
c8f4325c19 remove text indent on carets (not needed) and add inline replacement mixin 2012-03-11 21:12:59 -07:00
Mark Otto
67714d8347 remove the unused text-indent on dropdown carets 2012-03-11 20:38:17 -07:00
Mark Otto
0f23883283 fix broken dropdowns in ie7 per #2333 2012-03-11 20:16:39 -07:00
Mark Otto
2e52946fd3 fix lingering tables bug 2012-03-11 20:03:55 -07:00
Mark Otto
4109c62cf7 fix table border bug with double borders on theads and use of colgroup 2012-03-11 18:18:18 -07:00
Mark Otto
7154e378b2 use variable for navbar text line-height 2012-03-11 17:53:17 -07:00
Mark Otto
8fd126ba1b updated apple touch icons and moved input responsive fix from <480 to <767 2012-03-11 17:28:28 -07:00
Mark Otto
ce292a8bb8 fix overflowing thumbnails in responsive <767px layouts 2012-03-11 15:15:55 -07:00
Mark Otto
a97b9c1122 in responsive layouts <767px, ensure inputs are not larger than 100% with box-sizing and a max-width 2012-03-11 14:41:52 -07:00
Mark Otto
bf6cdff88a vertical align middle on images, run make to rebuild 2012-03-11 13:48:47 -07:00
Mark Otto
ad1e9697ae update grid system mixins in less docs for new grid 2012-03-11 13:48:04 -07:00
Mark Otto
e8ef7d5e7b tweak button sizes on homepage 2012-03-11 00:06:48 -08:00
Mark Otto
349bdc12a7 ensure right align dropdown example doesn't go all the way off page 2012-03-10 18:15:28 -08:00
Mark Otto
635ee36e11 fix gradient mixins by escaping them, add notes on progress bars 2012-03-10 18:03:59 -08:00
Mark Otto
6e72760de5 fix js typo per #2471 2012-03-10 17:38:09 -08:00
Mark Otto
5de8b277c6 add vars for navbar search 2012-03-10 16:21:34 -08:00
Mark Otto
a3e9fc547c clean up search form in navbar, add new variable for placeholder text color 2012-03-10 16:15:54 -08:00
Mark Otto
f4ac080f9e fix #2510, docs typo 2012-03-10 16:06:56 -08:00
Mark Otto
1dbb942d5b massive update to customize page to include all the new variables (and ensure they're being used in the .less files) 2012-03-10 16:01:06 -08:00
Mark Otto
95a3cd8732 simplify notes around using button dropdowns 2012-03-10 15:41:41 -08:00
Mark Otto
cecfe72060 remove unused images, update examples to include soundready 2012-03-10 15:37:28 -08:00
Mark Otto
145a36323c add new example site thumbnail 2012-03-10 15:15:13 -08:00
Mark Otto
9c1d8e032b change title attr to re-include twitter 2012-03-10 15:14:54 -08:00
Mark Otto
700457c62a remove unused example diagrams 2012-03-10 15:09:35 -08:00
Mark Otto
67aa00d0bb make pre font-size a percentage of @baseFontSize 2012-03-10 14:36:58 -08:00
Mark Otto
aef230d40a fix typo per #2494 2012-03-10 14:20:46 -08:00
Mark Otto
f7d4fb61ce Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-10 14:12:29 -08:00
Mark Otto
dd5cffc308 add button sizes to docs for button dropdowns, clean up styles for them 2012-03-10 13:40:58 -08:00
Mark Otto
c7eb1ab49a make nav padding and negative margins the same 2012-03-10 13:24:46 -08:00
Jacob Thornton
a07851d6af stop doing oldschool escape substitution 2012-03-10 13:01:17 -08:00
Jacob Thornton
04851652db rebuild with latest grid changes - need 1.3 to build! 2012-03-10 12:45:09 -08:00
Jacob Thornton
1fd5e55881 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
 2012-03-10 12:42:39 -08:00
Jacob Thornton
1a8d7576e0 Merge branch 'new_grid' into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	less/mixins.less
 2012-03-10 12:41:41 -08:00
Mark Otto
9ebc6b4c97 simplify buttons docs section by changing a buttons to button elements 2012-03-10 11:37:34 -08:00
Mark Otto
5d961eaeb3 rebold headings 2012-03-10 11:29:57 -08:00
Mark Otto
f4e879a936 fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron 2012-03-10 11:27:07 -08:00
Mark Otto
c414e57dcc Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-10 11:23:47 -08:00
Mark Otto
305374ab1a clear up nav variables 2012-03-10 11:23:05 -08:00
Jacob Thornton
1562381114 remove non existent dist dir from phony makefil 2012-03-08 11:42:12 -08:00
Jacob Thornton
af1dbf6581 rebuild 2012-03-08 11:39:50 -08:00
Jacob Thornton
bcef12dfcc add version to min js 2012-03-08 11:39:00 -08:00
Jacob Thornton
426feeef6a give pages custom titles based on names 2012-03-08 11:09:33 -08:00
Mark Otto
203d75770c Merge pull request #2449 from burningTyger/master 
Examples typo
 2012-03-07 11:02:15 -08:00
burningTyger
d0120c94a0 fix for typo 2012-03-07 15:38:12 +01:00
Mark Otto
933136d382 Merge pull request #2443 from tarsis/master 
uglify-js install information in compiling section at less.html. Improve issue #1756 in 2.0.2 wip
 2012-03-06 21:44:34 -08:00
Mark Otto
69e4522a4e set font-family for inputs and such via basefontfamily 2012-03-06 21:13:29 -08:00
Mark Otto
6b9f70797d adding well sizes 2012-03-06 21:12:43 -08:00
Mark Otto
738fac18de move padding from container to body for max-width: 767; responsive layout 2012-03-05 23:50:03 -08:00
Mark Otto
79090ac121 fix input grid sizing, fix background color on form actions and append add-ons 2012-03-05 23:06:27 -08:00
Mark Otto
bcd9294cc4 clearing up progress bar docs and resetting the striped one to match default bar (blue instead of green) 2012-03-05 23:00:37 -08:00
Mark Otto
d98a2e9234 adding table variables 2012-03-05 22:47:39 -08:00
Mark Otto
ac6eff280d Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip 
Conflicts:
	less/dropdowns.less
 2012-03-05 20:49:39 -08:00
Mark Otto
20b10b5d66 change dropdown hover/active color back to link color 2012-03-05 20:15:35 -08:00
Mark Otto
eaf464a2c5 increase specifity of .pills li.active for dropdowns 2012-03-05 20:14:54 -08:00
Mark Otto
cb9234ba46 fix warning button issue per #2392 and add warning buttons to components 2012-03-05 00:47:13 -08:00
Mark Otto
7a8d6b1976 clean up horizontal dl option and docs 2012-03-05 00:42:37 -08:00
Mark Otto
fb1d4a0f04 Merge pull request #2267 from dominicbarnes/dl_horizontal 
Horizontal mode for description lists
 2012-03-05 00:38:26 -08:00
Mark Otto
1fa42e2f71 fix ie7 breadcrumbs per #2224 2012-03-05 00:36:57 -08:00
Mark Otto
235811cd8a Merge branch 'alexpeattie-master' into 2.0.2-wip 2012-03-05 00:34:54 -08:00
Mark Otto
a95c15a530 utilize new dropdown variables 2012-03-05 00:32:02 -08:00
Mark Otto
d3e922f0c8 add a ton new variables for type, buttons, inputs 2012-03-05 00:29:16 -08:00
Tarsis Azevedo
3cbc40b129 add uglify-js install information in compiling section. improve issue #1756 2012-03-05 01:38:20 -03:00
Jacob Thornton
29c63fdb6a true > child + varargs 2012-03-04 14:27:13 -08:00
Jacob Thornton
3524aa909c make sure to pass child var through 2012-03-04 14:21:54 -08:00
Jacob Thornton
2f598e35a0 when > 0 rather than when not 0 2012-03-04 14:11:51 -08:00
Jacob Thornton
1aeca545c8 new approach to grid with recursive mixins :D 2012-03-04 14:06:30 -08:00
Alex Peattie
0112b56c9c Fix typo in .mustache file 2012-03-03 22:16:20 -08:00
Alex Peattie
6a839fb2c3 docs/scaffolding typo: Large display is 1200px and up, not 1210px 2012-03-01 15:29:32 -08:00
Mark Otto
bd55824827 .progress-warning mention in docs 2012-02-28 08:52:59 -08:00
Mark Otto
fbebb046f7 fix navbar container for default 940px grid per #2194 2012-02-27 22:34:25 -08:00
Mark Otto
9ee77f2c11 set line-height for labels to prevent change in height when floated per #2222 2012-02-27 21:50:54 -08:00
Mark Otto
a7b96b3e59 set list-style to none for breadcrumbs to resolve cross browser issues per #2224 2012-02-27 21:32:48 -08:00
Mark Otto
5cc4fcf6a2 Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip 
Conflicts:
	docs/javascript.html
	docs/templates/pages/javascript.mustache
 2012-02-27 21:22:20 -08:00
Dominic Barnes
0b78033f0b removing a few of the size classes, changing up the documentation 2012-02-27 23:21:25 -06:00
Dominic Barnes
d12737719f undoing what I suspect are the 'dirty' parts of this commit 2012-02-27 22:55:35 -06:00
Mark Otto
4e17b1975e Merge branch 'meleyal-patch-1' into 2.0.2-wip 2012-02-27 19:50:44 -08:00
Mark Otto
ca9588c896 manually resolve #2266, typo in example HTML for breadcrumbs 2012-02-27 19:47:21 -08:00
Mark Otto
7525aac830 make .input-prepend/append .add-on text color the same as labels, #333, to close out #2276 2012-02-27 19:44:16 -08:00
Mark Otto
d57598827f fix typo in js docs carousel section per #2299 2012-02-27 19:40:07 -08:00
Mark Otto
af8261af93 simplify selector for .modal-form per #2218 2012-02-27 19:09:44 -08:00
Mark Otto
7bdd9551ed really add protocol to examples 2012-02-27 18:48:28 -08:00
Jacob Thornton
8615987243 add guard for child spans 2012-02-27 18:21:21 -08:00
Jacob Thornton
ae3382d797 working through new grid implementation... 2012-02-27 18:15:59 -08:00
Mark Otto
163f58ff81 add heads up label to new docs mention 2012-02-26 23:31:12 -08:00
Mark Otto
dd94f8d509 remove warning from icons section about :after labels, add section to explain spacing 2012-02-26 23:30:15 -08:00
Mark Otto
1a781a707e Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-26 23:16:11 -08:00
Mark Otto
ccf7697185 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-26 23:15:36 -08:00
Dominic Barnes
0a8efd5320 Adding a 'horizontal' option to description lists, similar to .form-horizontal 2012-02-25 21:21:05 -06:00
Jacob Thornton
43760eb202 fix for @pamelafox and #1861 2012-02-24 22:17:36 -08:00
Jacob Thornton
fb74018ae2 and pause on hover option to carousel 2012-02-24 21:51:39 -08:00
Mark Otto
6abb2059eb fix docs example in js page per #2225 2012-02-24 21:06:17 -08:00
Mark Otto
4309153051 add version to docs homepage, fix docs example for forms 2012-02-24 21:02:24 -08:00
meleyal
be9ae70060 Fix typos and clarify wording in carousel docs 2012-02-25 01:25:31 +01:00
meleyal
591908eccf Fix broken links to fav and touch icons in examples, fixes #2244 2012-02-24 23:06:02 +01:00
Jacob Thornton
74a3c763b4 add note about backdrop static 2012-02-23 16:24:33 -08:00
Mark Otto
0e8427e7b1 update modal footers to use text-align instead of float on buttons for alignment 2012-02-22 22:38:54 -08:00
Mark Otto
8609a77bd2 add clearfix to .form-actions for .pull-right and .pull-left supported buttons, per #1978 and #2173 2012-02-22 11:16:32 -08:00
Mark Otto
a0ec422444 fix #1954: icons in tabs add jank border 2012-02-22 08:36:07 -08:00
Mark Otto
b86969f762 restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080 2012-02-22 08:21:29 -08:00
Mark Otto
4410ede8ed Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-22 08:12:51 -08:00
Mark Otto
92a54a7b72 tighten padding on labels and badges given default line-height 2012-02-22 08:12:25 -08:00
Jacob Thornton
f3b6cf1d6d Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
	less/mixins.less
 2012-02-21 23:18:18 -08:00
Jacob Thornton
5ad5dde1e2 rewrite the grid system. Clean shit up tons - only generate 12 columns by default - custom builder will do differently if you request it. 2012-02-21 23:16:06 -08:00
Mark Otto
a139167489 set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins) 2012-02-21 23:15:43 -08:00
Mark Otto
9b524a16e9 clear up table styles and docs to fix rowspan and colspan issues for bordered tables, per #1918 2012-02-21 23:00:02 -08:00
Mark Otto
917df6703c clarify responsive docs on media queries 2012-02-21 22:40:21 -08:00
Mark Otto
8bd67bb124 clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups 2012-02-21 22:09:51 -08:00
Mark Otto
20221a67c2 Merge branch '2.0/fork/components/dropup' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/fork/components/dropup 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/navbar.less
 2012-02-21 22:01:39 -08:00
Mark Otto
b4cc6c74f5 add support and docs for .navbar-fixed-bottom 2012-02-21 21:12:16 -08:00
Mark Otto
e3ae517555 move container up in default grid mixin 2012-02-21 15:21:18 -08:00
Mark Otto
8665fa8c50 move table columns mixin to mixins.less 2012-02-21 15:18:05 -08:00
Mark Otto
bb16b9bef2 fix second part of #1962 2012-02-21 13:52:02 -08:00
Mark Otto
664a5c4438 update forms help-block 2012-02-21 13:43:13 -08:00
Mark Otto
d908731566 Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-21 09:05:04 -08:00
Mark Otto
80abc50d3e Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-21 08:25:19 -08:00
Mark Otto
f3ad4c7183 adding responsive utility classes and matching docs section with super neato table and test 2012-02-21 08:24:18 -08:00
Andreas Cederström
dfd0326186 Bring back nowrap to labels and badges 2012-02-21 08:17:16 +01:00
Jacob Thornton
d149a131c1 remake 2012-02-20 22:02:04 -08:00
Mark Otto
06d4756114 adding basic badges support 2012-02-20 21:20:06 -08:00
Mark Otto
d2630ff84e introduce new mixin to do navbar vertical centering 2012-02-20 19:14:26 -08:00
Mark Otto
143b3db2c9 update inline forms to resolve checkbox label with space in it and overlapping content, per #1969 2012-02-20 18:56:05 -08:00
Mark Otto
331c85724a remove max-width on img from reset and put in docs only, per #1552 2012-02-20 16:18:13 -08:00
Mark Otto
9c74f21966 fix overflow issue on tabbed content per #2079 2012-02-20 16:06:42 -08:00
Mark Otto
91fe8bc0f4 remake after merging buttons update 2012-02-20 13:37:24 -08:00
Mark Otto
7ef7547a14 add horizontal divider support to nav list, including documentation for it, per #2106 2012-02-20 12:38:49 -08:00
Mark Otto
6df925bc75 enable use of span in place of a for .disabled in pagination, per #1406 2012-02-19 23:51:59 -08:00
Mark Otto
9b09d1de86 move overflow and max-height on modal to modal-body instead 2012-02-19 21:55:09 -08:00
Mark Otto
1c7d346767 quick edit to new global styles section 2012-02-19 16:40:41 -08:00
Mark Otto
8247cb3362 add new global styles docs section for mentioning doctype requirements, base body changes, and type/links; also tightened up code styles 2012-02-19 16:28:46 -08:00
Mark Otto
f4f34ab12f Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 16:00:54 -08:00
Mark Otto
59d570fc16 Merge branch 'abbr' of https://github.com/jacobrask/bootstrap into jacobrask-abbr 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 15:38:34 -08:00
Mark Otto
3470c0dc49 Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask-alert-headers 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 15:04:52 -08:00
Mark Otto
89ccbdf8d1 Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 15:01:25 -08:00
Mark Otto
5f2d2893d2 Merge branch 'opera-radial' of https://github.com/jacobrask/bootstrap into jacobrask-opera-radial 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 14:59:42 -08:00
Mark Otto
8482cc4cb3 commit leftover from make 2012-02-19 14:55:07 -08:00
Mark Otto
adbbf17ee4 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 14:54:53 -08:00
Mark Otto
16d12396d0 simplify text color in navbar by placing the color on global .navbar component 2012-02-19 14:53:07 -08:00
Jacob Rask
f28140897e Update documentation for abbreviations 2012-02-19 22:14:18 +01:00
Jacob Rask
e145619f6d Remove underscore hack for IE6 
IE6 does not seem to be supported by Bootstrap, and reducing the number
of unused and invalid properties is always nice.
 2012-02-19 21:54:38 +01:00
Jacob Rask
82457603b6 Separate span12 and container classes 
If you have less than 12 columns, container is too wide. Instead
generate container width using the @gridColumns variable.

Also remove duplicate container width property.
 2012-02-19 21:49:17 +01:00
Jacob Rask
ad546c9631 Add Opera-prefixed radial gradient 
Tested and works in Opera 11.61
 2012-02-19 21:42:12 +01:00
Jacob Rask
51ec513b5c Use inherit on alert-heading color 
Heading then inherits from the parent alert.
Avoids a lot of extra unneccessary CSS.
 2012-02-19 21:29:32 +01:00
Jacob Rask
c1775da187 Add class for upper case abbreviations, aka initialisms 
Read more:
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
 2012-02-19 21:24:06 +01:00
Jacob Rask
f08b407667 Only show help cursor/border for abbr with title 2012-02-19 21:23:17 +01:00
Jacob Rask
df757fb040 All abbreviations are not upper case initialisms 
Read more:
 * http://developers.whatwg.org/text-level-semantics.html#the-abbr-element
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
 2012-02-19 21:21:44 +01:00
Jacob Thornton
ac6e667ad9 Merge branch 'master' into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-18 23:31:37 -08:00
Jacob Thornton
3d58b46226 fix bootstrap-button toggle regression + tests 2012-02-18 23:29:58 -08:00
Mark Otto
1948e985a3 merge in and remake for responsive navbar dropdown fix 2012-02-18 20:09:34 -08:00
Mark Otto
bbb2fb3395 fix right aligned dropdowns 2012-02-18 20:06:38 -08:00
Mark Otto
29e6ef7c70 clarify forms in navbar per #2072 2012-02-18 15:23:38 -08:00
Mark Otto
1a1816b5bd clarify misc components subhead 2012-02-18 15:17:25 -08:00
Mark Otto
b776cae902 add mention of js compilation to single file in customize page per #2003 2012-02-17 21:18:08 -08:00
Mark Otto
ec05ebc5ed add small section to navbar docs on text in the component, per #2035 2012-02-17 20:53:12 -08:00
Mark Otto
1455bc9f8f removing duplicate reset filter since we changed the main button to use buttonBackground mixin, per #2024 2012-02-17 20:47:02 -08:00
Mark Otto
b559f2b8d0 fix duplicate input prepend/append css selectors per #2026 2012-02-17 20:40:56 -08:00
Mark Otto
e7d45184f1 swap last .btn-dark reference 2012-02-17 20:25:49 -08:00
Mark Otto
5d02b8c3c6 fix grid typo in subnav 2012-02-17 14:41:41 -08:00
Mark Otto
7fa1578c49 fix page header example and docs per #2048 2012-02-17 14:39:30 -08:00
Andreas Cederström
1e6d386b8d Keep origin in track 2012-02-17 13:31:36 +01:00
Jacob Thornton
7ec09d0db9 2.0.1 2012-02-16 22:42:38 -08:00
Mark Otto
091622644a bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE 2012-02-16 22:34:30 -08:00
Mark Otto
6f6adfb52f change clearfix mixin to drop parens that prevent it from being a class, too 2012-02-16 22:04:11 -08:00
Mark Otto
268e7d67ab add mini buttons per #1971 2012-02-16 21:28:16 -08:00
Mark Otto
61e2201c64 fix buttons focus state and swap a buttons for button buttons 2012-02-16 21:25:40 -08:00
Mark Otto
489276f5be fix responsive media queries to use 979 and 980 where appropro 2012-02-16 21:08:52 -08:00
Mark Otto
0369c1fcfc add mention of navbar vertical divider in docs 2012-02-16 21:04:16 -08:00
Jacob Thornton
c3d3cf7262 add note about popover placement 2012-02-16 20:46:35 -08:00
Jacob Thornton
9d12b2d601 don't try next if not next 2012-02-16 20:43:57 -08:00
Jacob Thornton
b3e4e5ae22 add idea to modal markup exmaple 2012-02-16 20:33:15 -08:00
Jacob Thornton
1520ec446c rebuild bro 2012-02-16 20:30:18 -08:00
Jacob Thornton
6da16a6def fix dropdown links 2012-02-16 20:30:00 -08:00
Jacob Thornton
e730f8adb5 null out interval so that pause doesn't resume on next or prev 2012-02-16 20:22:01 -08:00
Jacob Thornton
f9b578260f rebuild alerts 2012-02-16 20:05:09 -08:00
Jacob Thornton
a8c478e051 Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-13 18:42:57 -08:00
Jacob Thornton
6e77c9d123 add semicolons to the end of js files 2012-02-13 18:41:02 -08:00
Mark Otto
64ea59234f change up fonts on form elements to remove unnecessary font-family on label element, per #1950 2012-02-13 08:18:19 -08:00
Andreas Cederström
60826077e7 Clean up inverse button using variables, adding button group examples. Also adding inverse inline label 2012-02-13 09:41:28 +01:00
Mark Otto
da94850844 fix filename mention in js docs per #1938 2012-02-12 22:50:21 -08:00
Mark Otto
ce5976fb29 ensure help-block is block per #1937 2012-02-12 22:49:06 -08:00
Mark Otto
cbe10bd591 clean up nav-header in responsive 2012-02-12 21:11:56 -08:00
Mark Otto
944c7298d3 adding makeRow and makeColumn mixins for generating more semantic layouts 2012-02-12 20:46:39 -08:00