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

687 Commits

Author SHA1 Message Date
Jacob Thornton
4c5320b18f Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	bootstrap-1.3.0.css
2011-09-12 14:29:29 -07:00
Jacob Thornton
997c2cd6a0 make file shouldn't say file built successfully if error occurs 2011-09-12 14:28:26 -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
7af4a4cfa1 really make modals cover topbars and not cover the modal itself 2011-09-12 13:32:46 -07:00
Mark Otto
bc41c58472 make modals cover topbars 2011-09-12 13:31:58 -07:00
Jacob Thornton
ad87e11f03 add version number to js comments 2011-09-12 11:15:32 -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
b729ade54f quick fix for .clearfix with unqualified selector in forms.less 2011-09-12 09:25:57 -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
Jacob Thornton
dcf9aabc44 get all spec passing again 2011-09-11 22:58:51 -07:00
Mark Otto
0c46ade4d0 Merge pull request #194 from samsoffes/patch-1
Add pretty code coloring to readme
2011-09-11 22:15:49 -07:00
Mark Otto
88f2f848b3 change modal buttons back to be primary first 2011-09-11 22:02:26 -07:00
Sam Soffes
86bb0733a2 Add pretty code coloring to readme 2011-09-11 21:56:54 -07:00
Mark Otto
c73533ac73 fix problem with error styles in forms that clashed with alert-messages by qualifying the .error with .clearfix 2011-09-11 21:43:23 -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
c876835a02 update preboot comments about color scheme 2011-09-11 20:47:35 -07:00
Mark Otto
96e59eed20 update theme.less todos and darken link hover color more 2011-09-11 20:46:40 -07:00
Mark Otto
af2223efb1 remove border from dropdowns in topbar to prevent it from looking 1px off 2011-09-11 20:38:45 -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
18a5ef83ef fix legends in ie7 2011-09-11 18:01:29 -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
709789d16d clicking open dropdown shoud close it 2011-09-10 22:28:17 -07:00