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

676 Commits

Author SHA1 Message Date
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
39fc13093e Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 14:04:51 -07:00
Jacob Thornton
5f65df9e2d add some more events to alerts and modal and update docs 2011-09-10 14:04:22 -07:00
Mark Otto
6d99ae5659 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 13:18:24 -07:00
Mark Otto
e5b4a1ced5 adding .brand to topbar for alternative to using an h3 for wordmark; spelling mistakes fixed 2011-09-10 13:18:10 -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
Jacob Thornton
1041977d0a finish up rounding out tests for all js plugins 2011-09-10 13:17:08 -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
a40690a17c fix the grid before 1.3.0 drops soon 2011-09-09 20:48:45 -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
Mark Otto
df3ca4d94a Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-09 00:03:01 -07:00
Mark Otto
1d4e345ec1 bug fixing 2011-09-09 00:02:47 -07:00
Jacob Thornton
b086d94253 remove aria-control stuff 2011-09-09 00:00:03 -07:00
Mark Otto
3a99b98ad9 make dropdown menus appear above other elements on the page with a z-index 2011-09-08 23:08:38 -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
Jacob Thornton
43b01d1b80 Merge pull request #149 from yury/version_var
use VERSION var in build script
2011-09-03 23:12:36 -07:00
Mark Otto
7882f0f64b adding temp theme file to help with customization; still needs work 2011-09-03 22:53:21 -07:00
yury
fe8cb55cc1 use @VERSION var in build script 2011-09-03 20:10:42 +04: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