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

353 Commits

Author SHA1 Message Date
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
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
Jacob Thornton
e1deb4e767 fix makefile to reset zips 2012-02-01 22:27:46 -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
Mark Otto
e36496fd84 Merge pull request #1490 from amenonsen/master
Typo fix: Sprited => Striped
2012-02-01 17:59:19 -08:00
Jacob Thornton
59016d2198 only add the anyalytics to production 2012-02-01 16:38:58 -08:00
Abhijit Menon-Sen
140d90db63 Typo fix 2012-02-01 13:21:37 +05:30
Jacob Thornton
390a9af936 move js stuff into assets 2012-01-31 13:58:28 -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
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
8f448610a9 rename vertical-divider to divider-vertical, add more space around the divider 2012-01-30 01:09:34 -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
702d3b6dfe fix broken navbar collapse 2012-01-29 16:35:55 -08:00
Mark Otto
9e7f5025b4 update collapsible nav in navbar 2012-01-29 14:07:58 -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
Jacob Thornton
b8a683d7f2 turn off brand hover for now + get nav toggling in mobile 2012-01-28 15:42:07 -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
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
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
6fd1e9f4c0 rebuil update layout 2012-01-27 13:36:31 -08:00
Mark Otto
e8647c1b11 huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff 2012-01-27 13:20:02 -08: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
ed64276e5b move doc building into base make method + build bootstrap to doc assets 2012-01-26 22:05:45 -08: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
e24bd40b4a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-25 11:27:29 -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
Jacob Thornton
25519bacd5 rebuild + add spy to template 2012-01-25 11:25:35 -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
1fa3eab20c fix location of favicon 2012-01-25 10:19:29 -08:00
Mark Otto
9553b1e3e9 update docs to include separate responsive css, update docs to highlight proper file name, updated makefile to build responsive separately 2012-01-25 10:02:52 -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
a5c1d1f182 adding actual images to carousel to ensure you can see things are animating; updated styles of carousel controls to work on light and dark backgrounds and use opacity for effects 2012-01-24 20:45:38 -08:00
Mark Otto
8ce9b3a676 Merge pull request #1175 from Xaro/2.0-wip
Typo in pre type section
2012-01-24 20:16:33 -08:00
Roberto Poo
74b5dc8d3b Fixed typo 2012-01-25 02:06:50 -02: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
Jacob Thornton
3aea86370d rebuild base-css 2012-01-24 13:48:05 -08:00
Jacob Thornton
7d52e1dcd4 remake 2012-01-24 13:47:24 -08:00
Mark Otto
72861dfbf2 Merge branch 'apostrophe-grammar' of https://github.com/phopkins/bootstrap into phopkins-apostrophe-grammar 2012-01-24 10:45:51 -08:00
Pete Hopkins
91b32f4783 Fixes apostrophe usage in base-css.html 2012-01-24 12:12:35 -05:00
Jacob Thornton
82de03b67c start wrapping text in {{_i}} for translation 2012-01-23 19:55:00 -08:00
Jacob Thornton
b4b1ef6839 rebuild with new templates 2012-01-23 15:17:32 -08:00
Jacob Thornton
74521e8354 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
2012-01-23 15:06:56 -08:00
Jacob Thornton
f764aee4b9 add templates for doc generation 2012-01-23 14:14:16 -08:00
Mark Otto
a7bf0295fb remove dropdowns, add in sub nav instead 2012-01-23 11:55:04 -08:00
Jacob Thornton
155b72e873 share -> share-alt 2012-01-22 20:02:56 -08:00
Mark Otto
47b8184bbb scope table styles to a class, .table, instead of on the generic element as a smarter default 2012-01-17 23:39:18 -08:00
Mark Otto
41a410b8e6 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	bootstrap.min.css
	docs/javascript.html
	lib/accordion.less
