0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

3396 Commits

Author SHA1 Message Date
Mark Otto
c5103d0ad1 Merge pull request #1181 from jwieland/updatelessdoc
Minor doc changes about less.js version
2012-01-25 00:41:05 -08:00
Jason Wieland
64f85e0371 caught another old reference to 1.1.3 2012-01-25 00:02:37 -08:00
Mark Otto
b0fb31be5e fix js link on chop shop 2012-01-24 23:45:48 -08:00
Mark Otto
ae70d2a8b6 refine spacing on fixed subnav 2012-01-24 23:44:59 -08:00
Mark Otto
e555f38ae4 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/less.html
2012-01-24 23:36:39 -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
Jason Wieland
6be91368c0 minor doc updates to inform user they need the current less.js 1.2.1 or they will be hit by this bug #952 2012-01-24 23:24:46 -08:00
Jacob Thornton
5d3175e84b fix sub navs fer the otherrzz 2012-01-24 22:48:30 -08:00
Jacob Thornton
5a54a98925 subnav spy scrolls blaawerh 2012-01-24 22:37:35 -08:00
Jacob Thornton
5e5e87fbd0 scrollspy working for sub navs 2012-01-24 22:33:33 -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
aa59f123c0 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 20:30:39 -08:00
Mark Otto
731821b78f updated docs css to fix subnav on iOS 2012-01-24 20:26:54 -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
c6d5dcd872 remove link from transitions on js page 2012-01-24 19:50:18 -08:00
Mark Otto
bacb05608f redo the form examples to enable better responsive layout 2012-01-24 19:43:52 -08:00
Mark Otto
4a6d9106b8 fix the thumbnails more examples section 2012-01-24 19:36:42 -08:00
Mark Otto
672ba4c2fd update the subnav on all pages 2012-01-24 19:19:50 -08:00
Mark Otto
f70895a605 remove rogue html elements 2012-01-24 19:01:38 -08:00
Mark Otto
8804860898 fix typo on js docs 2012-01-24 18:45:23 -08:00
Mark Otto
d362223535 refine fixed docs bar 2012-01-24 18:29:17 -08:00
Mark Otto
9ef4171d03 lighten alert on less page 2012-01-24 18:26:45 -08:00
Mark Otto
26ed8202ee modify the scaffolding page to fix the language around preboot/grid variables 2012-01-24 18:24:38 -08:00
Mark Otto
4793a6f8fa Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 17:14:34 -08:00
Mark Otto
805a965f2e finish updating form state and alert variables in less docs page 2012-01-24 17:14:19 -08:00
Jacob Thornton
a40d4993ed make subnav fix 2012-01-24 17:13:02 -08:00
Mark Otto
40e92221a6 revamp alert message and error state color/text/bg to be variables 2012-01-24 16:54:35 -08:00
Mark Otto
b9bd5c65e7 fix mailto link 2012-01-24 16:18:12 -08:00
Mark Otto
7e6797880a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/index.html
	docs/templates/pages/index.mustache
2012-01-24 16:09:32 -08:00
Mark Otto
03d2128f50 Merge pull request #1149 from Calvein/2.0-wip
[base-css] Fixed a nasty "mailto" typo and added jquery.tablesorter
2012-01-24 16:08:09 -08:00
Mark Otto
8ff621aa26 fix broken index page heading, update variables and less pages 2012-01-24 16:07:30 -08:00
Jacob Thornton
655a96869c typo with i18n 2012-01-24 15:51:28 -08:00
Jacob Thornton
3a840075dd rebuild 2012-01-24 15:42:16 -08:00
Jacob Thornton
4c5497bfcc Merge pull request #1158 from pokonski/wrap-stuff
Wrap stuff in components.mustache
2012-01-24 15:03:30 -08:00
Piotrek Okoński
ef869776e5 Wrap stuff in components.mustache 2012-01-25 00:00:35 +01:00
Jacob Thornton
5f209ed810 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/templates/pages/index.mustache
2012-01-24 14:33:52 -08:00
Jacob Thornton
fbc1ab14cc Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip
Conflicts:
	docs/templates/pages/index.mustache
