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

1835 Commits

Author SHA1 Message Date
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
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
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
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
Mark Otto
92a54a7b72 tighten padding on labels and badges given default line-height 2012-02-22 08:12:25 -08:00
Jacob Thornton
f3b6cf1d6d Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
	less/mixins.less
 2012-02-21 23:18:18 -08:00
Jacob Thornton
5ad5dde1e2 rewrite the grid system. Clean shit up tons - only generate 12 columns by default - custom builder will do differently if you request it. 2012-02-21 23:16:06 -08:00
Mark Otto
a139167489 set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins) 2012-02-21 23:15:43 -08:00
Mark Otto
9b524a16e9 clear up table styles and docs to fix rowspan and colspan issues for bordered tables, per #1918 2012-02-21 23:00:02 -08:00
Mark Otto
917df6703c clarify responsive docs on media queries 2012-02-21 22:40:21 -08:00
Mark Otto
8bd67bb124 clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups 2012-02-21 22:09:51 -08:00
Mark Otto
20221a67c2 Merge branch '2.0/fork/components/dropup' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/fork/components/dropup 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/navbar.less
 2012-02-21 22:01:39 -08:00
Mark Otto
b4cc6c74f5 add support and docs for .navbar-fixed-bottom 2012-02-21 21:12:16 -08:00
Mark Otto
e3ae517555 move container up in default grid mixin 2012-02-21 15:21:18 -08:00
Mark Otto
8665fa8c50 move table columns mixin to mixins.less 2012-02-21 15:18:05 -08:00
Mark Otto
bb16b9bef2 fix second part of #1962 2012-02-21 13:52:02 -08:00
Mark Otto
664a5c4438 update forms help-block 2012-02-21 13:43:13 -08:00
Mark Otto
d908731566 Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-21 09:05:04 -08:00
Mark Otto
80abc50d3e Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-21 08:25:19 -08:00
Mark Otto
f3ad4c7183 adding responsive utility classes and matching docs section with super neato table and test 2012-02-21 08:24:18 -08:00
Andreas Cederström
dfd0326186 Bring back nowrap to labels and badges 2012-02-21 08:17:16 +01:00
Jacob Thornton
d149a131c1 remake 2012-02-20 22:02:04 -08:00
Mark Otto
06d4756114 adding basic badges support 2012-02-20 21:20:06 -08:00
Mark Otto
d2630ff84e introduce new mixin to do navbar vertical centering 2012-02-20 19:14:26 -08:00
Mark Otto
143b3db2c9 update inline forms to resolve checkbox label with space in it and overlapping content, per #1969 2012-02-20 18:56:05 -08:00
Mark Otto
331c85724a remove max-width on img from reset and put in docs only, per #1552 2012-02-20 16:18:13 -08:00
Mark Otto
9c74f21966 fix overflow issue on tabbed content per #2079 2012-02-20 16:06:42 -08:00
Mark Otto
91fe8bc0f4 remake after merging buttons update 2012-02-20 13:37:24 -08:00
Mark Otto
7ef7547a14 add horizontal divider support to nav list, including documentation for it, per #2106 2012-02-20 12:38:49 -08:00
Mark Otto
6df925bc75 enable use of span in place of a for .disabled in pagination, per #1406 2012-02-19 23:51:59 -08:00
Mark Otto
9b09d1de86 move overflow and max-height on modal to modal-body instead 2012-02-19 21:55:09 -08:00
Mark Otto
1c7d346767 quick edit to new global styles section 2012-02-19 16:40:41 -08:00
Mark Otto
8247cb3362 add new global styles docs section for mentioning doctype requirements, base body changes, and type/links; also tightened up code styles 2012-02-19 16:28:46 -08:00
Mark Otto
f4f34ab12f Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 16:00:54 -08:00
Mark Otto
59d570fc16 Merge branch 'abbr' of https://github.com/jacobrask/bootstrap into jacobrask-abbr 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 15:38:34 -08:00
Mark Otto
3470c0dc49 Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask-alert-headers 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 15:04:52 -08:00
Mark Otto
89ccbdf8d1 Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 15:01:25 -08:00
Mark Otto
5f2d2893d2 Merge branch 'opera-radial' of https://github.com/jacobrask/bootstrap into jacobrask-opera-radial 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 14:59:42 -08:00
Mark Otto
8482cc4cb3 commit leftover from make 2012-02-19 14:55:07 -08:00
Mark Otto
adbbf17ee4 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 14:54:53 -08:00
Mark Otto
16d12396d0 simplify text color in navbar by placing the color on global .navbar component 2012-02-19 14:53:07 -08:00
Jacob Rask
f28140897e Update documentation for abbreviations 2012-02-19 22:14:18 +01:00
Jacob Rask
e145619f6d Remove underscore hack for IE6 
IE6 does not seem to be supported by Bootstrap, and reducing the number
of unused and invalid properties is always nice.
 2012-02-19 21:54:38 +01:00
Jacob Rask
82457603b6 Separate span12 and container classes 
If you have less than 12 columns, container is too wide. Instead
generate container width using the @gridColumns variable.

Also remove duplicate container width property.
 2012-02-19 21:49:17 +01:00
Jacob Rask
ad546c9631 Add Opera-prefixed radial gradient 
Tested and works in Opera 11.61
 2012-02-19 21:42:12 +01:00
Jacob Rask
51ec513b5c Use inherit on alert-heading color 
Heading then inherits from the parent alert.
Avoids a lot of extra unneccessary CSS.
 2012-02-19 21:29:32 +01:00
Jacob Rask
c1775da187 Add class for upper case abbreviations, aka initialisms 
Read more:
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
 2012-02-19 21:24:06 +01:00
Jacob Rask
f08b407667 Only show help cursor/border for abbr with title 2012-02-19 21:23:17 +01:00
Jacob Rask
df757fb040 All abbreviations are not upper case initialisms 
Read more:
 * http://developers.whatwg.org/text-level-semantics.html#the-abbr-element
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
 2012-02-19 21:21:44 +01:00
