0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Commit Graph

918 Commits

Author SHA1 Message Date
Mark Otto
1477e081d4 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less
2012-11-02 09:36:51 -07:00
Mark Otto
72198a59c0 removing glyphicons images, swapping in new icon font with new classes 2012-11-02 01:20:06 -07:00
Mark Otto
bf48c31406 Merge branch 'bradly-affix-docs-fix' into 2.2.2-wip 2012-10-31 10:48:44 -07:00
Mark Otto
d5697fcf6b fixes #5717: add retina favicon, recompile docs 2012-10-31 10:41:41 -07:00
fat
3b3dd3ac3c 2.2.1 - hotfix for carousel 2012-10-30 21:59:56 -07:00
Bradly Feeley
cbf1dace2f Fixing typos in affix options area in the docs. 2012-10-30 11:46:18 -07:00
Mark Otto
9352fe1750 add a ton of the new vars to the customizer 2012-10-29 21:30:39 -07:00
Mark Otto
81c3c1c68c add media.less to customizer page 2012-10-29 21:02:05 -07:00
Mark Otto
41ad16fe40 v2.2.0 instead of v2.1.2 2012-10-29 21:00:53 -07:00
Andreas Cederström
233e050adf Adding .inline for ul and ol 2012-10-26 09:47:55 +02:00
Mark Otto
c33169a6ba fixes #5572: document .input-block-level 2012-10-18 11:19:16 -07:00
Jacob Thornton
ac6625de5f add updater function and rebuild 2012-10-17 21:37:34 -07:00
Mark Otto
e0a007b929 Merge pull request #5507 from bradly/2.1.2-wip
Fixing typo in docs.
2012-10-16 20:36:26 -07:00
Mark Otto
57eb2a8018 more hellip on modals 2012-10-16 20:28:07 -07:00
Mark Otto
0ac50d28b5 fixes #5519: hellip in modal code 2012-10-16 20:18:50 -07:00
Mark Otto
bf78333531 add in latest carousel example, reorg examples on getting started 2012-10-16 12:50:10 -05:00
Mark Otto
463eae25b0 clarify js docs individual or compiled section 2012-10-16 12:37:36 -05:00
Bradly Feeley
ed5c5994a7 Fixing typo in docs. 2012-10-13 18:31:41 -07:00
Mark Otto
e73cd15fc8 copy and style changes to improve docs rendering on mobile devices 2012-10-02 17:01:18 -07:00
Mark Otto
7732d8b9b0 Merge branch '2.1.2-wip' into exploratory 2012-10-02 15:41:31 -07:00
Mark Otto
a2369021ce fixes #5352: update docs messaging for disable nav links 2012-10-02 15:10:22 -07:00
Mark Otto
4ab7b77aa3 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less
2012-10-01 23:41:00 -07:00
Mark Otto
1b814458c9 improve dropdown submenu docs; add docs for left submenu; remove all dupe css for left submenu 2012-10-01 16:41:13 -07:00
Mark Otto
86d5ed6f4f fixes #5377: change selectors for navbar collapse to be unique so only one open/closes at a time 2012-10-01 13:52:50 -07:00
Mark Otto
fd1e9b1498 fix copy on modal popover button doodad 2012-10-01 13:28:54 -07:00
Mark Otto
e6d6c7a413 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/navs.less
2012-10-01 11:27:40 -07:00
Mark Otto
c6c1ada600 clarify tables support of responsive utility classes, of which there is none 2012-10-01 11:18:49 -07:00
Mark Otto
085d6d185d fixes #5055: wrap legend and form elements in fieldset so IE8 styles the legend properly 2012-10-01 10:42:45 -07:00
Mark Otto
eb555b7a9d remove .nav-list, instead use .nav-stacked on .nav-tabs or .nav-pills from now on 2012-10-01 00:06:44 -07:00
Mark Otto
26386ad615 remove tabbable tabs on left, right, and bottom; instead, from here out use stacked pills or tabs 2012-10-01 00:05:18 -07:00
Mark Otto
b6f6235e9b change notes about responsive in Scaffolding page: no longer separate file 2012-09-30 23:26:51 -07:00
Mark Otto
bbd543db53 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
2012-09-30 22:45:39 -07:00
Mark Otto
a4a6244eb7 add sticky footer example per martin bean's suggestion, using the implementation by ryan fait 2012-09-30 22:09:51 -07:00
Mark Otto
a2690c6d86 add link to examples on index page; add back narrow marketing page and signin page examples 2012-09-30 21:28:20 -07:00
Mark Otto
57f8dbe25c fixes #5360: typo in tables docs 2012-09-30 21:26:43 -07:00
Mark Otto
f8374a754d clean up emphasis docs text 2012-09-28 15:01:12 -07:00
Mark Otto
8ecffcb32f fixes #5334: html snippet comments 2012-09-28 10:39:15 -07:00
Mark Otto
ad96435d27 Merge branch '2.1.2-wip' into box-sizing-exercise 2012-09-26 16:02:33 -07:00
Mark Otto
cd5ae9e030 change up carousel 2012-09-26 11:20:27 -07:00
Mark Otto
b6ba717b75 fix getting started examples 2012-09-25 23:01:18 -07:00
Mark Otto
80c4d5a9bf fix homepage example sites 2012-09-25 22:59:49 -07:00
Mark Otto
ecbf1159a4 remove .dividers from breadcrumbs, instead use :after and content 2012-09-25 22:57:20 -07:00
Mark Otto
c59e5251e1 initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00
Mark Otto
f12946be5a thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup 2012-09-25 22:40:48 -07:00
Mark Otto
9e97098802 make .input-* classes match .btn-* size classes 2012-09-25 22:16:47 -07:00
Mark Otto
ce19e63d5b Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/base-css.html
	docs/templates/pages/base-css.mustache
	less/forms.less
	less/mixins.less