2012-01-24 14:31:10 -08:00
Mark Otto
58f7fd308a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/templates/pages/index.mustache
2012-01-24 14:28:14 -08:00
Mark Otto
fecd4ddd13 docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark 2012-01-24 14:25:30 -08:00
Gaëtan Muller
fea1dc906e i18n for index page 2012-01-24 23:23:43 +01:00
Jacob Thornton
a800d6ceac i18n index 2012-01-24 14:22:02 -08:00
Jacob Thornton
f4543ecb19 add i18n to upgrading 2012-01-24 14:14:01 -08:00
Jacob Thornton
f03e170054 scaffolding i18n 2012-01-24 14:08:03 -08:00
Jacob Thornton
72117c3f97 add i18n for less.mustache 2012-01-24 13:57:44 -08:00
Jacob Thornton
3aea86370d rebuild base-css 2012-01-24 13:48:05 -08:00
Jacob Thornton
9e7f4ebd77 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-24 13:47:41 -08:00
Jacob Thornton
7d52e1dcd4 remake 2012-01-24 13:47:24 -08:00
Jacob Thornton
b0a351d8f7 Merge pull request #1153 from MGaetan89/2.0-wip
#1122 - i18n in Base CSS documentation
2012-01-24 13:43:13 -08:00
Gaëtan Muller
425e5bfb71 Final translation tags in Base CSS 2012-01-24 22:17:32 +01:00
François Robichet
5fb31670af Added jquery.tablesorter js file 2012-01-24 22:12:37 +01:00
François Robichet
925fef4110 Typo on tablesorter 2012-01-24 22:11:09 +01:00
François Robichet
540d229eba Fixed a mailto typo 2012-01-24 21:57:30 +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
b5503c4c28 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-24 12:11:26 -08:00
Jacob Thornton
222067b360 javascript pages markedup with {{_i}} 2012-01-24 12:11:05 -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
04efc8d0a8 Fixes apostrophe in less.html 2012-01-24 12:52:06 -05:00
Pete Hopkins
37b38fe2a0 Spelling and typos in components.html and javascript.html 2012-01-24 12:49:30 -05:00
Pete Hopkins
91b32f4783 Fixes apostrophe usage in base-css.html 2012-01-24 12:12:35 -05:00
Christian Nennemann
774d8d8d17 Fix typo in docs/index.html 2012-01-24 14:46:44 +01:00
Jacob Thornton
16440eea92 move translation tag for bootstrap 2012-01-23 19:59:05 -08: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
1954cf0019 comment in forms' 2012-01-23 13:46:26 -08:00
Mark Otto
ea8f5883fd clean up subnav aesthetics 2012-01-23 12:04:48 -08:00
Mark Otto
a7bf0295fb remove dropdowns, add in sub nav instead 2012-01-23 11:55:04 -08:00
Jacob Thornton
dc5bedda14 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-22 20:03:17 -08:00
Jacob Thornton
155b72e873 share -> share-alt 2012-01-22 20:02:56 -08:00
Jacob Thornton
87c676335c Merge pull request #1053 from scottwater/patch-1
Added missing 'data-dismiss="modal"' on the first example model source.
2012-01-22 19:38:48 -08:00
Olivier Laviale
0523c053a7 Fixed typo 2012-01-22 21:45:20 +01:00
Chris Gunther
c3625ebb23 Move placement of ID in docs example for dropdowns
The ID specified by an href or data-target attribute should match the
li.dropdown, not the ul.dropdown-menu
2012-01-22 11:46:44 -05:00
Jacob Thornton
373a54187e add ability to cycle carousel to a particular frame 2012-01-21 23:02:29 -08:00
Jacob Thornton
d3817cf466 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-21 21:35:53 -08:00
Jacob Thornton
2187e0838f change scrollspy offset to be option + fix typo in scrollspy 2012-01-21 21:35:20 -08:00
Burak Tuyan
4a5867b18b Optimizing all PNG files, saving 60.02 KB in total without any quality lost. (Using PNGOUTWin 1.5.0.100, Xtreme strategy in compability mode) 2012-01-21 23:52:39 +02:00
Jacob Thornton
7444310c4d only prevent default of links in sections 2012-01-20 20:05:16 -08:00
Scott Watermasysk
9c94078415 Added missing 'data-dismiss="modal"' on the first example model source. 2012-01-18 14:53:59 -05:00
Mark Otto
8c1a908754 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-17 23:39:28 -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
51f5b7b8af cleanup accordion css and add comments 2012-01-17 23:24:59 -08:00
Mark Otto
4f12627604 Merge pull request #1042 from boberkfell/2.0-wip
2.0 wip Small typo fix in docs
2012-01-17 23:21:52 -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
Ben Oberkfell
4d098a7f8e typo fix in component docs 2012-01-18 00:37:24 -06:00
Mark Otto
f1a88eede3 fix js link in docs nav, restyle accordion with new css 2012-01-16 17:27:30 -08:00
Jacob Thornton
810bba97a4 make accordions little bit smoother 2012-01-15 21:48:58 -08:00
Jon Stevens
b4dd2b9a10 fix typo 2012-01-15 19:38:30 -08:00
Mark Otto
f48278dac6 updated accordion and carousel; accordion still needs work 2012-01-15 18:40:17 -08:00
Mark Otto
c02501e1b7 move carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination, fix alerts 2012-01-15 16:27:36 -08:00
Mark Otto
3d9298b04b fix the js alerts examples 2012-01-15 15:06:30 -08:00
Mark Otto
127c0d0b52 make dl and child elements less specific 2012-01-15 13:12:29 -08:00
Mark Otto
fe160261e4 normalize the alert classes to match last night's flip for form and table classes 2012-01-15 11:30:24 -08:00
Mark Otto
1385540d0a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-15 11:26:21 -08:00
Mark Otto
8ceea1f559 fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code 2012-01-15 11:26:06 -08:00
Paul Kauders
ed9903f797 Fix typo in Responsive design content 2012-01-15 07:46:25 -06: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
6d916763f8 adding the pager component after rewriting the pagination docs and css 2012-01-14 20:54:37 -08:00
Mark Otto
1c6048bac2 restore top bar on home page 2012-01-14 19:17:48 -08:00
Mark Otto
2c3365f99e allow btn-groups to work in navbars 2012-01-14 17:16:46 -08:00
Mark Otto
74c0fc17c8 fix duplicate icons 2012-01-14 16:56:47 -08:00
Mark Otto
7455dd6b45 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-14 16:18:39 -08:00
Mark Otto
f587e81b7d rewrite alert messages to use less code, combine the look of default and block messages, simplify docs 2012-01-14 16:18:15 -08:00
Chris Gunther
ec7f8917b1 add Progress Bars to Components narbar dropdown 2012-01-14 15:24:35 -05:00
Chris Gunther
1f54ff91b2 fix section ID for thumbnails 2012-01-14 15:21:57 -05:00
Chris Gunther
b723db1e42 fix section ID for pagination 2012-01-14 15:21:09 -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
Mark Otto
fc053ac8b2 update dropdowns spacing and docs section spacing 2012-01-13 10:07:56 -08:00
Mark Otto
b958ac77c1 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-13 09:55:43 -08:00
Mark Otto
8f09028cff updated js includes to make nav work everywhere 2012-01-13 09:55:15 -08: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
Davide Bellini
1fa94bdbf4 Fixed broken anchors on js docs page 2012-01-12 12:04:17 +01:00
Jacob Thornton
19090ea333 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-11 21:43:43 -08:00
Jacob Thornton
6f2f947a43 add build tool for js + rename twipsy to tooltip + lots of little doc cleanup 2012-01-11 21:42:55 -08:00
Mark Otto
f2fdbd9113 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-10 16:22:19 -08:00
Mark Otto
a34231d94d typo 2012-01-10 15:58:44 -08:00
Jacob Thornton
51e4e77034 remove some tabs from demo + fix dropdowns for pills 2012-01-09 19:53:52 -08:00
Mark Otto
5032ef9b54 remove static popovers, modals, and twipsies from components in favor of full javascript page 2012-01-08 23:14:07 -08:00
Mark Otto
83c0896999 updated js pages to put examples first 2012-01-08 21:48:07 -08:00
Mark Otto
e654ec1336 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-08 15:33:55 -08:00
Jacob Thornton
a24cdb3e40 Merge pull request #932 from blizzy78/typo
Tiny typo fix
2012-01-08 15:13:56 -08:00
Jacob Thornton
7aca72322e move hover state out of timeout duh 2012-01-08 15:12:34 -08:00
Maik Schreiber
dbe5e666af fix typo 2012-01-09 00:02:13 +01:00
Jacob Thornton
6e8a3bba32 add note about firefox persisting disabled state on buttons 2012-01-08 14:54:36 -08:00
Mark Otto
ac68bc39ff Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-08 14:33:52 -08:00
Mark Otto
2c79030439 fix navbar styles for .brand 2012-01-08 14:33:14 -08:00
Mark Otto
cb38d08ed4 updated js docs page to use grid of plugins instead of table 2012-01-08 14:33:03 -08:00
Jacob Thornton
561fc8cf2a document slide and slid methods 2012-01-08 13:54:00 -08:00
Mark Otto
0d62778b28 correct navbar scaffolding code snippet 2012-01-08 13:22:20 -08:00
Mark Otto
cb9be7bd0c clean up dup css in responsive, fix navbar dropdown caret 2012-01-08 13:21:44 -08:00
Jacob Thornton
fbd686ad65 get tabs working in ie9 2012-01-08 12:08:00 -08:00
Mark Otto
cb52458698 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-08 03:19:06 -08:00
Mark Otto
21eb2dac8a add icons in nav list example and markup 2012-01-08 03:18:48 -08:00
Mark Otto
2376da40fb cleanup organization of tabbable nav section 2012-01-08 03:11:51 -08:00
Purwandi
b14426c176 Added example sidebar navigation with icon in docs 2012-01-08 17:44:19 +07:00
Jacob Thornton
0bbb64be4d add nav class to tabs in javascript demo 2012-01-08 02:04:23 -08:00
Mark Otto
9daf1661c5 fix docs for fluid layout, update topbar to fix active text color for links 2012-01-08 01:54:59 -08:00
Mark Otto
19986b3dd8 remove / on js, fix link to typeahead, remove old gradient on dropdown hover 2012-01-08 01:45:49 -08:00
Jacob Thornton
bc505560a0 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	bootstrap.min.css
2012-01-08 00:50:48 -08:00
Jacob Thornton
4478df7681 first pass at ultra basic autocomplete 2012-01-08 00:49:38 -08:00
Mark Otto
d170224457 fix progress bars by removing border and negative margins 2012-01-07 23:21:40 -08:00
Mark Otto
22e0c5f7c8 redoing the tabs on bottom, left, and right 2012-01-07 22:06:44 -08:00
Mark Otto
d0eecc85f8 remove tabbable stuff to try new approach 2012-01-07 21:18:47 -08:00
Mark Otto
ecffa03890 nuke unused code, add to upgrading page 2012-01-07 21:10:17 -08:00
Mark Otto
95f47026cf fix up dropdowns and navbar docs for the new dropdown styles 2012-01-07 21:09:02 -08:00
Mark Otto
343dd9616d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-07 20:40:49 -08:00
Mark Otto
2948d1c3b2 overhaul the entire tabs component structure and docs; remove side nav and make it a nav list to build on new .nav base class 2012-01-07 20:40:28 -08:00
Purwandi
4961aa8c23 Fix line number pretyprint in javascript docs 2012-01-08 08:17:54 +07:00
Mark Otto
1438b14f74 overhauled docs to include example markup, add language around browser support and classes 2012-01-07 15:52:57 -08:00
Mark Otto
418e2c7d58 Merge branch '2.0-wip' of https://github.com/pokonski/bootstrap into pokonski-2.0-wip
Conflicts:
	bootstrap.css