Jacob Thornton
ac6e667ad9 Merge branch 'master' into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-18 23:31:37 -08:00
Jacob Thornton
3d58b46226 fix bootstrap-button toggle regression + tests 2012-02-18 23:29:58 -08:00
Mark Otto
1948e985a3 merge in and remake for responsive navbar dropdown fix 2012-02-18 20:09:34 -08:00
Mark Otto
bbb2fb3395 fix right aligned dropdowns 2012-02-18 20:06:38 -08:00
Mark Otto
29e6ef7c70 clarify forms in navbar per #2072 2012-02-18 15:23:38 -08:00
Mark Otto
1a1816b5bd clarify misc components subhead 2012-02-18 15:17:25 -08:00
Mark Otto
b776cae902 add mention of js compilation to single file in customize page per #2003 2012-02-17 21:18:08 -08:00
Mark Otto
ec05ebc5ed add small section to navbar docs on text in the component, per #2035 2012-02-17 20:53:12 -08:00
Mark Otto
1455bc9f8f removing duplicate reset filter since we changed the main button to use buttonBackground mixin, per #2024 2012-02-17 20:47:02 -08:00
Mark Otto
b559f2b8d0 fix duplicate input prepend/append css selectors per #2026 2012-02-17 20:40:56 -08:00
Mark Otto
e7d45184f1 swap last .btn-dark reference 2012-02-17 20:25:49 -08:00
Mark Otto
5d02b8c3c6 fix grid typo in subnav 2012-02-17 14:41:41 -08:00
Mark Otto
7fa1578c49 fix page header example and docs per #2048 2012-02-17 14:39:30 -08:00
Andreas Cederström
1e6d386b8d Keep origin in track 2012-02-17 13:31:36 +01:00
Jacob Thornton
7ec09d0db9 2.0.1 2012-02-16 22:42:38 -08:00
Mark Otto
091622644a bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE 2012-02-16 22:34:30 -08:00
Mark Otto
6f6adfb52f change clearfix mixin to drop parens that prevent it from being a class, too 2012-02-16 22:04:11 -08:00
Mark Otto
268e7d67ab add mini buttons per #1971 2012-02-16 21:28:16 -08:00
Mark Otto
61e2201c64 fix buttons focus state and swap a buttons for button buttons 2012-02-16 21:25:40 -08:00
Mark Otto
489276f5be fix responsive media queries to use 979 and 980 where appropro 2012-02-16 21:08:52 -08:00
Mark Otto
0369c1fcfc add mention of navbar vertical divider in docs 2012-02-16 21:04:16 -08:00
Jacob Thornton
c3d3cf7262 add note about popover placement 2012-02-16 20:46:35 -08:00
Jacob Thornton
9d12b2d601 don't try next if not next 2012-02-16 20:43:57 -08:00
Jacob Thornton
b3e4e5ae22 add idea to modal markup exmaple 2012-02-16 20:33:15 -08:00
Jacob Thornton
1520ec446c rebuild bro 2012-02-16 20:30:18 -08:00
Jacob Thornton
6da16a6def fix dropdown links 2012-02-16 20:30:00 -08:00
Jacob Thornton
e730f8adb5 null out interval so that pause doesn't resume on next or prev 2012-02-16 20:22:01 -08:00
Jacob Thornton
f9b578260f rebuild alerts 2012-02-16 20:05:09 -08:00
Jacob Thornton
a8c478e051 Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-13 18:42:57 -08:00
Jacob Thornton
6e77c9d123 add semicolons to the end of js files 2012-02-13 18:41:02 -08:00
Mark Otto
64ea59234f change up fonts on form elements to remove unnecessary font-family on label element, per #1950 2012-02-13 08:18:19 -08:00
Andreas Cederström
60826077e7 Clean up inverse button using variables, adding button group examples. Also adding inverse inline label 2012-02-13 09:41:28 +01:00
Mark Otto
da94850844 fix filename mention in js docs per #1938 2012-02-12 22:50:21 -08:00
Mark Otto
ce5976fb29 ensure help-block is block per #1937 2012-02-12 22:49:06 -08:00
Mark Otto
cbe10bd591 clean up nav-header in responsive 2012-02-12 21:11:56 -08:00
Mark Otto
944c7298d3 adding makeRow and makeColumn mixins for generating more semantic layouts 2012-02-12 20:46:39 -08:00
Mark Otto
3e00c1261f allow .input-prepend/.input-append to work in .navbar per #1681 2012-02-12 20:28:22 -08:00
Mark Otto
be6fdd9a62 add docs for alt form control sizing per #1700 2012-02-12 20:10:48 -08:00
Mark Otto
4d1f1f0fc7 add typography pattern .page-header to components per #1701 2012-02-12 20:07:25 -08:00
Mark Otto
81d101a6a7 update docs on fixed nav per #1726 2012-02-12 19:50:36 -08:00
Mark Otto
5fc62c5fcc clear up scaffolding page to separate fixed from fluid grid systems 2012-02-12 16:59:29 -08:00
Mark Otto
ac9ac4ddae add note to button dropdowns about js plugin dependency per #1746 2012-02-12 15:49:04 -08:00
Mark Otto
163c98ea7e clean up modals.less comments, add new class for optional use on modal forms to remove bottom margin 2012-02-12 15:43:04 -08:00
Mark Otto
a57dbada0f change classname from .btn-dark to .btn-inverse, change use text 2012-02-12 15:18:20 -08:00
Mark Otto
b8493ed8b7 Merge branch '2.0.1-wip' of https://github.com/simonfranz/bootstrap into simonfranz-2.0.1-wip 2012-02-12 15:14:27 -08:00
Mark Otto
1b32e982ad add hero-unit docs per #1880 2012-02-12 14:47:09 -08:00
Mark Otto
0ff88f2db3 enable the use of .nav-header in dropdowns per #1827 2012-02-12 14:10:07 -08:00
Mark Otto
a9e469e75a add navbar background hover variable and fix uneditable-input with append/prepend controls 2012-02-12 14:01:58 -08:00
Mark Otto
86b6ea4b5f lower z-index of fixed subnav to prevent overlap of dropdown items in .navbar-fixed 2012-02-12 13:33:23 -08:00
Mark Otto
de6f3d4a6f Merge branch '2.0.1-wip' of github.com:twitter/bootstrap into 2.0.1-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-12 13:27:29 -08:00
Mark Otto
ebe547b6a0 Merge branch 'patch-2' of https://github.com/cwiederspan/bootstrap into cwiederspan-patch-2 2012-02-12 13:20:17 -08:00
Mark Otto
24df7f1e1d update ff comment in buttons 2012-02-12 13:20:08 -08:00
Mark Otto
b9d5ceb14b edit comment on IE7-8 support of :focus in navbar-search 2012-02-12 11:17:46 -08:00
Jacob Thornton
5b4a29d84e honor data attributes set on modal as well 2012-02-12 11:15:12 -08:00
Mark Otto
a2bc22bad5 standardize default button gradient styles to match other buttons, reset it's IE filter to improve IE7 hover 2012-02-12 11:14:13 -08:00
Mark Otto
c02df93903 move shim after css 2012-02-12 11:08:58 -08:00
Mark Otto
a72ef967ba re-add protocol to the shim 2012-02-12 11:08:33 -08:00
Jacob Thornton
d7953a8f1e Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-12 11:07:34 -08:00
Jacob Thornton
ed07a4d0ce add note about popover placement 2012-02-12 11:06:50 -08:00
Mark Otto
2eedf60d62 write out icon classes explicitly to enable find via browser 2012-02-11 22:34:41 -08:00
Mark Otto
b327420e52 update comment to reflect ie support 2012-02-11 20:58:10 -08:00
Mark Otto
158419c045 reset line-height for file input in ie9 2012-02-11 20:00:44 -08:00
Mark Otto
5bb55e4615 change fixed height on responsive textareas to min-height 2012-02-11 19:21:23 -08:00
Mark Otto
343012a9af Merge branch 'patch-1' of https://github.com/cvrebert/bootstrap into cvrebert-patch-1 2012-02-11 17:28:07 -08:00
Mark Otto
5b22cf5cc3 fix tabs content wrapping per #1620 2012-02-11 17:27:08 -08:00
Mark Otto
a84092d225 update buttons docs for .disabled class per #1774 2012-02-11 17:25:47 -08:00
Mark Otto
c16ccf64f1 update tooltips message in upgrade docs 2012-02-11 17:25:30 -08:00
Mark Otto
85d8fe884c Merge branch '2.0.1-docs-update' of https://github.com/smaboshe/bootstrap into smaboshe-2.0.1-docs-update 2012-02-11 17:18:17 -08:00
Mark Otto
a497e9010a make button examples button element and add upgrade note on tooltip positions per #1532 2012-02-11 17:12:32 -08:00
Mark Otto
5a3dfb72bf support small for legend per #1544 2012-02-11 16:50:57 -08:00
Mark Otto
4ddc8fd0e4 remove color on :active of buttons 2012-02-11 16:43:53 -08:00
Mark Otto
102bb8e684 clear up some messaging in docs on fluid grid system and nesting overall 2012-02-11 10:38:41 -08:00
Mark Otto
2679c3ebe3 remove the reset type from cancel buttons in forms examples per #1844 2012-02-11 10:13:53 -08:00
Mark Otto
8f1db4321a fix inline form checkbox/radios 2012-02-11 00:24:06 -08:00
Mark Otto
60ee768537 fix type on responsive grid per #1852 2012-02-11 00:16:13 -08:00
Mark Otto
efac5441d8 move legend fix out of horizontal and to all forms 2012-02-11 00:11:34 -08:00
Mark Otto
cbccbed8c8 fix javascript text on tooltips per #1862 2012-02-11 00:10:26 -08:00
Mark Otto
722c75d1b1 update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first 2012-02-11 00:07:05 -08:00
Mark Otto
a63663a3b6 fix type in less docs per #1902 2012-02-11 00:02:28 -08:00
Mark Otto
02cb4df469 fix some single vs double quotes, fix typo in js docs per #1900 2012-02-11 00:01:35 -08:00
Mark Otto
89205d9db4 manually address #1895 2012-02-10 23:59:00 -08:00
Mark Otto
b4b3343a61 clarify structure of responsive css file 2012-02-10 23:57:31 -08:00
Mark Otto
c720d951be add best practices and re-org the button groups 2012-02-10 23:50:45 -08:00
Mark Otto
8a91f927f5 clarify npm install command in less docs 2012-02-10 23:37:54 -08:00
Mark Otto
d7aefe67e3 scope th bottom vertical-align to only thead, update code styles to include more comments in less file and scrollable option for pre tag 2012-02-10 23:07:32 -08:00
Mark Otto
c10661cf5d Merge branch 'barsoom-ol-unstyled' into 2.0.1-wip 2012-02-09 23:20:05 -08:00
Mark Otto
9126014e93 Merge branch 'ol-unstyled' of https://github.com/barsoom/bootstrap into barsoom-ol-unstyled 2012-02-09 23:19:31 -08:00
Simon
451a642ae8 Added a black/dark button 2012-02-09 23:08:14 +01:00
Chris Wiederspan
4c7b9b8fce Added an overriding filter: progid:DXImageTransform.Microsoft.gradient(enabled=false) to the .subnav-fixed class that fixes the bug caused on nav dropdown menus when "docked" in the fixed position. 2012-02-09 14:28:12 -07:00
Silumesii Maboshe
2e5a81601c Typo. 2012-02-08 17:11:51 +02:00
Jacob Thornton
b0bd3efc4a Merge pull request #1781 from pamelafox/patch-7 
Javascript update docs for tooltips, based on @fat's feedback.
 2012-02-07 22:35:47 -08:00