2012-09-25 22:00:41 -07:00
Mark Otto
527d01ce99 headway, cleanup, and tests 2012-09-25 15:01:03 -07:00
Jacob Thornton
aec8b08930 update docs for tooltip html + the dropdown methods api 2012-09-24 23:32:55 -07:00
Mark Otto
532ee08213 fixes #5150: add btn-group support to input groups 2012-09-20 11:37:34 -07:00
Mark Otto
443c43f6c4 fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8 2012-09-20 10:28:27 -07:00
Mark Otto
2d90c816ac add new vars for common border-radius, upping border-radius of inputs to 4px; add border-radius changes to -large, -small, -mini for buttons and paginations 2012-09-18 21:16:08 -07:00
Mark Otto
2769241aeb add new vars for common font-sizes and paddings with large, small, and mini components; resize pagination and buttons to better match each other 2012-09-18 20:56:20 -07:00
Mark Otto
37460e58d3 Merge branch '2.1.2-wip' of https://github.com/uberspeck/bootstrap into uberspeck-2.1.2-wip 2012-09-18 14:58:39 -07:00
Mark Otto
cedb3c7c56 fixes #5173: proper popover offsets; added docs examples to enable tests in the future 2012-09-17 23:03:32 -07:00
Mark Otto
783f4885ab add the media css to customizer 2012-09-17 18:17:22 -07:00
Mark Otto
26ca131a95 Merge branch 'wpbrains-media-component' into 2.1.2-wip 2012-09-17 18:15:44 -07:00
Mark Otto
143fef9f95 overhaul the docs and css to merge into 2.1.2 since this was against master 2012-09-17 18:15:39 -07:00
Mark Otto
caa79ed594 fixes #5001: proper ids on form examples 2012-09-17 16:26:51 -07:00
Mark Otto
6c4b276cd4 way cooler carousel example, along with updated screenshots for examples 2012-09-14 15:55:46 -07:00
Mark Otto
e4e2e37c5c add in some more examples (will work em in later), removed fleetio per their request, and added gather content to replace it 2012-09-14 14:48:03 -07:00
Mark Otto
5aa1018496 i18n homepage 2012-09-14 14:31:14 -07:00
Mark Otto
faa760f563 revert docs change 2012-09-14 10:30:55 -07:00
Martin Bean
2ead9a5bc3 Standardized spelling of 'JavaScript'; added icons to file trees 2012-09-14 14:06:15 +01:00
Mark Otto
595e1a189c fixes #5119: javascript in navbar typo 2012-09-13 10:07:57 -07:00
Mark Otto
e1deba30aa fixes #5097: js docs typos 2012-09-12 16:22:52 -07:00
Brian Campbell
2c8eff0eec Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs. 2012-09-12 14:10:03 -06:00
Mark Otto
39791a8ea8 fixes #5059 manually: include media type in css getting started block 2012-09-10 22:44:08 -07:00
Geoff Young
76e42edb29 Updated sample markup to reflect live demo. 2012-09-09 18:58:23 -04:00
Mark Otto
b53da4b6e7 commenting out stuff and adding grid test page 2012-09-07 22:46:35 -07:00
Mark Otto
9a39306abe nuke fluid grid docs again 2012-09-07 22:35:51 -07:00
Mark Otto
7e29581210 Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
2012-09-07 22:34:51 -07:00
Mark Otto
61332d727e fixes #5020: submenu support in dropup 2012-09-07 11:34:05 -07:00
Ramiro Morales
138b5a8c05 Fix small documentatio typos. 2012-09-05 23:07:52 -03:00
Mark Otto
08b8571cb8 version bump to get this started 2012-09-05 10:00:57 -07:00
Mark Otto
7e4629fbbe fixes #4968 manually: typo in scaffolding docs about offset classes 2012-09-04 14:27:48 -07:00
Mark Otto
1f0043a7f5 fixes #4959: docs example 2012-09-04 09:13:09 -07:00
Mark Otto
9d5f9eca85 fixes #4909: add color utility classes .text-warning, etc and document them 2012-09-03 00:47:48 -07:00
Mark Otto
209852c805 fixes #4902: proper accordion html example 2012-09-01 12:03:55 -07:00
Mark Otto
e8c5b3c9a5 fixes #4869: typo in getting started 2012-08-31 23:51:48 -07:00
Mark Otto
b1bdca0fdb fixes #4901: attribute typo and reran make 2012-08-31 23:25:58 -07:00
Mark Otto
00d6f26270 fixes #4896: reflect media query order in docs 2012-08-31 23:12:02 -07:00
Mark Otto
0b122bc5c5 remake the box-size grid, nuke fluid grid docs, fix up examples, clean up form styles 2012-08-28 13:33:06 -07:00
Alexandre Magno
b5a8c0a45e i18n tags missing in some strings at getting started download page 2012-08-27 23:54:07 -03:00
Mark Otto
303a33f15c fixes #4664: spelling mistake in alerts docs 2012-08-27 15:48:54 -07:00
Mark Otto
4674945fa8 fixes #4556: add mention of disable state and required js to buttons docs 2012-08-27 15:27:58 -07:00
Mark Otto
b444582ccd fixes #4671: mention collapsing parents in docs for affix plugin 2012-08-27 15:20:50 -07:00
Mark Otto
1c9d5c43b0 fixes #4640: pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links 2012-08-27 10:56:46 -07:00
Mark Otto
bdc3ff99f3 fixes #4749: correct initialism example 2012-08-27 09:18:32 -07:00
Mark Otto
72f176d1f5 fixes #4748: document jquery dependency better 2012-08-27 09:17:20 -07:00
Mark Otto
eb8aad85b8 fixes #4734 manually: doctype in getting started in examples 2012-08-26 22:29:40 -07:00
Mark Otto
f744ad57fc fixes #4676 manually: example html updated 2012-08-25 22:31:10 -07:00
Mark Otto
5cbb826961 Merge pull request #4560 from andriijas/2.1.1-wip-table-row-warning
.warning for table tr  and .info for .control-group
2012-08-23 09:47:44 -07:00
Mark Otto
5da217b96e fixed #4598, typo, manually 2012-08-22 20:23:58 -07:00
Mark Otto
535dfc2153 fixes #4561: typo 2012-08-22 09:51:41 -07:00
Mark Otto
6160667b19 fixes #4564 manually: typo in getting started jumbotron 2012-08-22 09:48:57 -07:00
Mark Otto
5f97e04aa3 fixes #4567: link in scaffolding page 2012-08-22 09:47:56 -07:00
Mark Otto
115c7b82c4 fixes #4586: typo in docs 2012-08-22 09:45:57 -07:00
Andreas Cederström
a9764c34a7 Add info state to form validation 2012-08-22 11:24:02 +02:00
Andreas Cederström
361889def9 Add .warning to table rows 2012-08-22 11:20:31 +02:00
Mark Otto
13199c0020 fixes #4530: fix docs nesting cols comments 2012-08-21 13:59:13 -07:00
Mark Otto
1c134d9a7f update version numbers to 2.1.1 2012-08-21 13:11:25 -07:00
Mark Otto
b52d29095a fixes #4520: manually fix example html for icon 2012-08-21 13:09:01 -07:00
Mark Otto
4f918ce52c fixes #4517 manually in mustache file as well, typo in docs 2012-08-21 13:08:09 -07:00
Mark Otto
099cec1ca7 fixes #4493: typo in dimiss alerts docs 2012-08-21 13:00:40 -07:00
Mark Otto
06c718b1d3 fixes #4480: typo in scaffolding page 2012-08-21 12:59:26 -07:00
Mark Otto
55facf1f2e fixes #4473: docs example typo for js affix plugin 2012-08-21 12:58:48 -07:00
Mark Otto
6477ad1acf fixes #4472: manually change mustache file as well for typo 2012-08-21 12:57:41 -07:00
Mark Otto
6cf3752b9b fix ie7 dropdowns examples in docs 2012-08-20 12:16:15 -07:00
Mark Otto
2fda6a45aa bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work 2012-08-20 11:22:37 -07:00
Mark Otto
afaee0ca13 reorder jumbotron links 2012-08-20 11:09:16 -07:00
Mark Otto
a667fd93ab pre font-size increase; revert static top navbar, undo contents section for now 2012-08-19 23:01:24 -07:00
Mark Otto
4e979f084d fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs 2012-08-19 21:12:52 -07:00
Mark Otto
e4d4ef43b0 copy change for previous commit 2012-08-19 20:38:27 -07:00
Mark Otto
e71e2b4be2 fixes #4460 and #4461: copy change for opera animations support 2012-08-19 20:38:16 -07:00
Mark Otto
887f11d47f fixes #4455: improve small styles and add to docs 2012-08-19 13:12:43 -07:00
Mark Otto
47cf3cc62f copy edits to base css page 2012-08-19 12:07:23 -07:00
Mark Otto
bb85bbc657 compy edits to docs 2012-08-19 12:04:41 -07:00
Mark Otto
7ed82c1223 font-size change on examples in getting started 2012-08-19 11:59:28 -07:00
Mark Otto
8e271d664b Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-19 11:54:05 -07:00
Mark Otto
c531a75ff0 fixes #4451 manually: add .fade to modal example in both mustache and html 2012-08-19 11:53:55 -07:00
Jacob Thornton
45dddc59a1 add click option for tooltip, popover - make click default for popover 2012-08-18 19:54:30 -07:00
Jacob Thornton
44e35e9dfa fix component 2012-08-18 19:33:46 -07:00
Jacob Thornton
937cfa6a88 add note about .nav 2012-08-18 19:32:50 -07:00
Mark Otto
4d2f584fdd fixes #4444: clarify docs copy that new icon white style is intentional on active and hover links in .nav and .dropdown-menu 2012-08-18 16:47:04 -07:00
Mark Otto
9ae137aede modifications to new content 2012-08-18 16:42:50 -07:00
Erik van der Kolk
dda951d1e1 Remove inexisting end tag </hr> 2012-08-18 21:52:43 +02:00
Erik van der Kolk
ae275dccb8 Fix empty for attribute on labels in Horizontal form 2012-08-18 21:44:57 +02:00
Erik van der Kolk
b7233a49dd Move code within code snippet as close to the left for Basic block 2012-08-18 19:51:57 +02:00
Erik van der Kolk
3f12c746e5 Replace Note: by Heads up! 2012-08-18 19:49:27 +02:00
Erik van der Kolk
2327d30ef5 Add code snippet to Icon examples => Form fields section 2012-08-18 19:40:42 +02:00
Erik van der Kolk
8b763286df Add code snippet to Icon examples => Navigation section 2012-08-18 19:31:29 +02:00
Erik van der Kolk
d71efb855b Separate Buttons examples in Icon examples section and add code snippets 2012-08-18 19:21:01 +02:00
Erik van der Kolk
97247a157c Improve description for Images section 2012-08-18 18:24:18 +02:00
Erik van der Kolk
d8eb75d6e8 Fix Heads up! part for Images section 2012-08-18 18:14:20 +02:00
Erik van der Kolk
f1854a3cec Move code within <pre> tags as close to the left for Images section 2012-08-18 16:53:43 +02:00
Erik van der Kolk
2ab0c8de1a Fix typo in One class, multiple tags section 2012-08-18 16:50:08 +02:00
Erik van der Kolk
04a20fb402 Use one line per tag in code snippet for One class, multiple tags 2012-08-18 16:47:15 +02:00
Erik van der Kolk
7b7a02542b Improve doc for block level buttons 2012-08-18 16:41:40 +02:00
Erik van der Kolk
41253fb073 Improve doc for Button sizes 2012-08-18 16:36:40 +02:00
Erik van der Kolk
a3c474c404 Move code within <pre> tags as close to the left for Input focus 2012-08-18 16:07:48 +02:00
Erik van der Kolk
f4f6783cc0 Add <input> into Help text code snippet as shown in example 2012-08-18 16:03:47 +02:00
Erik van der Kolk
263ed4e239 Add span5 from example into multiple grid inputs code snippet 2012-08-18 15:48:18 +02:00
Erik van der Kolk
f37d4b0918 Add missing placeholders and <select> in Grid sizing code snippet 2012-08-18 15:43:00 +02:00
Erik van der Kolk
01dadc05f4 Make Relative sizing code snippet the same as example 2012-08-18 15:31:11 +02:00
Erik van der Kolk
663fd4ff62 Make Extending form ... => Search form code snippet the same as example 2012-08-18 15:29:55 +02:00
Erik van der Kolk
a8b18b6f54 Fix typo 2012-08-18 14:54:32 +02:00
Erik van der Kolk
25f8ef3260 Add multiple="multiple" to Forms => Selects as described in explanation 2012-08-18 14:36:30 +02:00
Erik van der Kolk
c8b8d914b8 Make Forms => Textarea code snippet the same as example 2012-08-18 14:22:41 +02:00
Erik van der Kolk
7f5aa177f5 Make Forms => Default styles code snippet the same as example 2012-08-18 14:00:33 +02:00
Erik van der Kolk
0c24f51d2a Change .help-block tag for "Forms => Default styles" example into <span> 2012-08-18 13:56:02 +02:00