2012-01-07 13:52:36 -08:00
Mark Otto
b81b0e2b15 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-07 13:42:35 -08: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
Jacob Thornton
402c480097 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-07 10:56:28 -08:00
Jacob Thornton
fbb42ccbbb update link to collapse plugin 2012-01-07 10:56:00 -08:00
Greg Roodt
62e504715a Small spelling correction. 2012-01-07 17:30:47 +00:00
Mark Otto
95c88a2953 scratch that, tweaking dropdowns in tabs 2012-01-07 04:41:51 -08:00
Piotrek Okoński
3eb80591b2 Progress bars 2012-01-07 13:39:46 +01:00
Mark Otto
e594107f37 change up the z-indexing and add some popover/twipsy content to the test modal on the js docs to help avoid future bugs 2012-01-07 04:17:33 -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
5fb2c666ac update the fluid examples to use new classes and clear the floats properly from sidebar 2012-01-07 01:59:53 -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
9bedfa447c Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-05 21:43:54 -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
Jacob Thornton
314feb702f listen to window for dropdown clear 2012-01-05 18:32:08 -08:00
Mark Otto
90e3a706ba add jank js back to docs application.js for responsive dropdown in topbar 2012-01-05 16:03:05 -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
bdc22e71c8 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-05 01:37:06 -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
Jacob Thornton
3237047ac3 Merge branch 'master' of https://github.com/twitter/bootstrap 2012-01-04 10:03:11 -08:00
Jacob Thornton
eb123f6b83 switch to async widget.js script 2012-01-04 10:02:51 -08:00
Jacob Thornton
e89618a47f clean up options implementation for carousel 2012-01-02 22:55:51 -08:00
Jacob Thornton
3fb6f6ee86 basic carousel implementation 2012-01-02 22:30:57 -08:00
Jacob Thornton
8b58a1c3d9 placeholder design for carousel 2012-01-02 19:13:02 -08:00
Jacob Thornton
f8c0efbcb4 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-02 16:04:35 -08:00
Jacob Thornton
2d092dfeea start playing with carousel stuff 2012-01-02 16:04:01 -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
Mark Otto
b9adae14fc remove button from topbar for testing 2011-12-27 12:40:30 -06:00
Mark Otto
324246e4f9 remove negative margin from .brand in docs, update navbar to support buttons up thurr 2011-12-27 12:39:39 -06:00
Mark Otto
058f47b33b clean up some comments and fix a bug with buttons in navbar by removing too generic of a link color 2011-12-26 17:25:25 -06:00
Jacob Thornton
a3822cfa84 Merge pull request #842 from jonathaningram/patch-2
Add close and closed hooks for alert
2011-12-24 22:16:48 -08:00
Jacob Thornton
04fee21121 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2011-12-24 22:15:29 -08:00
Jacob Thornton
1a295491b2 update docs for placement 2011-12-24 22:15:04 -08:00
Purwandi
3aba68f832 Fix id tabs on docs component 2011-12-23 21:39:29 +07:00
Jacob Thornton
49fb910b11 more js cleanup after gnarly merge 2011-12-22 19:25:29 -08:00
Jacob Thornton
3396fc0542 check for prettyprint on window 2011-12-22 19:17:41 -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
87ac818253 change above below to top bottom and add "inside" placement option 2011-12-22 19:10:32 -08:00
Jonathan Ingram
2ebc0ad2ef Update docs to show available events on alert 2011-12-22 16:47:42 +11:00
Jacob Thornton
efacac0d6c clean up all the js across all the doc pages 2011-12-21 18:42:43 -08:00
Mark Otto
9fb380151d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	docs/javascript.html
2011-12-21 18:39:02 -06:00
Mark Otto
12a0d69454 fix dropdowns in components docs page 2011-12-21 18:38:03 -06:00
Mark Otto
af5793e1cd fix mobile example sites, remove unused JS from docs index 2011-12-21 16:41:46 -06:00
Mark Otto
c854ed167c rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones 2011-12-21 16:26:21 -06: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
Jacob Thornton
a5a98a8a98 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-12-21 14:03:18 -08: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
Jacob Thornton
80cb760fac animate -> animation 2011-12-21 13:29:12 -08:00
Jacob Thornton
f72a94ae28 update more readme changes - introduce target specificty convention to more plugins 2011-12-20 23:28:48 -08:00
Jacob Thornton
0980a33b47 update all to new on api + add animation support to tabs 2011-12-20 19:37:41 -08:00
Jacob Thornton
1ef5fa7d6b giant refactor - all spec passing again... 2011-12-20 18:02:47 -08:00
Mark Otto
069ef6a020 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-12-19 22:59:20 -08:00
Mark Otto
72a536393c mostly docs updates, but also some bug fixes per github issues 2011-12-19 22:58:56 -08:00
Jacob Thornton
7df0d1c7d1 rename transitions to transition and fix scrollspy example 2011-12-14 18:45:33 -08:00
Alexander Pirsig
e28b080c79 changed npm package name to less 2011-12-14 16:48:50 +01:00
Mark Otto
aa69286c30 rename transitions js file, fix link in js docs 2011-12-13 10:05:19 -08:00
Mark Otto
d681ae9f51 updated docs to include other less apps 2011-12-12 09:51:41 -08:00
Mark Otto
4e8c26d409 updated buttons docs 2011-12-11 02:38:58 -08:00
Mark Otto
54a84f0f7f clearer grid vars docs language 2011-12-11 02:05:50 -08:00
Mark Otto
ecbc9ec4a2 updated footers everywhere 2011-12-11 02:03:16 -08:00
Mark Otto
401f84a7ec center example sites in docs on mobile 2011-12-11 01:58:06 -08:00
Mark Otto
6de3ed5322 Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider
Conflicts:
	bootstrap.css
2011-12-11 00:58:10 -08:00
Mark Otto
200fe25d0a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-12-10 22:30:17 -08:00
Mark Otto
d587845149 tweaks and increase specificity of pills and active classes 2011-12-10 22:21:08 -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
5c8df1d285 updated index page to add featured sites, more docs tweaks 2011-12-09 14:34:38 -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
Mark Otto
312ee6cdfb Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-12-09 11:33:02 -08:00
Mark Otto
b12b71bf7c updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings 2011-12-09 11:32:07 -08:00
Troy Murray
5f54e4aad1 Add code block for condensed table example 2011-12-09 11:34:58 -05:00
Chris Sternal-Johnson
e603009fca fix docs for bordered-table 2011-12-08 14:42:42 -05:00
Evan Meagher
6e70d490e1 Add vertical nav divider example in components doc page. 2011-12-02 11:37:39 -08:00
Jacob Thornton
cee2f61898 define constructor on prototypes 2011-11-30 22:42:22 -08:00
Mark Otto
bc51c15709 adding temp idea for subnav to docs 2011-11-30 01:00:55 -08:00
Mark Otto
f2c40ee24d adding step nav to components 2011-11-30 00:39:38 -08: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
7eb340ec58 add code to reset data for collapsed element so that item can be intitialized with correct options 2011-11-27 17:31:12 -08:00
Jacob Thornton
46fe38386a rename tabs to tab - clean up lots of api stuff make href acceptable target val 2011-11-27 17:04:55 -08:00
Mark Otto
ecc9764c83 Remove static github buttons and replace with iframe versions 2011-11-27 00:44:30 -08:00
Jacob Thornton
3157de8d1d clean up comments for better built files 2011-11-25 21:34:55 -08:00
Jacob Thornton
bd8745a98b allow scrollspy to target a specific nav 2011-11-25 17:30:52 -08:00
Jacob Thornton
98fddaa355 new plugin "collapse" for collapsible lists and "accordion" like support 2011-11-25 17:23:14 -08:00
Jacob Thornton
53ff2682cd clean up scrollspy a bit - add public api method 2011-11-24 20:27:18 -08:00
Jacob Thornton
1fa02fbda2 refactor modal 2011-11-24 20:04:07 -08:00
Jacob Thornton
71654cbf69 refactor alerts + add new readme which idefientifies goals for 2.0 js 2011-11-24 18:55:44 -08:00
Jacob Thornton
b2650859d6 update buttons js for button groups 2011-11-24 14:43:26 -08:00
Martin Bean
fe68f708ce Removed funky characters. 2011-11-24 19:06:00 +00:00
Martin Bean
2b5b87db7d Fixed a typo. Because I'm a Grammar Nazi. 2011-11-24 11:37:08 +00: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
18d2a879ae Merge pull request #621 from vshih/master
Fix tab event selector in tabs JS docs example
2011-11-17 00:40:42 -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
Maxim Kaschenko
4be902741b Fix dropdown anchor 2011-11-17 01:25:36 +07:00
Leo Cassarani
e3cfd2f5b3 Fix grammatically incorrect sentence (copy-paste oversight?) 2011-11-13 21:45:43 +00:00
Vic
638211b896 Fixes tab event selector in tabs example 2011-11-12 13:18:08 -08:00
Mark Otto
cabf993bc6 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-11-12 01:23:37 -08:00
Mark Otto
a4d6e7e9a3 Merge pull request #579 from raulriera/2.0-wip
Add meta tag to all new docs pages for mobile responsiveness
2011-11-12 01:03:16 -08:00
Mark Otto
1fb98bed91 updated docs pages (still wip), adding misc css classes, added form styles from 1.4, added github buttons to homepage 2011-11-12 00:46:02 -08:00
Raul Riera
0e6cd670ca Removed trailing backslash :) 2011-11-08 20:32:28 +01:00
Jacob Thornton
0c7a80c79b remove selector options for popover, in favor of more generic content selector 2011-11-08 11:04:26 -08:00
Raul Riera
74dc83f211 Added the view port meta tag for proper responsiveness 2011-11-07 10:22:28 +01:00
Silumesii Maboshe
ae5badc9fb Removed the 'View javascript docs' link because it is the page we are currently on. Copy tweak for intro paragraphy of the javascript docs. 2011-11-07 09:09:17 +02:00
Silumesii Maboshe
4af6dac20e Use 'fluid-container' instead of 'container-fluid' in the docs. 2011-11-07 09:06:13 +02:00
Rod Vagg
1b43c87eaf removed twipsy options 2011-11-07 12:11:08 +11:00
Rod Vagg
d725ac2feb Merge remote-tracking branch 'twitter/master' into poveropt
Conflicts:
	js/bootstrap-popover.js
