rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
2,724 Commits 108 Branches 89 Tags 552 MiB
fe93b926b4
Commit Graph

1787 Commits

Author SHA1 Message Date
Mark Otto
70e81e6f55 new jumbotron 2012-07-01 08:42:09 -07:00
Mark Otto
98ebd54800 address issues with fixed subnav like borders, corners, etc 2012-06-28 21:20:40 -07:00
Mark Otto
6f4360c47b cleanup docs css more 2012-06-28 21:06:54 -07:00
Mark Otto
c31a4e5131 remove responsive subnav from docs and place in navbar-responsive.less 2012-06-28 20:59:16 -07:00
Mark Otto
c09e8473e2 use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta 2012-06-28 10:03:46 -07:00
Mark Otto
a683497dbc renamed less.html to extend.html, removing all the vars and mixins 2012-06-27 23:56:00 -07:00
Mark Otto
b77ed4a3a3 fix dropdowns in button groups after font-size hack 2012-06-25 20:57:04 -07:00
Mark Otto
244a9ab79d reverse the gradient on striped progress bars so it matches the active state when animated 2012-06-25 20:20:32 -07:00
Mark Otto
e7e183e55d Merge branch 'tekezo-patch-1' into 2.1.0-wip 2012-06-25 16:49:13 -07:00
Mark Otto
d65e815a48 use @textColor to change help-block/help-inline font color 2012-06-25 16:47:29 -07:00
Mark Otto
94a3d4eb14 reorder media queries 2012-06-25 16:25:50 -07:00
Mark Otto
8c2db7d7d6 prevent button group buttons from wrapping in tight spaces by removing floats and replacing with font-size: 0; inline-block hack 2012-06-25 15:47:07 -07:00
Mark Otto
78849cf52e remove jank fix for dt bold text 2012-06-25 15:09:39 -07:00
Mark Otto
cd466f1d0b add tests for table grid sizing, solve bugs in fluid table grid sizing 2012-06-25 14:37:35 -07:00
Mark Otto
27845e4492 #3223: make table row hover optional class 2012-06-25 14:11:37 -07:00
Mark Otto
508a93d9e3 make fixing of subnav work again 2012-06-24 21:07:20 -07:00
Mark Otto
6662f62236 remove subnav file, instead add an optional class for .navbar 2012-06-24 21:03:39 -07:00
Mark Otto
87af5d3bbe more subnav optimizations 2012-06-24 20:42:31 -07:00
Mark Otto
71669dda63 tons of docs cleanup in css, adding subnav to official components 2012-06-24 20:26:48 -07:00
Takayama Fumihiko
e80f37b600 ".linenums .tag" should be ".prettyprint .tag". 2012-06-24 15:26:39 +09:00
Mark Otto
160fe7ca59 create vars for responsive grid values, fixed and fluid, and document them in the customizer 2012-06-20 23:46:51 -07:00
Mark Otto
59153205b3 run make on js files 2012-06-20 23:46:29 -07:00
Mark Otto
3875a9f31b Merge branch 'marcusds-2.1.0-wip' into 2.1.0-wip 2012-06-20 20:26:59 -07:00
Mark Otto
b353565d4e add docs for fluid offsetting 2012-06-20 20:26:50 -07:00
Jacob Thornton
1e717991e8 Merge pull request #3880 from lookfirst/popover-destroy 
Add popover / tooltip destroy method
 2012-06-20 12:02:05 -07:00
Jacob Thornton
b2b000b750 change transition end name for opera 2012-06-20 10:40:56 -07:00
Mark Otto
089f42a07f fix html typos 2012-06-20 00:06:05 -07:00
Mark Otto
d704d6f0ed #3861: add span to pagination selectors for full support of non-link pagination items 2012-06-19 23:37:47 -07:00
Mark Otto
ce140662a0 remove unused container reset 2012-06-19 20:01:03 -07:00
Mark Otto
9df832b4bb add separate vars for dropdown link hover and active states 2012-06-19 19:17:42 -07:00
Mark Otto
40298ddbf1 add note to components about nav list nesting 2012-06-19 15:25:35 -07:00
Mark Otto
ff92344f0d remove icons example of nav list--doesn't really add anything useful 2012-06-19 14:46:14 -07:00
Mark Otto
b54264cde0 add basic vertical button group support 2012-06-19 14:42:46 -07:00
Mark Otto
64ba423b6d #2764: add disabled styles to navs and dropdowns 2012-06-19 13:52:07 -07:00
Mark Otto
d14f06fc4e round select list corners 2012-06-19 13:25:35 -07:00
Mark Otto
143b6ae2de fix less docs typos 2012-06-19 13:23:30 -07:00
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
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