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

388 Commits

Author SHA1 Message Date
Mark Otto
50b2245be5 restore max-width 100% for images 2012-03-22 22:06:23 -07:00
Mark Otto
20da2c8ea0 add the broken out responsive files 2012-03-22 21:54:54 -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
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
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
ctalkington
51f37cbb81 make font family mixins customizable with variables. 2012-03-15 13:34:50 -05:00
Marcel Jackwerth
1a1cab2d06 Invert progress-bar-stripes direction 2012-03-15 18:11:17 +01: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
664a838cd6 remove test file 2012-03-12 13:56:50 -07:00
Jacob Thornton
6d4867e799 remove commented out width 2012-03-12 13:45:36 -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
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
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
1a11c526b9 Merge branch 'luk3thomas-popover_arrow_colors' into 2.0.2-wip 2012-03-11 22:25:34 -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
ffbed0980c Merge branch 'Gavrisimo-patch-1' into 2.0.2-wip 2012-03-11 13:48:30 -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
Milos Gavrilovic
3ff78d138a Add vertical-align: middle; to img elements 
More info: h5bp.com/i/440
 2012-03-09 14:52:50 +01:00
Luke Thomas
1cc1852a9a added ability to set custom colors for popover arrow mixin 2012-03-08 19:02:29 -06:00
Mark Otto
a613a8ebd0 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-03-06 21:16:57 -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 Figueredo
03bdf82ca2 Added use of new headings variables. 2012-03-06 16:45:43 -05: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
492ccedcab Merge branch 'davewasmer-master' into 2.0.2-wip 2012-03-05 23:07:54 -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
9c2b2c589d fix comment on bottom-up, should be dropup 2012-03-05 20:20:42 -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
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
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
Simon Charette
efd5e29ff4 Fixed small button caret and moved less code to dropdowns 2012-03-04 15:49:55 -05:00
Dave Wasmer
ff8b997a1f Added disabled styles to pager 2012-02-28 18:39:35 -05: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
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
Dominic Barnes
0b78033f0b removing a few of the size classes, changing up the documentation 2012-02-27 23:21:25 -06: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
Dominic Barnes
0a8efd5320 Adding a 'horizontal' option to description lists, similar to .form-horizontal 2012-02-25 21:21:05 -06:00
Jonathan Camile
1562a8a010 Progress bars: Added warning (orange) bar 2012-02-24 11:37:26 +01: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
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