Jacob Thornton
b36a744fa7 remove small class 2012-02-07 22:32:32 -08:00
Jacob Thornton
04fd01d4b6 fix docs for carousel markup 2012-02-07 22:04:52 -08:00
Jacob Thornton
139a077543 don't use e.target incase button has icon or other content inside it 2012-02-07 21:55:27 -08:00
John Wright
d390a921dc some (android) devices need this viewport meta tag for responsive design to work 2012-02-07 11:06:08 -08:00
John Wright
9928e7fd3c some (android) devices need this viewport meta tag for responsive design to work. 2012-02-07 11:05:13 -08:00
John Wright
91d0997c79 Some devices need this for responsive design to work 2012-02-07 10:58:01 -08:00
Henrik N
25bf0af249 Add ol.unstyled 2012-02-07 19:29:45 +01:00
Mark Otto
11f72f6aa2 merge in #1782, remake to compile html, add some i18n tags 2012-02-07 00:31:01 -08:00
Mark Otto
00c13691a9 Merge branch 'pamelafox-patch-8' into 2.0.1-wip 2012-02-07 00:17:04 -08:00
Mark Otto
adff17ac03 fix for #1779, use line-height var 2012-02-07 00:16:05 -08:00
Mark Otto
2d9b3c45d3 move formfieldstate mixin to mixins.less for #1785 2012-02-07 00:13:52 -08:00
Mark Otto
3b57fba754 merge in #1757 and make the chance to the mustache template, then remake 2012-02-07 00:07:08 -08:00
Mark Otto
3fa971378e Merge branch 'master' of https://github.com/bastula/bootstrap into bastula-master 2012-02-07 00:05:25 -08:00
Mark Otto
7dffeb471f fix #1786 to manually fix typo in js docs links 2012-02-06 23:55:18 -08:00
Mark Otto
b5f1d2f3a4 rearrange order of 3d and skew mixins: 2012-02-06 23:48:48 -08:00
Mark Otto
7ce62ffc98 make after merging in breadcrumbs wrap fix 2012-02-06 23:42:57 -08:00
Mark Otto
1a97cce19b manual patch of #1449 to make thumbnails use grid vars 2012-02-06 23:39:22 -08:00
Mark Otto
4ed1b13719 Merge branch 'raphaelz-patch-1' into 2.0.1-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-06 23:36:31 -08:00
Mark Otto
575b82473f rearrange some of the docs on buttons to show examples of all possible renderings along with code snippets and note about usage; also fix the portrait tablet media query 2012-02-06 23:34:03 -08:00
Pamela Fox
7e92b33f12 Adding tooltip example to javascript docs. It's particularly helpful to show the pre-generated HTML for tooltips, as inspecting the source will show post-processed HTML with data-original-title attributes and may confuse folks (where folks=me :). 2012-02-06 14:37:47 -08:00
Pamela Fox
407ca09226 Javascript update docs for tooltips, based on @fat's feedback. 2012-02-06 14:33:12 -08:00
Jacob Thornton
c8c4d5b392 fix alert tests + add show option back to modals 2012-02-06 00:17:31 -08:00
Chris Rebert
98cffdbf46 parallel fix to mustache template 2012-02-05 23:02:16 -08:00
Aditya Panchal
8a8daca71e Fixed a typo in base-css.html which allows the user icon to be shown on the example button 2012-02-05 22:04:46 -06:00
Mark Otto
85e401a656 add label hover style for ability to make it a link 2012-02-05 02:36:21 -08:00
Mark Otto
546332d85d resolve #1602 and add table hover style 2012-02-05 02:28:42 -08:00
Mark Otto
f8c2d9b53d remove 940px from default grid heading 2012-02-05 02:24:14 -08:00
Mark Otto
59b32586af close #1628 to add padding to all inline checkboxes/radios 2012-02-05 02:16:46 -08:00
Mark Otto
91475c865d fix #1631 by adding focus to radio buttons 2012-02-05 02:14:25 -08:00
Mark Otto
4a09cf04d8 clean up labels per #1656 2012-02-05 02:01:28 -08:00
Mark Otto
2a192468d3 address #1722 by finishing incomplete sentence on responsive 2012-02-05 01:59:16 -08:00
Mark Otto
d92523f329 fix for #1658 to give .label-success proper text 2012-02-05 01:57:09 -08:00
Mark Otto
ff91b233eb fix #1665 by correcting tabs example markup 2012-02-05 01:50:55 -08:00
Mark Otto
53da88e561 add mixin for text-overflow 2012-02-05 01:49:36 -08:00
Mark Otto
f59b7ce8ea add mention of required classes to horizontal forms 2012-02-05 01:43:22 -08:00
Mark Otto
abf4ecac4d add another code example for horizontal forms 2012-02-05 01:41:45 -08:00
Mark Otto
83cb105317 adding code snippets to form examples 2012-02-05 01:36:11 -08:00
Mark Otto
9b5b8460b4 Merge branch 'noahblon-master' into 2.0.1-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-05 01:26:44 -08:00
Mark Otto
2f42f35c69 manually resolve #1684 2012-02-05 00:35:13 -08:00
Mark Otto
6661639b37 #1693: manual fix of the pull request to add class name changes to pills/tabs to upgrade guide 2012-02-05 00:29:19 -08:00
Mark Otto
0336f1e644 #1695: manually fix broken primary button instances 2012-02-05 00:27:08 -08:00
Mark Otto
dfcb2d1ed8 #1697: update upgrading docs to include mention of no more secondary class in modals 2012-02-05 00:25:40 -08:00
Mark Otto
f29e3263b0 follow up to #1702, add callout on component alignment in tabs/pills 2012-02-05 00:16:25 -08:00
Mark Otto
cdb1ad1a52 #1702: add callout to navbar for component alignment 2012-02-05 00:11:21 -08:00
Mark Otto
31abeec0f2 manually handle #1703 for note on horizontal forms 2012-02-05 00:05:01 -08:00
Mark Otto
125368d4db update docs with call on meta tag for responsive 2012-02-04 23:57:15 -08:00
Mark Otto
a2848ebb00 fix meta tag for viewport in examples and shims 2012-02-04 23:53:24 -08:00
Chris Rebert
93fea1f1cf The &lt; and &gt; escapes have nothing to do with Unicode. 2012-02-04 23:21:56 -08:00
Mark Otto
35fdddbc4f correct css selector for .control-label, required in the docs but not in the CSS files 2012-02-04 22:55:47 -08:00
Mark Otto
418bf5221a #1712: fix typo in js docs 2012-02-04 22:50:26 -08:00
Mark Otto
87a8c9b677 #1707: remove rgba() background override on navbar active items for customization 2012-02-04 22:40:50 -08:00
Mark Otto
679cd5ea02 #1706: protocol independent html5shim added, and moved after the CSS for loading time's sake 2012-02-04 22:38:49 -08:00
Mark Otto
6d8ac203e5 fix broken alert example with data-dismiss 2012-02-04 22:32:04 -08:00
Mark Otto
b297a61f82 #1732: make examples of alerts in docs components page dismissable 2012-02-04 22:31:09 -08:00
Mark Otto
468688638d #1715: strip code of styles when in a pre 2012-02-04 22:23:20 -08:00
Mark Otto
7e81f84b29 buttons and icons updated for improved placement and variable support for icon paths 2012-02-04 22:22:19 -08:00
Mark Otto
81d1f3b96e remove max-width on dropdown menus 2012-02-04 18:52:25 -08:00
Mark Otto
9259e24f73 fix cutoff follow button 2012-02-04 18:27:05 -08:00
Mark Otto
ac98cee609 allow alternate form layouts to hide inputs with .hide on them 2012-02-04 18:26:04 -08:00
Noah Blon
f922a0800b Fixes typo on download page 
Changed chose to choose spelling error on download template
 2012-02-03 10:34:03 -06:00
