clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-28 22:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,232 Commits 116 Branches 89 Tags 631 MiB
09df780b75
Commit Graph

691 Commits

Author SHA1 Message Date
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
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
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
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
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