2012-01-17 23:19:21 -08:00
Mark Otto
f1a88eede3 fix js link in docs nav, restyle accordion with new css 2012-01-16 17:27:30 -08:00
Jon Stevens
b4dd2b9a10 fix typo 2012-01-15 19:38:30 -08:00
Mark Otto
dab6d2b17c change up classes on tables and forms, fix nav list styles in example 2012-01-14 21:28:47 -08:00
Mark Otto
74c0fc17c8 fix duplicate icons 2012-01-14 16:56:47 -08:00
Chris Gunther
ec7f8917b1 add Progress Bars to Components narbar dropdown 2012-01-14 15:24:35 -05:00
Chris Gunther
f82fb2a197 fix navbar links to base CSS > typography 2012-01-14 15:18:59 -05:00
Chris Gunther
a4b107bf87 fix navbar links to scaffolding > grid system 2012-01-14 15:15:24 -05:00
Purwandi
7b321e9c1f Remove sidebar with icon from my own repo 2012-01-13 15:03:23 +07:00
Purwandi
2623f325ec Merge branch '2.0-wip' of github.com:purwandi/bootstrap into 2.0-wip 2012-01-13 14:58:13 +07:00
Purwandi
11be9cd163 Fix id anchor javascript 2012-01-13 14:57:21 +07:00
Mark Otto
391248c0e3 nuke uber footer, bring back topbar dropdowns 2012-01-12 15:29:16 -08:00
Mark Otto
83c0896999 updated js pages to put examples first 2012-01-08 21:48:07 -08:00
Purwandi
b14426c176 Added example sidebar navigation with icon in docs 2012-01-08 17:44:19 +07:00
Mark Otto
28420311d8 more table docs cleanup 2012-01-07 13:40:05 -08:00
Mark Otto
a339f0051b fixing tablesorter styles by adding the jquery plugin back to the lib, fixing the docs examples 2012-01-07 12:22:51 -08:00
Mark Otto
8ccc3bcf03 overhauled dropdowns now require use of .caret for dropdown arrow, redid the button group docs section, added the split button dropdown docs section 2012-01-07 03:45:24 -08:00
Mark Otto
45d671d97f tweak spacing once more on prettify; add support for uneditable inputs to input-append and prepend 2012-01-07 01:22:52 -08:00
Mark Otto
d6a1402f2a update form shadows and tweak prettyprint styles 2012-01-07 01:03:26 -08:00
Mark Otto
bcf1136f2c fix form field sizing for selects, document form field grid sizing 2012-01-07 00:47:53 -08:00
Mark Otto
36e7660383 fix forms in navbars, fix examples' navbars 2012-01-07 00:26:58 -08:00
Mark Otto
cfc2353059 front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates 2012-01-06 23:59:22 -08:00
Mark Otto
5cb76037ae fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar 2012-01-05 23:24:19 -08:00
Mark Otto
7582520808 docs cleanup and navbar brand hover 2012-01-05 22:37:23 -08:00
Mark Otto
c56e9d2d35 massive docs update, mostly to all our new forms, and to the buttons 2012-01-05 21:43:28 -08:00
Mark Otto
621dd13d87 move mega link footer to scaffolding to try it out, fix broken button text shadow, change UL/OL margins back, make li color same as body 2012-01-05 15:43:07 -08:00
Mark Otto
23e5fc2133 Tweak the docs and address the new forms list of controls: radios and checkboxes are now hanging controls to wrap text properly 2012-01-05 14:11:41 -08:00
Mark Otto
20add59de3 breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs 2012-01-05 10:01:42 -08:00
Mark Otto
a13ab64870 add a quick little example of icons in buttons 2012-01-05 01:36:05 -08:00
Mark Otto
fb9401b355 tweaks abound, updated prettify styles, new sidenav component started, sprite icons started 2012-01-05 01:34:14 -08:00
Mark Otto
53c6dbff0d add appended input example to docs, fix help-text wrapping issue by clearing float 2011-12-27 17:04:55 -06:00
Mark Otto
e78d5f8ff3 fix tables for rowspan 2011-12-27 16:25:22 -06:00
Mark Otto
fec02f5045 clean up some css for github issues: input prepend z-index, modals revamped for responsive 2011-12-27 15:40:58 -06:00
Jacob Thornton
49fb910b11 more js cleanup after gnarly merge 2011-12-22 19:25:29 -08:00
Jacob Thornton
35fdbad24b Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	docs/assets/js/application.js
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
	docs/upgrading.html
