0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

2071 Commits

Author SHA1 Message Date
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
Simon Charette
efd5e29ff4 Fixed small button caret and moved less code to dropdowns 2012-03-04 15:49:55 -05: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
Dave Wasmer
ff8b997a1f Added disabled styles to pager 2012-02-28 18:39:35 -05:00
Mark Otto
7bf3419647 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-02-28 08:53:06 -08:00
Mark Otto
bd55824827 .progress-warning mention in docs 2012-02-28 08:52:59 -08:00
Mark Otto
2087339035 Merge pull request #2305 from MeilleursAgents/features/warning_progress_bar
Progress bars: Added warning (orange) bar
2012-02-28 08:52:16 -08:00
Jonathan Camile
a397130669 Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into features/warning_progress_bar 2012-02-28 11:06:05 +01:00
Jonathan Camile
15759d9e7c Components: Added mention to warning progress-bar in docs 2012-02-28 10:58:23 +01:00
Mark Otto
fbebb046f7 fix navbar container for default 940px grid per #2194 2012-02-27 22:34:25 -08:00
Mark Otto
6c9547f411 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-02-27 22:08:44 -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
2c98e18724 Merge pull request #2227 from andriijas/2.0.2-wip-pillexamplefix
Fixing nav-pills code example
2012-02-27 19:51:44 -08: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
Jonathan Camile
1562a8a010 Progress bars: Added warning (orange) bar 2012-02-24 11:37:26 +01:00
Andreas Cederström
34268672be Fixing nav-pills code example - closes #2225 2012-02-24 07:34:23 +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
Pete Hopkins
3a6f58598c Allows escape to bubble when menu isn't shown 2012-02-22 14:19:55 -05:00
Pete Hopkins
70fecd1115 Fires change event when element is selected from menu 2012-02-22 14:19:55 -05:00
Pete Hopkins
80d03e143c Allow events to propagate / default if not used.
- All key events when the menu is not shown now propagate.
 - Blur is also allowed to propagate.
2012-02-22 14:19:55 -05: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
0ed6d3b28e Merge branch 'couchbaselabs-clearfix-ing-form-actions' into 2.0.2-wip 2012-02-22 11:15:53 -08:00
Mark Otto
6f3b4b857f Merge branch 'clearfix-ing-form-actions' of https://github.com/couchbaselabs/bootstrap into couchbaselabs-clearfix-ing-form-actions 2012-02-22 11:15:44 -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