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

11629 Commits

Author SHA1 Message Date
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
Jonathan Ingram
5de1e39a8f From #822 2011-12-22 16:41:26 +11:00
Jacob Thornton
efacac0d6c clean up all the js across all the doc pages 2011-12-21 18:42:43 -08:00
Jacob Thornton
6d5b506517 minor cleanups 2011-12-21 17:38:05 -08:00
Mark Otto
690d3f4d1a remove inline input field CSS since that's not required as all inputs are inline-block anyway 2011-12-21 19:32:14 -06:00
Mark Otto
369cedd87c update comment on select bg bug and confirmed it was fixed, scoped responsive .span* to .row 2011-12-21 19:31:01 -06: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
00cbadf994 update thumbnails to keep images from going past edges of thumbnails 2011-12-21 18:21:55 -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
c4364285e4 add default margin for popover and twipsy 2011-12-20 22:12:23 -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
Jacob Thornton
e71a532185 Merge pull request #808 from piscis/patch-1
changed npm package name to less
2011-12-14 16:06:17 -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
95048c271e fix specificity on pills 2011-12-11 01:03:57 -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
d2e56ad53d unstyle image inputs 2011-12-10 22:29:49 -08:00
Mark Otto
d587845149 tweaks and increase specificity of pills and active classes 2011-12-10 22:21:08 -08:00
Jacob Thornton
2dd0db8aa3 Merge pull request #773 from cgunther/label-in-dropdown-menu
Fix: remove text-shadow from labels
2011-12-10 15:21:27 -08:00
Jacob Thornton
a0270dc7d2 Merge pull request #778 from talltroym/master
Add code block for condensed table example
2011-12-10 15:19:49 -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
4d55356e9b remove uber large responsive stuff 2011-12-09 14:39:23 -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
Chris Gunther
40604548ce remove text-shadow from labels 2011-12-07 20:16:19 -05:00