Jacob Thornton
f68f7870ef Merge pull request #1603 from mikaelbr/master 
Fixed ID and for-attr in the doc forms
 2012-02-02 23:47:22 -08:00
Jacob Thornton
7f0a64106d its core (typo) 2012-02-02 23:31:03 -08:00
Hendy Tanata
906028abdb Fix alerts JavaScript code example. 2012-02-02 20:45:58 -08:00
Mark Otto
9ab843b936 add mention of classes to use for button sizes 2012-02-02 09:57:22 -08:00
Mark Otto
e92e9f1138 add count to follow button, tweak links to fit on one line for 940px 2012-02-02 09:46:14 -08:00
Mark Otto
ab4345332d Merge branch 'shama-master' into 2.0.1-wip 2012-02-02 09:38:21 -08:00
Mark Otto
bd0e952003 fix inverted warning text and bg colors in less docs page 2012-02-02 09:36:33 -08:00
Mark Otto
cf488c2800 fix incorrect uses of it's in the docs 2012-02-02 09:33:18 -08:00
Mark Otto
dfdc63e872 fix incorrect use of 'caret' 2012-02-02 09:31:07 -08:00
Mikael Brevik
8c0b47a6a8 Fixed duplicate and wrong IDs and label fors in forms. 2012-02-02 14:09:27 +01:00
Kyle Robinson Young
99f395bcd7 Typo fixes 2012-02-01 23:30:37 -08:00
Mark Otto
9c3218c89b Merge branch 'mshafrir-master' into 2.0.1-wip 2012-02-01 23:12:17 -08:00
Mark Otto
d86e77a256 Merge branch 'master' of https://github.com/mshafrir/bootstrap into mshafrir-master 2012-02-01 23:12:06 -08:00
Mark Otto
8dd2b3d3f8 follow up to #1501 to update notes in sprites.less 2012-02-01 23:10:37 -08:00
Mark Otto
1ec6628e80 add note for icon class usage per #1501 2012-02-01 23:10:00 -08:00
Mark Otto
25ffe14c1b add line item to docs on upgrading per #1488 2012-02-01 23:02:31 -08:00
Mark Otto
aa8a7668cb Merge branch 'master' into 2.0.1-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-01 22:52:07 -08:00
Mark Otto
58fd0dea36 fixing some docs pages for i18n 2012-02-01 22:51:01 -08:00
Jacob Thornton
e26da36b9a remove 2.0-wip ref 2012-02-01 22:30:51 -08:00
Mark Otto
43d797dfff #1566: add note about removal of secondary-nav in 2.0 2012-02-01 22:29:15 -08:00
Jacob Thornton
e1deb4e767 fix makefile to reset zips 2012-02-01 22:27:46 -08:00
Mark Otto
4211f21e39 #1571: remove fixed width on file inputs 2012-02-01 22:27:11 -08:00
Jacob Thornton
6738042c61 rebuild with correct zip 2012-02-01 22:21:29 -08:00
Mark Otto
c1f0da7cce Merge branch 'master' of github.com:twitter/bootstrap 2012-02-01 22:13:26 -08:00
ejain
1b8863f925 Import the responsive css *after* setting the body padding to fix the issue described in #1570. 2012-02-01 21:17:04 -08:00
Mark Otto
f34ddb5c3f nuke all curly ticks 2012-02-01 18:27:38 -08:00
Mark Otto
94c2c70e6e fix spelling in examples page 2012-02-01 18:25:34 -08:00
Mark Otto
54bfdf1183 fix the makefile 2012-02-01 18:24:41 -08:00
Mark Otto
8a1769c9e2 fix missing ; in buttons.less 2012-02-01 18:18:39 -08:00
Mark Otto
f2d3026de8 update scaffolding responsive section to reflect proper media query ranges 2012-02-01 18:12:14 -08:00
Mark Otto
1ebe51c834 fix mis-labeled label 2012-02-01 18:11:19 -08:00
Mark Otto
4d918beb26 fix js links in components 2012-02-01 18:06:52 -08:00
Mark Otto
2e1649410c remove twitter widgets js from examples 2012-02-01 18:00:40 -08:00
Mark Otto
e36496fd84 Merge pull request #1490 from amenonsen/master 
Typo fix: Sprited => Striped
 2012-02-01 17:59:19 -08:00