2011-11-07 12:02:51 +11:00
Jacob Thornton
b15e24e3d4 don't include data-content/data-title as specifications for options in twipsy/popover 2011-11-06 13:49:00 -08:00
Rod Vagg
4d2e32e809 tests & docs & twipsy too 2011-11-06 13:20:09 +11:00
Jacob Thornton
f03679805e update to jquery 1.7 + add toggle method to twipsy/popover 2011-11-05 17:06:41 -07:00
Jacob Thornton
32086c7de5 add the tab-pane class back to example 2011-11-04 13:46:03 -07:00
Jacob Thornton
e87daa9078 make .tab-content backwards compat with 1.3 2011-11-04 13:44:25 -07:00
Jacob Thornton
0a268389ce Merge branch 'master' of https://github.com/twitter/bootstrap 2011-11-04 13:35:31 -07:00
Jacob Thornton
de44b4c653 fix > & bug and point to 1.1.4 less version 2011-11-04 13:34:44 -07:00
Jacob Thornton
36b5864412 Merge pull request #537 from hermanschutte/master
Small change to correct the incorrect description for bootstrap-buttons.js in the Javascript section
2011-11-04 11:20:41 -07:00
Nik Cubrilovic
3b611357aa bump version number in docs 2011-11-05 00:17:12 +11:00
Herman Schutte
79a01b7fcb Add correct description for bootstrap-buttons.js in Javascript section 2011-11-04 09:34:12 +02:00
Jacob Thornton
f92759b36d update 1.4 docs 2011-11-03 17:39:50 -07:00
Mark Otto
5a702cc6ee no idea 2011-11-03 17:14:19 -07:00
Jacob Thornton
869f11305a update 1.3 to 1.4 stuffs 2011-11-03 17:03:03 -07:00
Jacob Thornton
1b4b97d530 rebuild css, add preserve-3d for faster animations, fix whitespace in mixins.less 2011-11-03 14:45:53 -07:00
Mark Otto
0e91eddb66 fix pagination inconsistencies 2011-11-01 23:57:48 -07:00
Mark Otto
2534fee753 adding unofficial github buttons 2011-11-01 13:56:00 -07:00
Mark Otto
a21363a749 Merge branch 'dev' of github.com:twitter/bootstrap into dev
Conflicts:
	bootstrap.css
