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,028 Commits 108 Branches 89 Tags 549 MiB
59503e71ff
Commit Graph

1259 Commits

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