Mark Otto
3ea3950225 fix icon-bar class in exampless 2012-02-01 17:57:39 -08:00
Mark Otto
2fd6a2e9f6 remove excess td in less docs 2012-02-01 17:55:32 -08:00
Mark Otto
3a2f0765bf fix hover state on .nav-list for active links 2012-02-01 17:54:21 -08:00
Mark Otto
73238701bd fixing jquery links in examples 2012-02-01 17:41:24 -08:00
Mark Otto
5c1527abc5 remove unused css files and add scaffolding and hero-unit to the builder 2012-02-01 17:06:40 -08:00
Mark Otto
f166c5a35b Merge branch 'master' of github.com:twitter/bootstrap 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-01 16:45:25 -08:00
Mark Otto
9b9e1d309b fix that jank hack 2012-02-01 16:44:07 -08:00
Jacob Thornton
87df230408 rebuild 2012-02-01 16:39:15 -08:00
Jacob Thornton
59016d2198 only add the anyalytics to production 2012-02-01 16:38:58 -08:00
Michael Shafrir
b96e80cf39 Fix broken named anchor link for LESS compiling instructions. 2012-02-01 09:58:08 -08:00
Abhijit Menon-Sen
140d90db63 Typo fix 2012-02-01 13:21:37 +05:30
Mark Otto
7f32d15fbb fix links and rebuild 2012-01-31 19:32:42 -08:00
Jacob Thornton
fd49d4a44f move examples into docs... 2012-01-31 17:35:23 -08:00
Jacob Thornton
bdfb05dbac Merge branch '2.0-wip' 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 17:27:01 -08:00
Mark Otto
c8fad25902 update upgrade page 2012-01-31 17:24:20 -08:00
Jacob Thornton
cabba91c7c Merge branch '2.0-wip' 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 14:38:06 -08:00
Mark Otto
c84b5cf5f5 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 14:30:07 -08:00
Mark Otto
6cf79a5b8e remove unused examples, update examples docs page, add starter template to examples, remove warning alert banner, add screenshots 2012-01-31 14:29:44 -08:00
Mark Otto
013de18e6b remove warning alert on less docs 2012-01-31 14:00:26 -08:00
Jacob Thornton
fd700e358d Merge branch '2.0-wip' 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 13:59:40 -08:00
Jacob Thornton
e75bc5eb5f Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 13:59:08 -08:00
Jacob Thornton
390a9af936 move js stuff into assets 2012-01-31 13:58:28 -08:00
Mark Otto
aec0cb3303 fix broken nav on less page 2012-01-31 13:57:43 -08:00
Jacob Thornton
b9de88890e Merge branch '2.0-wip' 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 13:23:29 -08:00
Jacob Thornton
0bfbe5058d Merge branch '2.0-wip' 
Conflicts:
	.gitignore
	LICENSE
	Makefile
	bootstrap.css
	bootstrap.min.css
	docs/assets/js/application.js
	docs/assets/js/google-code-prettify/prettify.css
	docs/index.html
	docs/javascript.html
	examples/container-app.html
	examples/fluid.html
	examples/hero.html
	js/bootstrap-alerts.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tabs.js
	js/bootstrap-twipsy.js
	js/tests/index.html
	js/tests/unit/bootstrap-modal.js
	js/tests/unit/bootstrap-popover.js
	js/tests/unit/bootstrap-tabs.js
	lib/forms.less
	lib/mixins.less
	lib/patterns.less
	lib/scaffolding.less
	lib/tables.less
 2012-01-31 13:18:34 -08:00
Mark Otto
cfc1c8a8cd clean up responsive media queries and docs css 2012-01-31 13:16:11 -08:00
Mark Otto
09b9b8a586 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-31 09:40:11 -08:00
Mark Otto
9cfae03fd4 fix typo in base css docs 2012-01-31 09:37:44 -08:00
Mark Otto
cc5415b889 fix js docs typo 2012-01-31 09:37:14 -08:00
nkryptic
d70ba6c5e6 add form help-* documentation 2012-01-31 03:54:07 -05:00
Mark Otto
a6253f0937 fix disabled button docs 2012-01-31 00:15:43 -08:00
Mark Otto
bd9221ddc0 Merge pull request #1457 from nkryptic/2.0-wip 
[2.0-wip] added missing nav- prefixes to docs
 2012-01-31 00:12:34 -08:00
