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

601 Commits

Author SHA1 Message Date
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 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 6e9756ebb6 #3228: update docs to list dependencies from 2.0.3 for compiling via make 2012-04-30 15:30:56 -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
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
Jacob Thornton edb52a82d8 make bootstrap compile with Recess instead of Less 2012-04-18 16:16:42 -07:00
Mark Otto 47b6e6bd80 fix #3111, badge and label alignment with surrounding text 2012-04-18 09:47:30 -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 13e4d1d5ac fix #2990: text wrapping in .uneditable-input 2012-04-15 00:35:30 -07:00
Mark Otto 9e9be2dc0d fix #2989: clear .checkbox/.radio floats 2012-04-14 23:19:42 -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
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 dbde2dc9e4 adding icon classes to finish off glyphicons 1.6 update 2012-04-14 17:15:16 -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
Bryan Petty 5b85ed181a Fixed extra margin on Navbar buttons. 2012-04-10 15:22:17 -06:00
Mark Otto 0b2d23d443 add larger .input-* to block reset for responsive <767 2012-04-07 23:41:09 -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 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
Mark Otto 2ea437f353 fix #2908: unfloat inputs using .span* in fluid row 2012-04-02 22:49:19 -07:00
Mark Otto 2988de6377 fix #2913: get more specific with button group selectors 2012-04-02 22:38:12 -07: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 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 37745cd899 fix fluid grid selectors to remove > in selectors 2012-03-31 00:53:38 -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 e41584afb5 fix #2829: redeclare .pull-right for navs since they get more specific floats 2012-03-28 17:02:13 -07:00
Mark Otto cffadd8c71 add position relative to .dropup 2012-03-25 22:28:43 -07:00
Mark Otto 473e5714f7 change all anchor alert closes to buttons 2012-03-25 20:41:59 -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 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 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
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 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
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 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 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 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 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 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
ctalkington bf09c979ca make brand links follow navbarLinkColor but also be customizable in advanced cases. 2012-03-15 14:21:27 -05:00
Jacob Thornton 8e0afbeaa4 update hide text to h5bp technique #2586 2012-03-14 12:00:27 -07:00
Jacob Thornton 59503e71ff 2.0.2 derp 2012-03-12 14:09:38 -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 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 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 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 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 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 635ee36e11 fix gradient mixins by escaping them, add notes on progress bars 2012-03-10 18:03:59 -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 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 67aa00d0bb make pre font-size a percentage of @baseFontSize 2012-03-10 14:36:58 -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 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 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 305374ab1a clear up nav variables 2012-03-10 11:23:05 -08:00
Jacob Thornton 426feeef6a give pages custom titles based on names 2012-03-08 11:09:33 -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 1fa42e2f71 fix ie7 breadcrumbs per #2224 2012-03-05 00:36:57 -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
Jacob Thornton 3524aa909c make sure to pass child var through 2012-03-04 14:21:54 -08:00
Jacob Thornton 1aeca545c8 new approach to grid with recursive mixins :D 2012-03-04 14:06:30 -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 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 af8261af93 simplify selector for .modal-form per #2218 2012-02-27 19:09:44 -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 4309153051 add version to docs homepage, fix docs example for forms 2012-02-24 21:02:24 -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