2011-10-31 23:22:13 -07:00
Mark Otto
98007b8394 remove fixed height from select elements for IE7 2011-10-31 23:18:36 -07:00
Mark Otto
31ea003046 remove alt tab styles for now, too complicated to accomplish both static and tabble; fix up CSS a bit 2011-10-31 21:45:46 -07: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
Jacob Thornton
169b4b5dcb add template option and make title an optional attribute for popover 2011-10-29 19:59:51 -07:00
Jacob Thornton
640fd15464 allow the use of data attributes to define popover options 2011-10-29 19:27:02 -07:00
Jacob Thornton
ea50e8aeee add active class to css for buttons, write new spec for button, "use strict" 2011-10-29 18:49:35 -07:00
Mark Otto
0218d079ad fix some of the docs styles at 480 to 768 2011-10-29 18:11:17 -07:00
Jacob Thornton
e8b66a9626 star work on bootstrap-buttons.js 2011-10-29 17:58:58 -07:00
Jacob Thornton
9a30b8c05d Merge branch 'master' of github.com:twitter/bootstrap into dev
Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/forms.less
2011-10-29 17:08:35 -07:00
Mark Otto
2764cfda6d remove html from body background 2011-10-28 18:38:06 -07:00
Mark Otto
9fd4e459fe adding more icons for the homepage for open source, twitter, and html5/css3 2011-10-27 23:34:48 -07:00
Mark Otto
f3128d0fa1 overhauled the front page to feel a bit more marketing-like, added the awesome glyphicons to bring some life to the docs 2011-10-27 23:00:09 -07:00
Mark Otto
20b9390a9e update docs for responsive 2011-10-27 09:35:58 -07:00
Mark Otto
19feb1b1ff fix new navbar in components 2011-10-26 23:25:57 -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
Mark Otto
5736ba549c fix prettyify and update the table styles to include a condensed flavor 2011-10-26 21:22:05 -07:00
Mark Otto
e616026d67 update to docs to cleanup pagination for smartphones, fix some pagination inconsistencies 2011-10-26 21:04:14 -07:00
Mark Otto
b4c0d2a6b2 tweaks to the responsive layout to improve type 2011-10-22 22:49:37 -07:00
Mark Otto
d4675bf4ef updating the docs to include more responsive fixes, adding rows to the responsive changes as well to undo negative margin 2011-10-22 15:49:42 -07:00
Mark Otto
41ada302ec tweaking prettify styles to introduce dark theme 2011-10-21 00:37:01 -07:00
Mark Otto
d28f3d86f6 move javascript to le footer 2011-10-21 00:12:47 -07:00
Mark Otto
80332e8340 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-10-20 09:14:02 -07:00
Mark Otto
b62475a22e updated fluid example to not use floated sidebar and instead use position absolute; not ideal, but it works in most cases 2011-10-19 23:50:41 -07:00
Jacob Thornton
523e02f7df fix scrollspy simplify stuff more - break everything. 2011-10-19 23:12:50 -07:00
Mark Otto
35793d98e7 update docs to streamline the tables section, remove redundant css for tables to simplify borders 2011-10-19 23:11:22 -07:00
Jacob Thornton
5ab84f942d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-10-19 22:42:49 -07:00
Mark Otto
958e55f6a4 update docs copy to include mention of info alert messages 2011-10-19 22:22:44 -07:00
Jacob Thornton
8545fe9787 greatly simply js plugins - remove js api where reasonable 2011-10-19 21:56:06 -07:00
Mark Otto
a5d2450e88 refinement to the responsive section 2011-10-18 08:11:18 -07:00
Mark Otto
369b9720c6 adding responsive stuff to docs to stub that out, updated type to make ul and ol margins match p tags 2011-10-17 23:45:35 -07:00
Mark Otto
ae5c5e1063 update docs to change topbar to navbar 2011-10-17 20:44:52 -07:00
Mark Otto
b91d210a3c overhauled tables section of docs to minize copy and emphasize code 2011-10-17 14:43:43 -07:00
Mark Otto
27cbe7f63a add abbr styles, overhaul type docs section to remove lots of verbose text and put emphasis on tables and more scannable content 2011-10-17 14:17:29 -07:00
Mark Otto
d035fa731a update all code elements in docs 2011-10-17 12:59:03 -07:00
Mark Otto
6d2e39950d updated js docs page to new 12 column layout, fix subhead jumbotron styles to match new front page 2011-10-17 00:03:52 -07:00
Mark Otto
e7d2218b20 few tweaks to responsive stuff, updated docs for grid system (still needs copy editing) 2011-10-16 23:04:31 -07:00
Mark Otto
c62a0239bd update to responsive to fix new masthead 2011-10-16 19:12:33 -07:00
Mark Otto
1888511d67 updated docs to include quick links and twitter buttons, added updated blueprint pattern to background 2011-10-16 18:45:11 -07:00
Mark Otto
2a82b38cff tweak the h2s again for better spacing, adjust docs, remove white bg if possible on file input, few other tweaks 2011-10-16 18:01:05 -07:00
Mark Otto
6f44a90edb tweak line-height of h2 and h3 to not be gihugeous, updated responsive to improve tablet grid and phone styles 2011-10-16 11:35:24 -07:00
Mark Otto
3a4760637f tweak navbar styles for static version to not cause problems on responsive layouts 2011-10-16 03:15:17 -07:00
Mark Otto
9e9109469e biiiiiig update coming for responsiveness 2011-10-16 03:00:58 -07:00
Mark Otto
fbe22f0580 updated index of docs to use html5 self closing tags, add responsive shell to bootstrap file 2011-10-15 17:21:39 -07:00
Mark Otto
f4fc56b1b3 first pass at moving over the new tabs stuff to 2.0 2011-10-12 08:31:16 -07:00
Mark Otto
740e64a2c9 remove new tab stuff since it breaks backwards compatability 2011-10-11 23:49:43 -07:00
Mark Otto
e2a0ce2062 adding new tabble stuff, still a huge work in progress 2011-10-11 23:46:42 -07:00
Mark Otto
12af75eef4 updated pills to include vertical (stacked) variation in patterns and documentation 2011-10-11 21:49:37 -07:00
Mark Otto
b644390541 update navbar search form 2011-10-11 09:52:50 -07:00
Mark Otto
8ba005d38d new navbar introduced to replace topbar 2011-10-11 09:44:51 -07:00
Mark Otto
770e7647d1 start adding examples to docs for alternate tabs and pills 2011-10-09 22:55:12 -07:00
Mark Otto
b74776281d new form state styles with lighter footprint 2011-10-09 22:32:19 -07:00
Mark Otto
831f279011 add extra states to the form examples 2011-10-09 22:02:40 -07:00
Mark Otto
7c98f1e1fc Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-10-09 21:25:50 -07:00
Mark Otto
f61fe3c474 refactor fluid layout to be more specific to not interfere with modal content while adding right sidebar option 2011-10-09 21:13:26 -07:00
Mark Otto
eddc59c634 remove select from docs form sizes 2011-10-08 00:27:52 -07:00
Mark Otto
464c2d5295 remove select from the new form grid sizes and let them inherit the default grid ones 2011-10-08 00:26:57 -07:00
Mark Otto
7b665affd7 fix problems with scope in tables when using th in tbody 2011-10-08 00:14:38 -07:00
Mark Otto
970c51dd99 update docs to simplify first table example and introduce nested documentation 2011-10-07 23:54:50 -07:00
Mark Otto
9991f3faa1 resolve problem with nested tables having double borders 2011-10-07 23:53:32 -07:00
Silumesii Maboshe
b7d4be584a For consistency, updated rendered 'pre' in docs to '<pre>' in the 'Presenting code' section. 2011-10-07 05:59:34 +02:00
Silumesii Maboshe
527521b502 Updated rendered '>html<' in docs to '<html>' in the 'Presenting code' section. 2011-10-07 05:56:45 +02:00
Jacob Thornton
c9669be1ec get modal working with new data-attrs 2011-10-05 00:14:55 -07:00
Jacob Thornton
a2c263493a add dropdown tab selection support 2011-10-04 22:11:44 -07:00
Jacob Thornton
d7e3bf722d add selector option to alerts, update modal settings strategy 2011-10-04 21:24:59 -07:00
Mark Otto
1b245ffdf8 make links in error messages not be blue, but instead match the text color and be bold: 2011-10-03 22:36:51 -07:00
Mark Otto
c843e202b5 make it so that checkboxes and radio options-list can have wrapping labels; needs to be cross browser tested yet 2011-10-03 22:27:15 -07:00
Mark Otto
948c59ddb3 resolve issue with form fields and errors causing no space between fields with consecutive errors; needs more work, but will address later 2011-10-03 21:43:53 -07:00
Jacob Thornton
823b063c56 preboot.less > variables.less in docs 2011-10-02 23:00:11 -07:00
Jacob Thornton
a0c3250b97 add note about making sure to include boostrap-twipsy before popover script 2011-09-29 23:24:34 -07:00
Jacob Thornton
d2de00f1df Merge branch 'kasperp-tab-event' 2011-09-29 23:01:06 -07:00
Jacob Thornton
a0bf8b67ff change event to use target and relatedTarget (which more closely resembles actual event api) 2011-09-29 23:00:10 -07:00
Jacob Thornton
b827303511 changed event should be change event 2011-09-29 22:21:55 -07:00
Jacob Thornton
24b05fe94a Merge branch 'tab-event' of https://github.com/kasperp/bootstrap into kasperp-tab-event 2011-09-29 22:18:08 -07:00
Mark Otto
0a6d8c30db adding button groups and toolbars like a boss 2011-09-29 02:21:02 -07:00
Mark Otto
ecdba931ec remove that test gradient 2011-09-29 01:41:03 -07:00
Mark Otto
f919f6f94f huge update to forms, docs for the new forms, added a new link for js example to tabs/pills, add some new mixins 2011-09-29 01:40:27 -07:00
Mark Otto
2d81d65533 initial idea for handling closing of modals from whatever element you want with .js-dismiss class 2011-09-28 20:21:09 -07:00
Mark Otto
6d541a6066 pulling out more stuff and fixing file name at top of file 2011-09-28 19:06:10 -07:00
Pamela Fox
1be7e09b97 Think the option is supposed to be 'keyboard' in the docs, not 'closeOnEsc'. 2011-09-28 14:56:54 -07:00
Adam Bowen
7c637bc51c Fixes typos of "bootstrap" 2011-09-21 10:38:08 -03:00
Nano
bc6e4b8ed2 Typo fix: "you're" to "your". 2011-09-20 14:09:28 -03:00
Jacob Thornton
ac8001190a force reflow instead of relying on eventloop (firefox)
listen to window for escape press
2011-09-18 21:03:52 -07:00
Jacob Thornton
89c5eb4491 Merge pull request #241 from asmega/javascript_docs_favicon
fixing locations of favicon + apple icons
2011-09-18 13:45:12 -07:00
asmega
159ccc9de3 fixing locations of favicon + apple icons 2011-09-18 16:10:36 +01:00
Kasper Bøgebjerg Pedersen
e16de59260 Added changed event to bootstrap-tabs.js 2011-09-18 10:15:24 +02:00
Mark Otto
b5acabe4fd fix broken topbars in javascript 2011-09-17 22:55:29 -07:00
Lim Chee Aun
7da0e5cc0c Documentation typo/error on scrollSpy. 2011-09-18 08:35:34 +08:00
Mark Otto
ec8619a980 update docs to remove old stuff, update to all new classes; no more backwards compatibility 2011-09-17 17:21:43 -07:00
Jacob Thornton
7b614cfa01 allow backdrop option to accept "static" option 2011-09-17 14:20:51 -07:00
Nick Veys
2cb233319d Adding flag to prevent backdrop click hiding modal 2011-09-17 15:08:16 -05:00
Mark Otto
08d017592b Fix spelling mistake in pre on js page (/ul instead of /div). 2011-09-16 13:01:49 -07:00
Mark Otto
e8d9eb264c update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing 2011-09-16 10:51:44 -07:00
Chris Aniszczyk
08b6c47ad7 Clarify documentation license to be CC BY 3.0
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2011-09-16 10:30:47 -07:00
Mark Otto
597590c15d add active class back to tabs 2011-09-16 10:15:45 -07:00
Mark Otto
e663cfb43f fix tabs jitter bug when there is no active class 2011-09-16 10:14:35 -07:00
Mark Otto
c579e4d550 expanding comment in application.js 2011-09-16 09:55:12 -07:00
Mark Otto
8ff18a9ffc fixing conflict and recompiling 2011-09-16 09:47:36 -07:00
Mark Otto
b188c0da8b updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having 2011-09-16 09:41:58 -07:00
Jacob Thornton
472632ba51 mv 1.3.0 file names to plane bootstrap.css for submodulers 2011-09-15 23:09:56 -07:00
Jacob Thornton
68f89d109f little fixes for ie 7 2011-09-15 22:27:41 -07:00
Jacob Thornton
8896497ea8 update attributes for js and make tooltips reposition on resize 2011-09-15 21:19:39 -07:00
Mark Otto
dcf6a051e7 allow multi-select lists in forms 2011-09-14 08:58:20 -07:00
Mark Otto
01d9cd88e8 updated browsers image 2011-09-13 20:24:30 -07:00
Mark Otto
2af3eb6ce2 fix tab-content and pre funkiness, convert p in tab content to div 2011-09-13 14:47:18 -07:00
Mark Otto
121b62d54e updates to docs to include more example html, include links to javascript docs where necessary 2011-09-13 10:08:24 -07:00
Mark Otto
35bc3ae8d2 remove theming section from docs 2011-09-13 09:44:43 -07:00
Mark Otto
1d50fa77e4 adding quick and dirty favicons and touch icons for iOS 2011-09-13 09:35:43 -07:00
Mark Otto
bc2ae90e3a Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 22:19:44 -07:00
Mark Otto
5249483850 comment out box-shadow on masthead and footer in docs.css because Opera sucks at inset box-shadow :" 2011-09-12 22:19:28 -07:00
Jacob Thornton
e34bc6e294 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 21:06:53 -07:00
Jacob Thornton
5ee11ec8bd fix docs for opera 2011-09-12 21:06:29 -07:00
Mark Otto
3f64aaf82b fix topbar link with button bug 2011-09-12 19:00:44 -07:00
Mark Otto
8f5f35e6db Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 13:32:58 -07:00
Mark Otto
bc41c58472 make modals cover topbars 2011-09-12 13:31:58 -07:00
Jacob Thornton
7396cb8c51 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 11:14:35 -07:00
Jacob Thornton
1645b57efe prevent default for hover click 2011-09-12 11:14:09 -07:00
Mark Otto
72ce695cfd add links 2011-09-12 09:24:54 -07:00
Mark Otto
6a5fb52bb1 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 08:58:46 -07:00
Jacob Thornton
89465f8ce1 few more js doc wording changes 2011-09-12 00:03:24 -07:00
Jacob Thornton
cc05bce597 docs coppyy 2011-09-11 23:56:44 -07:00
Jacob Thornton
44e2c73668 data-attribute="x" annndddd... now all js with ie7+ support 2011-09-11 23:48:43 -07:00
Jacob Thornton
fcf816a236 index to use data attr for scrollspy initilizing 2011-09-11 23:36:59 -07:00
Jacob Thornton
02d668fd2e data-attributes need values to be picked up by jquery in ie8 and below :/ 2011-09-11 23:29:34 -07:00
Mark Otto
88f2f848b3 change modal buttons back to be primary first 2011-09-11 22:02:26 -07:00
Mark Otto
0afba3867d Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 21:13:09 -07:00
Mark Otto
b77e3e2f30 theme.less file cleanup; fixing blockquotes in wells 2011-09-11 21:12:55 -07:00
Jacob Thornton
f8aaec5260 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 21:04:01 -07:00
Jacob Thornton
200f5817ba method invocation jqueryui style 2011-09-11 21:03:17 -07:00
Mark Otto
b7c9a639d6 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 20:17:49 -07:00
Mark Otto
bd3448cf78 make input prepend styles look a bit better 2011-09-11 20:17:34 -07:00
Jacob Thornton
e255b4f51d Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 20:09:20 -07:00
Jacob Thornton
173be3f1e8 change hella js... broke all the tests. i <3 wip 2011-09-11 20:08:43 -07:00
Mark Otto
2674210ff0 move the .brand from the parent to the a tag in the topbar; fix the moving text in IE7 2011-09-11 20:00:45 -07:00
Mark Otto
6bc867ed5c change template diagrams to be .media-grid 2011-09-11 19:53:48 -07:00
Mark Otto
53812bc2d8 remove qualifying tags in .span selectors for built in grid so that we can use .span-n classes in form styles 2011-09-11 18:44:25 -07:00
Mark Otto
f3f60b21a6 oops, double commit last time; apply fixes to make select elements line up in IE7 with their labels, but no height fix 2011-09-11 18:09:01 -07:00
Mark Otto
3ad034ea96 fix legends in ie7 2011-09-11 17:36:15 -07:00
Mark Otto
1ae603fda0 make the less compile docs text now have widows, fix broken table markup 2011-09-10 23:05:30 -07:00
Mark Otto
62edafa1a4 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:55:59 -07:00
Jacob Thornton
d9cbcfc20d wait for window load event before positioning images, doi 2011-09-10 22:54:47 -07:00
Mark Otto
0c656e29fc updated styles for the media grids 2011-09-10 22:50:59 -07:00
Jacob Thornton
b781f6ca59 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:49:05 -07:00
Jacob Thornton
a5964b07b1 add static sizes for images so tooltips get right size on load 2011-09-10 22:48:39 -07:00
Mark Otto
d0f7637a7d adding more media sizes 2011-09-10 22:47:38 -07:00
Jacob Thornton
68865002af Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:44:22 -07:00
Jacob Thornton
2655117747 add some notes on installing from command line and from makefile 2011-09-10 22:43:52 -07:00
Mark Otto
3755ee158f Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:31:55 -07:00
Mark Otto
40693f2618 adding media grid styles 2011-09-10 22:31:43 -07:00
Jacob Thornton
c40e0de3c1 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	docs/index.html
2011-09-10 22:17:37 -07:00
Jacob Thornton
64176caa97 add bootstrap-scrollspy 2011-09-10 22:14:57 -07:00
Mark Otto
536fe2c743 add footer to js docs 2011-09-10 21:54:11 -07:00
Mark Otto
8130b113bb add stubbed out table for how to compile less 2011-09-10 21:50:12 -07:00
Mark Otto
6a74a313a8 tweak css for topbar to bring back z-index fix; update javascript markup and some heading text 2011-09-10 21:10:18 -07:00
Mark Otto
3407ed948d resolved conflict 2011-09-10 21:06:09 -07:00
Mark Otto
00b7dff359 overhaul docs CSS since it was scalable, converted docs mastheads and footers to classes and HTML5 elements, add masthead to js docs page but make it slate so it looks cool and stands out 2011-09-10 21:05:23 -07:00
Jacob Thornton
a71d5d8e99 add the dhg flavor back 2011-09-10 19:01:16 -07:00
Jacob Thornton
57a8672b77 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 16:51:03 -07:00
Jacob Thornton
23d2fed905 tooltip 1 word 2011-09-10 16:50:42 -07:00
Mark Otto
0914027609 spelling mistake 2011-09-10 15:32:06 -07:00
Mark Otto
f556da42fc zebra stripe that shit 2011-09-10 15:30:42 -07:00
Mark Otto
a95a0ed71c conflict 2011-09-10 15:29:53 -07:00
Mark Otto
99ede580cf adding code and .label sections to type section 2011-09-10 15:29:38 -07:00
Jacob Thornton
a8d4475827 adds twipsy js to regular index for positioning 2011-09-10 14:52:45 -07:00
Jacob Thornton
5f65df9e2d add some more events to alerts and modal and update docs 2011-09-10 14:04:22 -07:00
Jacob Thornton
5bc455d370 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 13:17:43 -07:00
Mark Otto
c797cb61a6 conflict 2011-09-10 13:04:17 -07:00
Mark Otto
5b16150159 trying to solve firefox active outline, make .input less specific 2011-09-10 13:00:07 -07:00
Jacob Thornton
48aa209348 more tests, more js goodness 2011-09-10 12:49:21 -07:00
Jacob Thornton
79d5f90713 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	bootstrap-1.3.0.css
2011-09-09 22:48:57 -07:00
Jacob Thornton
5f4e30ed1d move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like 2011-09-09 22:47:49 -07:00
Mark Otto
0b43bc9bb9 adding docs for customizing the grid 2011-09-09 21:50:41 -07:00
Mark Otto
a0c3d48342 fix the stacked form legend style 2011-09-09 21:43:19 -07:00
Mark Otto
c56e229ed7 start updating the grid docs for customizing it 2011-09-09 20:47:38 -07:00
Mark Otto
dad058326e add version # to docs 2011-09-09 16:00:59 -07:00
Mark Otto
53135839f5 adding nested columns to the grid section 2011-09-09 10:04:07 -07:00
Jacob Thornton
b086d94253 remove aria-control stuff 2011-09-09 00:00:03 -07:00
Mark Otto
1a8fb2dbf7 resolve conflict 2011-09-08 23:02:13 -07:00
Mark Otto
ba08055a7b update the modals and alert-messages to use the same .close styles, save for some positioning in the modal after knocking down the modal padding 2011-09-08 23:01:28 -07:00
Jacob Thornton
5960711d0f some more js love - update the docs with tabs/pills plugin 2011-09-08 20:21:03 -07:00
Jacob Thornton
346122a0c7 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-08 19:13:26 -07:00
Jacob Thornton
8d2f14d8d0 tabssss 2011-09-08 19:13:08 -07:00
Mark Otto
c474f996a9 tweaks to table styles to make them use @basefont and @baseline 2011-09-08 10:47:05 -07:00
Mark Otto
1c03a07591 bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere 2011-09-08 10:36:56 -07:00
Mark Otto
1af96b9a58 what up breadcrumbs, we added you 2011-09-08 09:43:37 -07:00
Mark Otto
f6d20a8939 remove active state from dropdown 2011-09-06 23:32:20 -07:00
Mark Otto
daf903f847 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-06 23:30:45 -07:00
Mark Otto
d640c3b14b update diagrams to use smaller border radius, add new container-app example 2011-09-06 23:30:21 -07:00
Jacob Thornton
fb8987148a move javascript from examples into docs 2011-09-06 23:20:56 -07:00
Mark Otto
d0882c580d first pass at enabling active states in dropdowns in topbar and fixing the bug of having an active class on parent dropdown 2011-09-06 21:54:00 -07:00
Mark Otto
dfbb591953 addng docs for the themes stuff and examples 2011-09-04 14:02:56 -07:00
Mark Otto
0b70eb630e Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-02 23:35:44 -07:00
Mark Otto
bfa5ce70d4 updated address examples 2011-09-02 23:35:28 -07:00
Mark Otto
df8eccbfe1 adding support for and example ul in block-messages 2011-09-02 23:28:01 -07:00
Jacob Thornton
cf23dc4f24 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-02 23:16:06 -07:00
Jacob Thornton
2883888a57 adds small js section to docs index 2011-09-02 23:15:38 -07:00
Mark Otto
6d118411e1 resolve conflict 2011-09-02 22:09:49 -07:00
Mark Otto
d5e42cf81a tweak readonly, disabled, and uneditable form elements 2011-09-02 21:54:11 -07:00
Jacob Thornton
0e13f8dca1 Merge branch 'master' of github.com:twitter/bootstrap into js-examples
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less
2011-09-02 21:04:25 -07:00
Mark Otto
cb244d5d51 fix docs.css spacing, add gradient support for ie9 back 2011-09-02 12:31:14 -07:00
Mark Otto
e0722fcb1b cleanup docs and fix gradient in masthead 2011-09-02 12:24:28 -07:00
Mark Otto
8c1e60c638 add reset filter to preboot for turning off gradients in IE when necessary; make :disabled [disabled] for crossbrowser usage 2011-09-02 12:19:43 -07:00
Mark Otto
411e324340 fix dropdown bug, remove second topbar from docs now 2011-09-02 00:58:07 -07:00
Mark Otto
251882892f resolve conflicts 2011-09-02 00:52:22 -07:00
Mark Otto
fa94b264fa add temp second topbar to nav section, fix it's compatibility issues 2011-09-02 00:50:05 -07:00
Jacob Thornton
2a5d829c4a add doc styles back to topbar-inner 2011-09-02 00:47:06 -07:00
Jacob Thornton
ec82b613d3 Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
2011-09-02 00:32:09 -07:00
Jacob Thornton
462287e25e div > ul ftw 2011-09-02 00:31:19 -07:00
Mark Otto
479e0ccd6b add backwards compatability for dropdowns in topbar 2011-09-02 00:28:54 -07:00
Jacob Thornton
0159524413 Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
2011-09-01 22:54:59 -07:00
Jacob Thornton
72da5dd54d for html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit 2011-09-01 22:53:24 -07:00
Mark Otto
0cb6804b69 merging in remote and recompiling 2011-08-31 16:27:28 -07:00
Mark Otto
6258832776 spelling mistakes and undo of one comment 2011-08-31 16:26:47 -07:00
Jacob Thornton
90d174a34d Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	README.md
	bootstrap-1.2.0.css