Mark Otto
b7713b83fa chance icon class 2012-01-31 00:11:19 -08:00
nkryptic
d633dbb44e add nav- prefix to rest of docs 2012-01-31 02:54:10 -05:00
Mark Otto
4d93b63916 disable cursor on disabled and active pagination links 2012-01-30 23:27:58 -08:00
Mark Otto
d533310bd2 once more, overhaul the icons and use the css regex selector on our icons 2012-01-30 23:24:35 -08:00
Mark Otto
de994efac7 fix the other disabled button style 2012-01-30 23:17:05 -08:00
Mark Otto
5c9a687665 fix button styles on active and disabled 2012-01-30 23:16:27 -08:00
Mark Otto
61b47e91b8 update layout docs 2012-01-30 23:10:29 -08:00
Mark Otto
1cff29c33f restore a few commented out responsive items 2012-01-30 23:02:24 -08:00
Mark Otto
47a68ae3aa update icons everywhere to be scoped per other components, fix broken elements on js docs page 2012-01-30 22:57:00 -08:00
Mark Otto
31911659a2 refactor the navs to use prefixed classes, because you know, consistency is beast mode 2012-01-30 21:29:50 -08:00
Mark Otto
0f3a073b8d *really* refactor the buttons and update them all over the docs 2012-01-30 21:15:57 -08:00
Mark Otto
21bebe77fe refactor buttons.less 2012-01-30 20:50:51 -08:00
Jacob Thornton
155047c3e6 speed up topbar animation for responsive 2012-01-30 13:59:05 -08:00
Mark Otto
74f2a89611 fix wrong value in grid column width in download page 2012-01-30 10:01:02 -08:00
Mark Otto
e94e0f1cf9 implement @textColor for body text 2012-01-30 09:41:31 -08:00
Mark Otto
ac581eebac large carousel images and margin bottom added 2012-01-30 09:19:25 -08:00
Mark Otto
774904464d fix docs: move .pull-left from search input to search form in navbar 2012-01-30 08:58:40 -08:00
Mark Otto
3722c34b50 account for floated inputs in the .navbar-form 2012-01-30 08:20:37 -08:00
Mark Otto
2d40b07afc adding warning (orange) button, fix responsive navbar problem 2012-01-30 08:15:28 -08:00
Mark Otto
a29dee44ac remove all new dropdown button stuff 2012-01-30 08:04:48 -08:00
Mark Otto
a8400009da testing out button dropdown group 2012-01-30 07:59:24 -08:00
Mark Otto
2c8ca4f5e2 add skew mixin 2012-01-30 07:54:47 -08:00
Mark Otto
9f5b619094 add in regular button dropdowns, rejigger the button dropdowns section to reflect change 2012-01-30 07:49:28 -08:00
Mark Otto
9ba70796e2 remove top 5px padding from first inline radio/checkbox 2012-01-30 07:40:24 -08:00
Mark Otto
33a969dd0c update vars in less and download pages 2012-01-30 01:34:59 -08:00
Mark Otto
175fd98a7c fix forms typo on error state 2012-01-30 01:25:02 -08:00
Mark Otto
144789788f updated upgrade page to reflect popover changes 2012-01-30 01:24:02 -08:00
Mark Otto
f4e5bc1c53 namespace popover values 2012-01-30 01:20:51 -08:00
Mark Otto
8f448610a9 rename vertical-divider to divider-vertical, add more space around the divider 2012-01-30 01:09:34 -08:00
Mark Otto
dc3d2b1044 update js docs page to clarify usage of images on carousel 2012-01-30 00:44:27 -08:00
Mark Otto
0f088af855 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
	less/responsive.less
 2012-01-30 00:43:57 -08:00
Mark Otto
ae7f94eeff overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts 2012-01-30 00:39:44 -08:00
Jacob Thornton
0de951f4f4 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-29 19:07:14 -08:00
Jacob Thornton
fae04c8ac1 add license for responsive and rebuild 2012-01-29 19:04:26 -08:00
Mark Otto
2ba1b01f8d subnav adjustments 2012-01-29 17:03:05 -08:00
Mark Otto
fda77e69eb move vars and mixins for default grid back to appropriate files 2012-01-29 16:58:51 -08:00
Mark Otto
b078050702 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-29 16:55:56 -08:00
Mark Otto
0301d469e8 remove .collapse from navbar responsive docs 2012-01-29 16:54:51 -08:00
Jacob Thornton
90f2e8e196 rebuild zip 2012-01-29 16:46:40 -08:00
Mark Otto
882bb9dbd3 reran make 2012-01-29 16:43:03 -08:00
Mark Otto
b0976bb379 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-29 16:42:37 -08:00
Mark Otto
702d3b6dfe fix broken navbar collapse 2012-01-29 16:35:55 -08:00
Jacob Thornton
298e637d00 remove dist dir 2012-01-29 16:33:29 -08:00
Jacob Thornton
f622822459 check in dist dir for hb5 + update images to point to correct spot for builder 2012-01-29 16:19:41 -08:00
Burak Tuyan
19b70dc414 Fixing the Docs for Tabs dropups 
New example caused an overflowing issue at the Tabs dropdowns documentation, this is a quick fix to get rid of this issue.
 2012-01-30 01:22:10 +02:00
Burak Tuyan
97b3057824 Extending the dropup support to tabs and pills 
This was needed to match the color of the carets that are used for tabs and pills
 2012-01-30 01:13:21 +02:00
Burak Tuyan
918a17a30b Adding dropup support to split buttons and navbar 
* Documents the hidden .dropdown-menu.bottom-up option (to be used for dropups)
* Extends the .bottom-up class to carets and all relevant caret styles
* Adds .dropdown-menu.pull-right class for right-aligned dropdowns and dropups
* Adds examples and some information to the "split dropdown" and "navbar" sections of the Docs
 2012-01-30 00:50:47 +02:00
