root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
2,476 Commits 111 Branches 92 Tags 666 MiB
Commit Graph

1597 Commits

Author SHA1 Message Date
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