2011-08-30 23:37:46 -07:00
Jacob Thornton
4fb1c5bd4b rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html 2011-08-30 23:34:19 -07:00
David Haywood Smith
55022228bc Fixed duplicate element ids
Also updated labels where required
2011-08-30 11:47:40 +01:00
Jacob Thornton
fc0471a450 lulz nbsp 2011-08-29 22:34:13 -07:00
Jacob Thornton
e8f1ae0073 btn's need &nbps; seperating them for ie7 2011-08-29 21:52:45 -07:00
Mark Otto
7070d44aed adding more grid docs 2011-08-29 21:41:32 -07:00
Mark Otto
654cc5ad3f resolving deltas between that epic css selector specifity pull request and latest changes here 2011-08-29 21:24:00 -07:00
Jacob Thornton
ed96f181c8 add topbar dropdown js 2011-08-27 21:46:50 -07:00
Mark Otto
650251228b redefine the grid to use attribute selectors with css regex, make previously fixed grid values use variables we use elsewhere 2011-08-27 15:30:18 -07:00
Mark Otto
4f67e135dc adding dropdowns to tabs by refactoring the shizzzz out of them 2011-08-26 20:38:23 -07:00
Jacob Thornton
a63fb4d234 Merge branch '1.1.1-wip' 2011-08-26 15:21:20 -07:00
Jacob Thornton
273659c8e7 update everything to 1.1.1 2011-08-26 11:13:47 -07:00
Jacob Thornton
5193619ab0 clean up redundant google prettify code 2011-08-26 10:53:21 -07:00
Mark Otto
fc1118c87c bump less version number in docs 2011-08-26 10:09:57 -07:00
Karthik Viswanathan
0a34a6d4b2 Made JavaScript unobtrusive by factoring out prettyPrint() to application.js. Also removed unused class from hero demo. 2011-08-26 00:00:05 -07:00
Mark Otto
74a18b341c updated le docs to include note about topbar and padding on box (issue #86) and add snippet about @basefont and @baseline to type section 2011-08-25 23:25:21 -07:00
Mark Otto
c715584428 pull table class from docs again 2011-08-25 23:18:15 -07:00
Mark Otto
dd4bb95c2d updated docs for b/i tags based on issue #62 2011-08-25 23:10:18 -07:00
Mark Otto
0758f64045 updated classnames in the docs for the alerts, updated colors on error and info alerts/buttons 2011-08-25 22:52:21 -07:00
Mark Otto
ce615d016a merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts 2011-08-25 22:41:45 -07:00
Jacob Thornton
0e9d7c1c4d update alert and button styling aproach 2011-08-25 13:31:46 -07:00
Mark Otto
50f484eed6 big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme 2011-08-25 02:00:07 -07:00
Jacob Thornton
8368cfd523 add opera to browser support 2011-08-24 19:55:11 -07:00
David Haywood Smith
70bac36a22 Fixed empty for fields on select labels
Also added id fields to selects where needed
2011-08-24 00:05:07 +01:00
Jacob Thornton
0bfce13983 add delete button + give .btn cursor:pointer 2011-08-22 23:53:02 -07:00
Mark Otto
16064bed2d Bugfix and copy changes 2011-08-22 12:34:55 -07:00
Jacob Thornton
621f358dc0 fix copy for ie in docs 2011-08-22 11:26:04 -07:00
Jacob Thornton
fef3672ad3 update copy for browser support 2011-08-21 22:48:01 -07:00
Jacob Thornton
3ef86aa703 v1.1.0 2011-08-21 22:30:39 -07:00
Jacob Thornton
109027433d finish cleaning up ie 7-8 support 2011-08-21 22:26:54 -07:00
Jacob Thornton
f408f5c29b update few things for ie 2011-08-21 22:13:35 -07:00
Jacob Thornton
b62b15c5e3 link docs to correct css 2011-08-21 22:05:49 -07:00
Jacob Thornton
25e21bab96 fix crappy merge 2011-08-21 22:05:07 -07:00
Jacob Thornton
e11c49cc48 Merge branch 'master' of github.com:twitter/bootstrap
Conflicts:
	bootstrap-1.0.0.css
	bootstrap-1.0.0.min.css
	docs/index.html
2011-08-21 21:42:56 -07:00
Jacob Thornton
b54dc13535 Merge branch 'misc_css_fixes'
Conflicts:
	bootstrap-1.0.0.css
	lib/patterns.less
2011-08-21 21:42:10 -07:00
Jacob Thornton
dd92f4e6e2 hide overflow for ie 7 2011-08-21 21:26:15 -07:00
Jacob Thornton
1db73edc5f fix conflict 2011-08-21 21:06:09 -07:00
Jacob Thornton
17f9aca698 1 more space for disabled 2011-08-21 20:57:09 -07:00
Mark Otto
f169c99f72 more tweaks to resolve some missed conflicts 2011-08-21 20:56:06 -07:00
Jacob Thornton
c6b162f6ca nonbreaking spaces for ie7 after buttons :/ 2011-08-21 20:53:54 -07:00
Mark Otto
23ec21d049 resolve conflicts 2011-08-21 20:51:13 -07:00
Mark Otto
a98d2cccb8 merge in master, resolve conflicts 2011-08-21 20:47:24 -07:00
Mark Otto
b59b82b032 updated to resolve conflicts 2011-08-21 20:38:57 -07:00
Mark Otto
34a19915f4 resolve conflicts 2011-08-21 20:33:54 -07:00
Mark Otto
80e0e9c413 updated list html, tweaks to patterns 2011-08-21 20:03:12 -07:00
Jacob Thornton
f17b2633ad fix btn borders ie7/ie8 2011-08-21 19:56:43 -07:00
Jacob Thornton
48c3c6f1b6 make topbar .fill wrap 2011-08-21 18:14:53 -07:00
Jacob Thornton
e1e4ceee3f fix disabled button for ie 8 and below 2011-08-21 18:07:47 -07:00
Mark Otto
2aeed35f24 pull filter gradients out completely because IE can't render them correctly in half of all instances and they are performance problems with them; tweak alert message styles, particularly close button; 2011-08-21 17:30:45 -07:00
Mark Otto
254e70550e remove 60px top margin on body and tweak a few other things 2011-08-21 17:06:37 -07:00
Jacob Thornton
22dbf9d8e4 fix up the modals for ie8 2011-08-21 13:36:06 -07:00
Jacob Thornton
b18e76f990 introduce .fill class to top-nav for overflow bug 2011-08-21 12:19:01 -07:00
Jacob Thornton
1fc4491cd6 simplify drop down logic - fix color of search hover for ie 2011-08-21 11:22:33 -07:00
Mark Otto
6db39d0ec3 fix error styles a bit on stacked form fields 2011-08-20 23:56:32 -07:00
Mark Otto
e179f0acb3 more spacing and commenting 2011-08-20 23:38:00 -07:00
Mark Otto
c7c3356101 more spacing tweaks 2011-08-20 23:32:37 -07:00
Mark Otto
aaf9f752c4 docs spacing, spare divs in a few places, updating css spacing 2011-08-20 23:25:22 -07:00
Mark Otto
14b77f3a21 remove rogue ul 2011-08-20 21:25:21 -07:00
Mark Otto
ffd851d93a fixing conflict to merge in copy changes 2011-08-20 21:14:57 -07:00
Mark Otto
72899a4ee8 updated docs to fix inconsistent display of code elements, update scaffolding to fix padding issue on fluid containers, add placeholder hero unit in patterns for future use, continue to refactor some rgba to hex values 2011-08-20 18:58:12 -07:00
Matthew Pennell
7852619e32 Fix broken quotes and bizarre update of HTML5 to 6. 2011-08-20 23:16:15 +02:00
Matthew Pennell
52e9f7eb6e Corrected semantic definitions of strong, em and b in Typography section. 2011-08-20 23:08:58 +02:00
Mark Otto
261a473a72 adding more details on browser support, adding snippet of about text, changed p tags to have half the bottom margin 2011-08-20 01:51:06 -07:00
Mark Otto
4a567fcb10 updated docs and docs css to not use rgba colors on the layout modules so IE can see that shiz 2011-08-20 01:11:48 -07:00
Mark Otto
4f2b0d8aa4 fix topbar in docs as well 2011-08-19 22:32:14 -07:00
Mark Otto
fc3324f88b fix spacing and confusion in example h1 heading with small tag 2011-08-19 22:31:03 -07:00
Mark Otto
66fea662e4 fix typo 2011-08-19 22:29:10 -07:00
Mark Otto
3f388ef07a updates to the topbar markup and css to remove the logo classname and simplify the selectors for it 2011-08-19 22:28:22 -07:00
Jacob Thornton
f1a6972281 fix drag knob in firefox #7 2011-08-19 20:37:12 -07:00
Rafaël Blais Masson
d2515876f1 Lovely ellipses and apostrophes. 2011-08-19 21:01:23 -04:00
Jacob Thornton
4d0a80bdef Merge branch 'master' of github.com:twitter/bootstrap 2011-08-19 14:24:26 -07:00
Jacob Thornton
581f2563b0 remove type attr from docs 2011-08-19 14:23:41 -07:00
Mark Otto
0af179fdf6 Oops, adding rel=stylesheet back to docs page 2011-08-19 13:20:07 -07:00
Mark Otto
e8c3b4e5c7 update docs for correct usage of address, emphasis, and more 2011-08-19 13:19:07 -07:00
Jacob Thornton
19bbc01f2e add rel="stylesheet" to doc text 2011-08-19 12:14:43 -07:00
Mark Otto
bd1d389751 tweaks around names and such 2011-08-18 11:37:47 -07:00
Mark Otto
799a14d1cb capitalize Less instead of using all caps 2011-08-17 22:40:50 -07:00
Mark Otto
8ba5a29456 capitalize github properly, fix url for compiled css 2011-08-17 22:38:14 -07:00
Jacob Thornton
07837a1c47 update docs with gh-pages 2011-08-17 11:31:20 -07:00
Jacob Thornton
7ecfc99a14 remove ds_store add an ugly gitignore file. boo. 2011-08-16 23:07:35 -07:00
Jacob Thornton
7f99892b86 change popover stufff 2011-07-28 17:50:38 -07:00
Mark Otto
a7d65d7d8f remove the twitter logo and change some wording 2011-07-06 19:43:41 -07:00
Mark Otto
5a1a01869a new popover ideas 2011-07-05 14:24:53 -07:00
Mark Otto
3117fc979d getting popovers in 2011-07-01 23:10:39 -07:00
Mark Otto
189d11593f rename modals to popovers 2011-07-01 22:21:05 -07:00
Mark Otto
163e68ade6 resolve merge conflict 2011-07-01 22:16:29 -07:00
Mark Otto
7962b36dae misc updates to docs and form bug fix 2011-07-01 22:15:16 -07:00
Jacob Thornton
26f9e8c4e8 add text to p tag doi 2011-07-01 21:38:33 -07:00
Jacob Thornton
5a7f3f72cb clean up js a tiny bit 2011-07-01 21:37:12 -07:00
Jacob Thornton
8245a7087e add twipsies... 2011-07-01 21:30:12 -07:00
Mark Otto
be3a57a692 Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-07-01 10:41:20 -07:00
Mark Otto
460a84a926 Updated offset columns, fix app.js bug, misc tweaks to copy 2011-06-30 15:56:25 -07:00
Jacob Thornton
291c1acd38 Add new Tweet -> modal heading 2011-06-30 14:18:48 -07:00
Jacob Thornton
b088458089 Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-06-30 13:57:41 -07:00
Jacob Thornton
6687acc8ec read application.js 2011-06-30 13:57:29 -07:00
Mark Otto
3c965e2981 fix sentence case on buttons 2011-06-30 13:56:50 -07:00
Mark Otto
c53e394f71 changing stacked forms to be lined up left side w/ 20px 2011-06-30 13:51:13 -07:00
Mark Otto
f725d60a76 remove unused images 2011-06-30 13:37:24 -07:00
Mark Otto
bec9449136 Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-06-30 13:36:51 -07:00
Mark Otto
cde63b98bc remove unnecessary js lang files from prettify, update styles for prettify 2011-06-30 13:36:47 -07:00
Jacob Thornton
89a05622ab remove chilllli 2011-06-30 13:22:43 -07:00
Mark Otto
87f9ea00e4 updated docs 2011-06-30 13:17:58 -07:00
Mark Otto
4c2614841e fix footer text 2011-06-30 11:13:53 -07:00
Mark Otto
b57221e4ca attempts to resolve bad chrome position fixed bug 2011-06-30 11:13:00 -07:00
Mark Otto
588b2da937 updated docs, fixed language, added copy-code js for selecting text on focus 2011-06-30 10:40:28 -07:00
Mark Otto
6aae3930c9 updated docs styles, notes in header of master file, etc 2011-06-30 10:21:27 -07:00
Mark Otto
ced32d5ceb adding note in the masthead about less.js and browser support 2011-06-30 00:31:56 -07:00
Mark Otto
9e33ab20ab clean up commented out css, slightly updated docs again 2011-06-30 00:15:37 -07:00
Mark Otto
1905a992d9 updated docs call to actions for using bootstrap, tweaks to aesthetic 2011-06-29 23:47:54 -07:00
Mark Otto
f47b576574 yo dawg i heard you liked mastheads 2011-06-29 17:10:53 -07:00
Mark Otto
936d7acb31 trying out new doc style stuff 2011-06-29 15:51:27 -07:00
Mark Otto
025f74ef93 form bug fix with new baseline, updated docs to fix topbar bug, tweaks to scaffolding for buttons 2011-06-29 13:48:08 -07:00
Mark Otto
25d9a2f2b8 update grid bg to 18px baseline, updated docs for disabled buttons 2011-06-28 15:54:25 -07:00
Mark Otto
b11784fec0 adding attribution in footer, link up names, clean up button styles 2011-06-28 15:31:05 -07:00
Mark Otto
a92aeda6a1 Merge branch 'master' of http://git.local.twitter.com/baseline 2011-06-28 15:11:44 -07:00
Mark Otto
4e95e558db reseting baseline to 18px, fixing wells, moving pre styles for chili to docs 2011-06-28 15:11:41 -07:00
Jacob Thornton
08c318e008 update makefile and little comments 2011-06-28 15:10:43 -07:00
Mark Otto
9660f6f18d new buttons, new modal updates around spacing and placeholder content 2011-06-28 11:56:49 -07:00
Jacob Thornton
e33808447e started workign on modals 2011-06-28 01:15:03 -07:00
Jacob Thornton
471563eb81 + add a make file which auto builds the bootstrap dist files
+ rebuild dist files
+ update index.html to point to bootstrap-1.0.0.css
2011-06-28 00:23:54 -07:00
Jacob Thornton
bb665f157e remove line 2011-06-27 17:48:40 -07:00
Mark Otto
b54c07b5a8 Merge branch 'master' of http://git.local.twitter.com/baseline 2011-06-27 17:32:53 -07:00
Mark Otto
7c4d17755a delete that shit 2011-06-27 17:32:51 -07:00
Jacob Thornton
f852a71fc9 Merge branch 'master' of http://git.local.twitter.com/baseline 2011-06-27 17:32:24 -07:00
Jacob Thornton
0864bf3b7a chmod 2011-06-27 17:31:58 -07:00
Mark Otto
4392c95298 Merge branch 'master' of http://git.local.twitter.com/baseline 2011-06-27 17:15:28 -07:00
Mark Otto
243fc873d9 mucho updato around buttons to fix some stuff that was introduced with the bootstrap update 2011-06-27 17:15:26 -07:00
Jacob Thornton
9b5c2662e4 fix table-sorter link 2011-06-27 17:09:20 -07:00
Mark Otto
dd769f9a6e update to use latest version of bootstrap, docs cleanup, etc 2011-06-27 16:47:12 -07:00
Jacob Thornton
15a679e2d1 fancy scroll stuff and tiny js roundup/cleanup 2011-05-05 00:59:16 -07:00
Jacob Thornton
037bf9fec5 clean up org more 2011-05-04 23:49:31 -07:00
Jacob Thornton
96c3e70996 cleanup old stuff 2011-05-03 18:12:43 -07:00