Mark Otto
d637db1a23 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-29 14:23:06 -08:00
Mark Otto
e493f7fc19 update navbar collapse everywhere and remake 2012-01-29 14:22:51 -08:00
Mark Otto
9e7f5025b4 update collapsible nav in navbar 2012-01-29 14:07:58 -08:00
Mark Otto
391661f14b Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-29 13:25:36 -08:00
Mark Otto
278858e706 fix form styles on prepend/append for consistency, update code docs with examples of the code snippets 2012-01-29 13:25:13 -08:00
Chad Moran
2696c6a4bd Fixed @warningText and @warningBackground colors in docs 2012-01-29 13:20:39 -08:00
Jacob Thornton
910e78d26a Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-29 13:16:02 -08:00
Mark Otto
9fa8bde44d fix animated/striped gradients in progress bars 2012-01-29 13:15:38 -08:00
Jacob Thornton
49d565a6da move building zip file into docs/makefile 2012-01-29 13:15:37 -08:00
Mark Otto
4e5b0e185e refined pager styles to give a border on the links and improved hover state 2012-01-29 13:12:13 -08:00
Mark Otto
8c763589a2 update text on icons note 2012-01-29 13:09:10 -08:00
Mark Otto
48529ad01f last minute addition of a simple fluid grid for our fluid examples; it needs work, so we're not documenting it now 2012-01-29 13:06:57 -08:00
Mark Otto
059ff6bcbd update hero example and examples overview 2012-01-29 02:27:45 -08:00
Mark Otto
7bf2767452 remove form docs from the styles and markup, it's no longer needed 2012-01-29 00:07:01 -08:00
Mark Otto
15a1c0ce79 add swatches to the color variables in less docs page 2012-01-28 23:58:39 -08:00
Mark Otto
bca269299b removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section 2012-01-28 23:40:52 -08:00
Mark Otto
62f4a1571a revamped the thumbnails examples to make them work and look better at higher resolution 2012-01-28 22:48:25 -08:00
Mark Otto
487dbfdda4 namespace progress bars and labels classes 2012-01-28 22:14:51 -08:00
Mark Otto
59d9983ebc updates to responsive and docs for responsive navbar 2012-01-28 22:03:14 -08:00
Mark Otto
f1e520badd clarify and tweak media queries 2012-01-28 20:34:07 -08:00
Mark Otto
5f314dcb85 remove benefits from homepage html 2012-01-28 20:27:18 -08:00
Mark Otto
3e462f1fb2 update docs to simplify some css 2012-01-28 20:26:27 -08:00
Mark Otto
cf1b46bda4 fix alert close position 2012-01-28 18:46:41 -08:00
Mark Otto
99ac6ca08e update components page to include docs for the new navbar collapse feature, re-add responsive.less to downloader 2012-01-28 18:39:36 -08:00
Mark Otto
e17c9249d2 fix dropdowns in subnav 2012-01-28 18:27:09 -08:00
Mark Otto
e532228721 more responsive tweaks for tablet 2012-01-28 18:25:05 -08:00
Mark Otto
4fa931e403 fix the navbar click and a few jank responsive problems 2012-01-28 18:11:31 -08:00
Mark Otto
06df91ac55 remove background from accordion, and use border instead 2012-01-28 16:48:03 -08:00
Mark Otto
475b985a0e remove padding from first-child of inline radios/checkboxes 2012-01-28 16:37:43 -08:00
Jacob Thornton
22d52fca46 fix goign between small view large view with responsive collapse 2012-01-28 16:21:55 -08:00
Jacob Thornton
b8a683d7f2 turn off brand hover for now + get nav toggling in mobile 2012-01-28 15:42:07 -08:00
Jacob Thornton
ea1c21d62d Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 15:15:38 -08:00
Jacob Thornton
6493cd22c0 blah 2012-01-28 15:14:57 -08:00
Mark Otto
23e076c1bb add in a navbar button for toggling the nav items 2012-01-28 15:09:23 -08:00
Mark Otto
7843a665fd vertical align inline checkboxes/radios to improve rendering in topbar 2012-01-28 14:50:56 -08:00
Mark Otto
9db4f2a344 change .span* inputs to use content-sizing: border-box; to make them behave as block level elements 2012-01-28 14:30:45 -08:00
Mark Otto
ab20c921df Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 13:30:34 -08:00
Mark Otto
fe6d2f2e1d fix tabs-below typo 2012-01-28 13:30:15 -08:00
Jacob Thornton
b38a13ef98 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 13:17:07 -08:00
Jacob Thornton
6935f693b3 typahead does case insensitive matching with simple sorter + accepts highlighter option 2012-01-28 13:16:05 -08:00
Mark Otto
1a22c3b30a restore IE filters, but reset them on buttons 2012-01-28 13:13:01 -08:00
Mark Otto
296d06a285 add checkbox/radio border for ios in responsive 2012-01-28 13:07:01 -08:00
Mark Otto
70c6a6cd85 fix border and border radius on radios/checkboxes for iOS, fix forms docs alignment on small devices 2012-01-28 12:58:26 -08:00
Mark Otto
b77161f864 reset border-radius only for ie9? 2012-01-28 12:49:26 -08:00
Mark Otto
698d4b414c Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 12:43:45 -08:00
Mark Otto
2bfda031ce darken buttons, uncomment out firefox keyframes from progress bars 2012-01-28 12:43:19 -08:00
Jacob Thornton
e1a1fdd35d Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 12:09:16 -08:00
Jacob Thornton
12d3c2fe74 fix z-index issue with modals for popovers,tooltips,and dropdowns 2012-01-28 12:08:41 -08:00
Mark Otto
f1dc214977 increase padding on modal-header after decreasing h3 line-height 2012-01-28 11:24:34 -08:00
Mark Otto
2452768259 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 11:22:07 -08:00
Mark Otto
28ba9d69c8 nav, buttons, and docs updates to account for outline: 0; on :active 2012-01-28 11:21:39 -08:00
Jacob Thornton
d465952138 clean up js api for dropdowns 2012-01-28 11:03:39 -08:00
Jacob Thornton
ab8f4a394c remove js for table sorts 2012-01-28 01:48:45 -08:00
Mark Otto
d65ce1b64c updated upgrading page 2012-01-28 01:34:07 -08:00
Jacob Thornton
81c128fd0b Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 00:46:21 -08:00
Jacob Thornton
09df780b75 clean up application js a bit 2012-01-28 00:46:04 -08:00
Mark Otto
f1851ab133 change text on js docs page to improve rendering on iphone, update responsive for carousel considerations 2012-01-28 00:43:25 -08:00
Mark Otto
edee985b96 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 00:39:34 -08:00
Mark Otto
967030cb53 modal refinements in docs and general responsiveness 2012-01-28 00:39:22 -08:00
Jacob Thornton
7ffec335ca Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 00:37:12 -08:00
Jacob Thornton
4737d693e0 remove quick start section to simplify landing page + start rewriting application js to work ie7 2012-01-28 00:36:37 -08:00
Mark Otto
18d95a163b remove fixed width from labels table 2012-01-28 00:34:54 -08:00
Mark Otto
cc01d3c367 extend block level smalls to h2s in docs 2012-01-28 00:31:55 -08:00
Mark Otto
342a99f1d0 block level page-header h1 small for readability on 480px and under 2012-01-28 00:29:38 -08:00
Mark Otto
963e5e0eda scope subnav link styles to first child, and no dropdowns 2012-01-28 00:27:49 -08:00
Mark Otto
873be0e4f2 drop span2-4 on form examples to 1-3 2012-01-28 00:25:54 -08:00
Mark Otto
d448e6921e rewrite the code section of the type docs 2012-01-28 00:23:30 -08:00
Mark Otto
ce69b70719 give append/prepend inputs higher z-index on focus 2012-01-27 23:53:56 -08:00
Mark Otto
08fea7587c call attention to notices in js docs more 2012-01-27 23:27:33 -08:00
Mark Otto
7a756168b5 fix regression in textarea shadows 2012-01-27 22:56:48 -08:00
Mark Otto
1d44f37fc9 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-27 22:52:56 -08:00
Mark Otto
cb8606f2c8 adding wells and close icon to the docs under misc in components, with a new subnav style 2012-01-27 22:52:45 -08:00
Jacob Thornton
7cbb586825 move the matcher and sorter into the options - encourage people to override them... 2012-01-27 22:27:06 -08:00
Jacob Thornton
e726b231ba add toggle to docs for popover/tooltip 2012-01-27 21:59:06 -08:00
Jacob Thornton
1e07c066a5 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-27 21:37:59 -08:00
Jacob Thornton
0255f47eb3 add zindex option for tooltips/popovers and fix modal zindex doc example 2012-01-27 21:36:58 -08:00
Mark Otto
ad78caa726 fix right aligned dropdowns in navbar by adding left: auto; to nix default alignment 2012-01-27 21:25:35 -08:00
Mark Otto
78120edf72 add clearfix to control-group for longer labels and any other unforeseen circumstances 2012-01-27 21:20:58 -08:00
Mark Otto
d0447e9aa5 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 21:09:24 -08:00
Mark Otto
3934d1b6c4 rgba text color on active buttons for a bit more contrast from their non-active siblings 2012-01-27 21:08:04 -08:00
Jacob Thornton
15d3a4797f simplify build process more - remove really annoying date. 2012-01-27 21:06:09 -08:00
Mark Otto
4e191c423d update progress bars to have a solid edge until 100% filled 2012-01-27 20:17:03 -08:00
Mark Otto
9800196bf7 use quotes on attr selectors more consistently 2012-01-27 20:05:03 -08:00
Mark Otto
0fa6422918 icon spacing in small buttons and nav lists 2012-01-27 19:57:53 -08:00
Mark Otto
d02c6957d4 fixing up buttons and examples of implementing icons 2012-01-27 19:49:56 -08:00
Mark Otto
a624ac1edf Merge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/docs/base/icons 2012-01-27 19:12:09 -08:00
Mark Otto
7fc6e12b79 comment icons that are 1px off 2012-01-27 18:49:00 -08:00
Mark Otto
aaa530c27e combined .disabled and [disabled] and confirmed in ie7/8 2012-01-27 18:44:17 -08:00
Mark Otto
7e72eb5063 new tab focus style and mixin 2012-01-27 18:33:25 -08:00
Mark Otto
997fc33af9 clean up use of mixins to highlight them appropriately in your fav editor 2012-01-27 16:40:14 -08:00
Mark Otto
d9759abeeb Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 16:35:32 -08:00
Mark Otto
f6dc566963 overhaul navbar behavior in responsive css 2012-01-27 16:26:55 -08:00
Burak Tuyan
a2a10ae421 Adding new examples to the icons' docs. 
- Button with dropdown menu.
- Small info button.
- Text alignment for navigation with no icon.
- Text input form with prepended icon
- Select input form with prepended icon
 2012-01-28 02:13:53 +02:00