2011-12-22 19:15:09 -08:00
Jacob Thornton
efacac0d6c clean up all the js across all the doc pages 2011-12-21 18:42:43 -08:00
Mark Otto
20aecb9838 updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file 2011-12-21 16:22:20 -06:00
Mark Otto
8a7abc7493 docs updates, forms updated to include error states and more examples, remove text-shadow from gradientbar mixin to fix bug 2011-12-21 16:00:50 -06:00
Mark Otto
4e8c26d409 updated buttons docs 2011-12-11 02:38:58 -08:00
Mark Otto
ecbc9ec4a2 updated footers everywhere 2011-12-11 02:03:16 -08:00
Mark Otto
e240aac6cb Merge pull request #777 from ceejayoz/2.0-wip
Updated bordered-table example to use correct class in docs
2011-12-10 15:05:09 -08:00
Mark Otto
97b285896f help tables not look like shit on mobile maybe? also fix bordered table example 2011-12-09 12:51:54 -08:00
Mark Otto
7b810bf9a6 update js in footer, add max-width to img 2011-12-09 12:10:01 -08:00
Mark Otto
1d1805ee5c add jank js for prototyping new topbar to all docs pages 2011-12-09 11:41:00 -08:00
Chris Sternal-Johnson
e603009fca fix docs for bordered-table 2011-12-08 14:42:42 -05:00
Mark Otto
447c9322e9 update all leads on docs pages 2011-11-29 23:56:01 -08:00
Mark Otto
90c190d4ef updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks 2011-11-29 23:48:27 -08:00
Mark Otto
0c8d2e37e7 adding bordered table to docs and showing it works with colspan 2011-11-29 23:16:38 -08:00
Mark Otto
cbb291b8ab Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	bootstrap.min.css
2011-11-29 22:35:58 -08:00
Mark Otto
b36df46310 misc docs updates, revamped tables CSS save for grid columns and tablesorter options 2011-11-29 22:35:03 -08:00
Jacob Thornton
bc65b58551 merge in js from 1.4... start working through js docs 2011-11-20 20:58:04 -08:00
Mark Otto
5abb4b3200 update tables docs after merging in the condensed styles 2011-11-17 00:09:12 -08:00
Mark Otto
b1ce89c24a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-11-17 00:07:34 -08:00
Mark Otto
a8e88d14a4 make form classes match table classes (readable left to right), update docs associated with it 2011-11-17 00:06:16 -08:00
Mark Otto
a017932285 start breaking down patterns.less into more distinct files, update docs for forms to use correct classes 2011-11-16 23:58:36 -08:00
Jon Stevens
275da020c2 added condensed example 2011-11-16 11:10:27 -08:00
Raul Riera
0e6cd670ca Removed trailing backslash :) 2011-11-08 20:32:28 +01:00
Raul Riera
74dc83f211 Added the view port meta tag for proper responsiveness 2011-11-07 10:22:28 +01:00
Mark Otto
27b8e5e4fc small docs tweak 2011-10-31 21:24:57 -07:00
Mark Otto
02bf27592c overhaul the table styles and update those everywhere in the docs, update the button docs, spec out the forms docs 2011-10-31 19:37:10 -07:00
Mark Otto
ba597ef845 updating table documentation, jumping to dev to bring over new table styles from there 2011-10-31 16:32:13 -07:00
Mark Otto
3f512adf95 updated docs and type styles for blockquotes and a few fixes for type 2011-10-30 20:14:27 -07:00
Mark Otto
b4c894961c address issue #414 and fix up a number of docs loose ends 2011-10-26 23:24:22 -07:00
Mark Otto
648c468927 breaking down the main page into subpages for easier, more comprehensive documentation 2011-10-26 23:11:56 -07:00