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

387 Commits

Author SHA1 Message Date
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
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
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
Mark Otto
532ee08213 fixes #5150: add btn-group support to input groups 2012-09-20 11:37:34 -07:00
Mark Otto
caa79ed594 fixes #5001: proper ids on form examples 2012-09-17 16:26:51 -07:00
Mark Otto
595e1a189c fixes #5119: javascript in navbar typo 2012-09-13 10:07:57 -07:00
Mark Otto
b53da4b6e7 commenting out stuff and adding grid test page 2012-09-07 22:46:35 -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
b1bdca0fdb fixes #4901: attribute typo and reran make 2012-08-31 23:25:58 -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
bdc3ff99f3 fixes #4749: correct initialism example 2012-08-27 09:18:32 -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
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
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
6477ad1acf fixes #4472: manually change mustache file as well for typo 2012-08-21 12:57:41 -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
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
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
Erik van der Kolk
05571db109 Add <caption> to Supported table markup example 2012-08-18 13:40:37 +02:00
Mark Otto
5b947b8a2f fix up padding on small buttons, add button examples 2012-08-17 16:11:52 -07:00
tobz
48f5626499 Fixed spelling error in forms documentation. 2012-08-15 11:07:43 -03:00
Jacob Thornton
ae9a2bd93a Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-08-14 21:06:39 -07:00
Jacob Thornton
dee57462e2 get affix actually working and update docs 2012-08-14 21:06:08 -07:00
Mark Otto
f3479a3953 compensate for ie7 button padding with no borders, fix indentation 2012-08-14 15:44:25 -07:00
Mark Otto
c2e899f2a0 remove the canvas slider doodad 2012-08-01 19:00:25 -07:00
Mark Otto
7aaf141371 add compability note to image styles 2012-08-01 16:57:27 -07:00
Mark Otto
31b30ab88e copy edits to docs 2012-07-31 00:06:37 -07:00
Mark Otto
9795e9bbe6 place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav 2012-07-30 23:48:26 -07:00
Mark Otto
a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -07:00
Mark Otto
fe6a4b0b54 add .btn-block for a full-width button option 2012-07-27 15:42:58 -07:00
Mark Otto
1e9b450619 add image styles, for now to scaffolding (soon to own file) 2012-07-27 00:06:43 -07:00
Mark Otto
b7b4fd5c82 wrap footer in bs docs canvas for scrolling doodad 2012-07-24 01:53:32 -07:00
Jacob Thornton
e38fa4b1f4 fix scroll thinggg 2012-07-24 00:30:58 -07:00
Mark Otto
f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
2012-07-23 23:01:38 -07:00
Mark Otto
0dda2c4659 make docs scroll over jumbotrons, but only for 980px up 2012-07-23 22:36:08 -07:00
Jacob Thornton
dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
Mark Otto
b9105b98f9 move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons 2012-07-20 22:06:47 -07:00
Mark Otto
aac3736eea fixes #3845: add .btn-link for transparent buttons styled as links 2012-07-17 23:32:52 -07:00
Mark Otto
cb1a59caa0 Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip
Conflicts:
	docs/base-css.html
	docs/templates/pages/base-css.mustache
2012-07-17 23:14:58 -07:00
Mark Otto
e20d2dfe9d docs cleanup and blockquote cleanup for .pull-right option 2012-07-15 16:13:25 -07:00
Mark Otto
463de252a9 update static assets section of extend page, copy changes elsewhere 2012-07-13 14:20:25 -07:00
Mark Otto
9343e1e933 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:38:18 -07:00
Mark Otto
a12f0e551f overhaul docs on sub pages, clean up css and copy 2012-07-12 18:11:49 -07:00
Mark Otto
549d61fc28 updated footer 2012-07-12 17:02:55 -07:00
Mark Otto
3c775f2432 add chevrons to other docs navs 2012-07-12 16:23:21 -07:00
Mark Otto
5d8e78e0fa fixes #3605: add support for input-prepend/-append to .form-search 2012-07-10 00:32:30 -07:00
Mark Otto
3ea309568f fix indenting and remove hidden subnav on Base CSS docs 2012-07-09 22:34:33 -07:00
Mark Otto
93be608bf0 fixes #3384: add support for multiple inputs per line when using grid sizing 2012-07-09 20:49:17 -07:00
Mark Otto
410decafad indenting 2012-07-09 00:17:52 -07:00
Mark Otto
16cf6b30cd docs changes for icons 2012-07-09 00:17:36 -07:00
Mark Otto
20676ddd4d adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar 2012-07-08 01:47:36 -07:00
Mark Otto
5f861ef517 fix up docs to use default container, fix responsive home changes 2012-07-07 23:16:07 -07:00
Mark Otto
7cc916d137 Merge branch '21jumpst' into 2.1.0-wip 2012-07-07 00:48:15 -07:00
Mark Otto
6d447079a4 update buttons in docs to include type 2012-07-06 15:18:56 -07:00
Mark Otto
3c07eaa251 updates to type scale 2012-07-05 15:11:54 -07:00
Gavin Cooper (work)
b4125748b0 added ability to give rows in tables status classes .success .error and .info. 2012-07-04 12:22:34 +01:00
Mark Otto
c09e8473e2 use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta 2012-06-28 10:03:46 -07:00
Mark Otto
a683497dbc renamed less.html to extend.html, removing all the vars and mixins 2012-06-27 23:56:00 -07:00
Mark Otto
27845e4492 #3223: make table row hover optional class 2012-06-25 14:11:37 -07:00
Mark Otto
6662f62236 remove subnav file, instead add an optional class for .navbar 2012-06-24 21:03:39 -07:00
Mark Otto
71669dda63 tons of docs cleanup in css, adding subnav to official components 2012-06-24 20:26:48 -07:00
Mark Otto
b1cb556503 improve inline-block of append/prepend inputs with font-size: 0; 2012-06-14 11:56:46 -07:00
Mark Otto
3ead14a1e0 clarify support of select items (which is none) for input-prepend/append 2012-06-13 22:00:10 -07:00