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

73 Commits

Author SHA1 Message Date
Jacob Thornton
a8d4475827 adds twipsy js to regular index for positioning 2011-09-10 14:52:45 -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
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
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
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
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
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
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
ed96f181c8 add topbar dropdown js 2011-08-27 21:46:50 -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
5193619ab0 clean up redundant google prettify code 2011-08-26 10:53:21 -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
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
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
Jacob Thornton
fef3672ad3 update copy for browser support 2011-08-21 22:48:01 -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
dd92f4e6e2 hide overflow for ie 7 2011-08-21 21:26:15 -07:00
Mark Otto
a98d2cccb8 merge in master, resolve conflicts 2011-08-21 20:47:24 -07:00
Jacob Thornton
48c3c6f1b6 make topbar .fill wrap 2011-08-21 18:14:53 -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
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
aaf9f752c4 docs spacing, spare divs in a few places, updating css spacing 2011-08-20 23:25:22 -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
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
Jacob Thornton
f1a6972281 fix drag knob in firefox #7 2011-08-19 20:37:12 -07:00
Mark Otto
5c687ee393 remove ds stores 2011-08-17 22:26:22 -07:00
Jacob Thornton
7f99892b86 change popover stufff 2011-07-28 17:50:38 -07:00
Mark Otto
3117fc979d getting popovers in 2011-07-01 23:10:39 -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
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
460a84a926 Updated offset columns, fix app.js bug, misc tweaks to copy 2011-06-30 15:56:25 -07:00