Mark Otto
800d0b24e0 remove page-header from docs and add to type.less 2012-01-27 15:28:09 -08:00
Mark Otto
91e9f6fa91 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 14:49:02 -08:00
Mark Otto
22359f9dfd update examples and restore icons 2012-01-27 14:48:35 -08:00
Jacob Thornton
065ed01b1f Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 14:44:58 -08:00
Jacob Thornton
748696a553 add missing paren 2012-01-27 14:44:05 -08:00
Jacob Thornton
8a2124faff only build mustache files 2012-01-27 14:43:41 -08:00
Mark Otto
003da1e089 fix inputs in navbar 2012-01-27 14:21:17 -08:00
Mark Otto
6353e5070a remove unused images from docs assets 2012-01-27 14:03:36 -08:00
Mark Otto
3807a88ee9 update the docs for icons 2012-01-27 13:56:50 -08:00
Mark Otto
8da1c176ec Merge branch '2.0-wip' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0-wip 2012-01-27 13:43:51 -08:00
Mark Otto
335a8686da Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 13:43:28 -08:00
Pete Hopkins
84b9a1bfb6 Rebuild css and html 2012-01-27 16:39:38 -05:00
Mark Otto
b1f38bbea8 update icon examples to show icons in differently sized buttons 2012-01-27 13:39:19 -08:00
Jacob Thornton
3c7e3eb7d3 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 13:37:14 -08:00
Jacob Thornton
6fd1e9f4c0 rebuil update layout 2012-01-27 13:36:31 -08:00
Mark Otto
d7b8a9c930 align text in buttons so folks can easily make them different widths 2012-01-27 13:36:08 -08:00
Mark Otto
a0b40b361a i18n download page 2012-01-27 13:35:25 -08:00
Mark Otto
ccd963e622 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/download.html
 2012-01-27 13:21:01 -08:00
Mark Otto
e8647c1b11 huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff 2012-01-27 13:20:02 -08:00
Pete Hopkins
7b31f4a334 Brings back uneditable input 2012-01-27 16:09:58 -05:00
Jacob Thornton
3b3dbd7229 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 11:07:17 -08:00
Burak Tuyan
16a28d881c Merge branch '2.0-wip' of git://github.com/twitter/bootstrap into 2.0-wip 2012-01-27 20:48:37 +02:00
Mark Otto
97546adc90 Merge branch 'ie_7_base' of https://github.com/phopkins/bootstrap into phopkins-ie_7_base 2012-01-27 09:40:04 -08:00
Mark Otto
e44a7dd4ff buttons for toggle links in js docs, code example for offsetting in grid 2012-01-27 09:36:49 -08:00
Pete Hopkins
f51e703ba6 Rebuild bootstrap.css 2012-01-27 12:16:36 -05:00
Mark Otto
9d0328ff00 adding outline callout as a fallback for IE--needs testing though, thought I already added this 2012-01-27 08:21:39 -08:00
Burak Tuyan
acaa3b5977 Changing the color of the default icons from black (#000) to grayDark (#333) 2012-01-27 18:02:57 +02:00
Burak Tuyan
942d1b4595 Updating to latest version of Glyphicons Halflings set (v.1.5) along with some icon enhancements like: 
- Updated the Gylphicons Halflings set to version 1.5 (30 new icons)
- Optimized the sprite PNG files for minimum filesize without any quality loss
- Made some fixes for horizontal alignment at the LESS/CSS level (tags, bold, arrow-up, minus, chevron-down)
- Made some fixes for vertical alignment at the LESS/CSS level (chevron-down, resize-vertical, resize-horizontal)
- Renamed the old "calendar" class as "list-alt" class (because now we've a real calendar icon)
- Changed the "background-position" of the icon class to "14px 14px", so that a wrong class name will not be showing the glass icon and instead will show a blank icon (which is useful for just positioning the text after the icons in some cases)
- Added new icons (classes) to the base-css Docs (to both HTML file and Mustache template)
- Changed one of the button examples to danger style and used a white icon
- Renamed the sprite image files to save a few bytes here and there (from glyphicons-halflings-sprite.png to lyphicons-halflings.png and from glyphicons-halflings-sprite-white.png to glyphicons-halflings-white.png)
 2012-01-27 16:33:18 +02:00
Jacob Thornton
aa594501bd change typeahead to data-source instead of data-data and add to docs 2012-01-26 23:16:02 -08:00
Jacob Thornton
c63175dc1d change endpoint to point to actual server... 2012-01-26 22:52:44 -08:00
Jacob Thornton
815a2ae9f2 rebuild + copy images to docs when making 2012-01-26 22:39:17 -08:00
Jacob Thornton
ed64276e5b move doc building into base make method + build bootstrap to doc assets 2012-01-26 22:05:45 -08:00
Jacob Thornton
dc2deb9a1b moving structure around + more work on builder... 2012-01-26 21:48:46 -08:00
Jacob Thornton
e0e54d9c6c Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-26 20:23:28 -08:00
Jacob Thornton
1e9c2fb9d4 getting closer.... 2012-01-26 20:23:15 -08:00
Mark Otto
576ae2f561 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-26 19:10:32 -08:00
Mark Otto
a4a8ea2328 flip order of content on home page 2012-01-26 19:09:59 -08:00
Marco Wise
6886022fe6 fix typo in docs/scaffolding.html 2012-01-26 18:10:36 -08:00
Mark Otto
c8d2c4e442 fix height of download button 2012-01-26 16:45:01 -08:00
Jacob Thornton
12484a7471 more builder crap 2012-01-26 16:41:28 -08:00
Mark Otto
af96da6e89 adding white sprites 2012-01-26 16:27:37 -08:00
Jacob Thornton
c31ac846d7 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-26 16:12:51 -08:00
Jacob Thornton
d531f72645 some js for javascript for builder (stil incomplete) 2012-01-26 16:12:34 -08:00
Mark Otto
b260544de0 fix links to apple touch icons 2012-01-26 15:54:04 -08:00
Mark Otto
f398926e46 move down background iamge 2012-01-26 15:22:52 -08:00
Mark Otto
945870d778 small text change on downloads page 2012-01-26 14:54:24 -08:00
Mark Otto
8a6be6601d make accordion links block level 2012-01-26 14:40:19 -08:00