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

251 Commits

Author SHA1 Message Date
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
a12f0e551f overhaul docs on sub pages, clean up css and copy 2012-07-12 18:11:49 -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
8b696ad0b5 fix text in docs about default font-size and line-height 2012-07-09 00:14:35 -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
6d447079a4 update buttons in docs to include type 2012-07-06 15:18:56 -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
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
Mark Otto
7ed02b461b fix blockquote alignment 2012-06-11 20:20:51 -07:00
Mark Otto
4a907709ba redo icons section 2012-06-09 23:26:46 -07:00
Mark Otto
5ef2b6561a realign icons to five cols, fix buttons 2012-06-09 22:47:45 -07:00
Mark Otto
fc2481b8e5 fix form display issue in docs 2012-06-09 19:26:06 -07:00
Mark Otto
c65006601e overhaul forms docs to simplify presentation of everything, reduce text, and increase visibility of examples 2012-06-09 19:15:46 -07:00
Mark Otto
ca63ea2f26 overhaul tables docs for more streamlined content 2012-06-09 13:15:28 -07:00
Mark Otto
aff3694f28 remove mention of prettify from docs, fix docs subnav width when fixed 2012-06-09 12:58:55 -07:00
Mark Otto
bba0b34c36 restore top navs entirely 2012-06-07 22:10:36 -07:00
Mark Otto
a1aa2b188a more content changes to docs 2012-06-07 10:20:52 -07:00
Mark Otto
2ecbd36cbf add back left rail nav, tweak colors 2012-06-06 00:48:31 -07:00
Mark Otto
10d68406fe examples-wrap tables 2012-06-05 23:59:50 -07:00
Mark Otto
2c5ac562d2 updated type section of base css 2012-06-05 20:47:40 -07:00
Mark Otto
8ee0679522 updated javascripts for first pass at single column 2012-06-05 18:25:46 -07:00
Mark Otto
22918f8f92 more tweaks to layouts and some docs styles 2012-06-05 17:16:17 -07:00
Mark Otto
257890f839 finish off rest of base-css page 2012-06-04 23:03:21 -07:00
Mark Otto
060100cf3a update table section to single column 2012-06-04 21:13:35 -07:00
Mark Otto
094e12f68d convert code section to new layout 2012-06-04 21:10:08 -07:00
Mark Otto
c44bd1edf4 revamp docs to have new width, start realigning the base css page to match 2012-06-04 21:08:31 -07:00
Mark Otto
b79c100967 add placeholder to input-prepend to confirm FF placeholder looks good 2012-06-04 18:44:50 -07:00
Mark Otto
33061a8e0b document .lead per #3213 2012-05-14 22:02:51 -07:00
Mark Otto
6a89659727 #3468: 140 icons, not 120 2012-05-13 13:59:20 -07:00
Mark Otto
ef368f0076 #3263: typo in forms docs 2012-04-30 15:43:47 -07:00
Mark Otto
192cb575da fix typo 2012-04-22 23:56:36 -07:00
Mark Otto
dbde2dc9e4 adding icon classes to finish off glyphicons 1.6 update 2012-04-14 17:15:16 -07:00
Mark Otto
a20cd66ba4 clean up new input append examples 2012-04-07 16:49:06 -07:00
Mark Otto
3ecf109835 fix conflicts, add docs example for two buttons on an append 2012-04-07 16:44:03 -07:00
Mark Otto
d652af1097 fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts 2012-03-31 23:53:54 -07:00
Mark Otto
a9f9949b3e rearrange other parts of forms docs 2012-03-28 19:41:23 -07:00
Mark Otto
d6680a50b9 start rearranging form docs and clear up messaging about required classes and default styles 2012-03-28 18:00:05 -07:00
Mark Otto
369ca13c75 fix homepage link in css-tests and remove second help text from example form 2012-03-28 17:52:03 -07:00
Mark Otto
b7b84c7a0d remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append 2012-03-22 17:36:32 -07:00
Mark Otto
40fddffeec improve button docs 2012-03-12 09:38:12 -07:00
Mark Otto
c35b04cccd enable buttons in input-append and input-prepend 2012-03-11 23:43:19 -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
4109c62cf7 fix table border bug with double borders on theads and use of colgroup 2012-03-11 18:18:18 -07: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
Dominic Barnes
0b78033f0b removing a few of the size classes, changing up the documentation 2012-02-27 23:21:25 -06: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
Dominic Barnes
0a8efd5320 Adding a 'horizontal' option to description lists, similar to .form-horizontal 2012-02-25 21:21:05 -06:00
Mark Otto
4309153051 add version to docs homepage, fix docs example for forms 2012-02-24 21:02:24 -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
664a5c4438 update forms help-block 2012-02-21 13:43:13 -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
Jacob Rask
f28140897e Update documentation for abbreviations 2012-02-19 22:14:18 +01:00
Jacob Thornton
7ec09d0db9 2.0.1 2012-02-16 22:42:38 -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
be6fdd9a62 add docs for alt form control sizing per #1700 2012-02-12 20:10:48 -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
2eedf60d62 write out icon classes explicitly to enable find via browser 2012-02-11 22:34:41 -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
a84092d225 update buttons docs for .disabled class per #1774 2012-02-11 17:25:47 -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
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
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
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
Simon
451a642ae8 Added a black/dark button 2012-02-09 23:08:14 +01: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
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
Chris Rebert
98cffdbf46 parallel fix to mustache template 2012-02-05 23:02:16 -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
ac98cee609 allow alternate form layouts to hide inputs with .hide on them 2012-02-04 18:26:04 -08:00
Mark Otto
9ab843b936 add mention of classes to use for button sizes 2012-02-02 09:57:22 -08:00
Mark Otto
ab4345332d Merge branch 'shama-master' into 2.0.1-wip 2012-02-02 09:38:21 -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
1ec6628e80 add note for icon class usage per #1501 2012-02-01 23:10:00 -08:00
Mark Otto
c1f0da7cce Merge branch 'master' of github.com:twitter/bootstrap 2012-02-01 22:13:26 -08:00
Mark Otto
f34ddb5c3f nuke all curly ticks 2012-02-01 18:27:38 -08:00
Abhijit Menon-Sen
140d90db63 Typo fix 2012-02-01 13:21:37 +05:30
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
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
b7713b83fa chance icon class 2012-01-31 00:11:19 -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
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
2d40b07afc adding warning (orange) button, fix responsive navbar problem 2012-01-30 08:15:28 -08:00
Mark Otto
175fd98a7c fix forms typo on error state 2012-01-30 01:25:02 -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
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
Mark Otto
8c763589a2 update text on icons note 2012-01-29 13:09:10 -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
4fa931e403 fix the navbar click and a few jank responsive problems 2012-01-28 18:11:31 -08:00
Mark Otto
2bfda031ce darken buttons, uncomment out firefox keyframes from progress bars 2012-01-28 12:43:19 -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
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
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
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
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
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
b1f38bbea8 update icon examples to show icons in differently sized buttons 2012-01-27 13:39:19 -08:00
Pete Hopkins
7b31f4a334 Brings back uneditable input 2012-01-27 16:09:58 -05: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
Mark Otto
af96da6e89 adding white sprites 2012-01-26 16:27:37 -08:00
Mark Otto
b260544de0 fix links to apple touch icons 2012-01-26 15:54:04 -08:00
Mark Otto
edef89f30e move around some comments in buttons.less, update labels to use correct variables, add snippet to docs about IE9 2012-01-26 11:10:07 -08:00
Mark Otto
0ef4b6419f overhaul frontpage jumbotron, add js for twitter buttons back in, fix up some form ids and classes, straighten out the use of primary button variable 2012-01-26 10:00:09 -08:00
Mark Otto
94ea3b62f0 fix forms examples and allow for inputs in labels 2012-01-25 21:28:24 -08:00
Mark Otto
4ea63e5261 finish off the static stuff for build and download page 2012-01-25 13:33:55 -08:00
Mark Otto
9c4a70c597 swap fieldsets for divs 2012-01-25 12:43:38 -08:00
Mark Otto
58d08a2db3 enable support for form states on select elements 2012-01-25 11:35:08 -08:00
Mark Otto
b851156863 change form fields back to inline-block to allow for inline-help text in default form markup 2012-01-25 11:26:45 -08:00
Mark Otto
e49e49ff95 fix mention of old vertical forms class' 2012-01-25 10:51:26 -08:00
Mark Otto
97bad784b5 update remaining icons in docs 2012-01-25 10:50:08 -08:00
Mark Otto
b01de5fc56 updated icons to require a base class .icon 2012-01-25 09:51:03 -08:00
Mark Otto
b8fa6cfacf move css builder and downloader to dedicated page, start to update remaining sections on LESS docs page 2012-01-25 01:22:29 -08:00
Mark Otto
6ab56051fd fix up docs css for responsive and subnav, fix forms error states 2012-01-24 23:35:34 -08:00
Mark Otto
bacb05608f redo the form examples to enable better responsive layout 2012-01-24 19:43:52 -08:00
Mark Otto
672ba4c2fd update the subnav on all pages 2012-01-24 19:19:50 -08:00
Mark Otto
b9bd5c65e7 fix mailto link 2012-01-24 16:18:12 -08:00
Gaëtan Muller
425e5bfb71 Final translation tags in Base CSS 2012-01-24 22:17:32 +01:00
Gaëtan Muller
a9c6dca094 More translation tags in Base CSS 2012-01-24 21:45:42 +01:00
Gaëtan Muller
bc9c89f157 Start adding tag for Base CSS translation 2012-01-24 21:29:55 +01:00
Jacob Thornton
b4b1ef6839 rebuild with new templates 2012-01-23 15:17:32 -08:00