Commit Graph

524 Commits

Author SHA1 Message Date
Mark Otto
08d017592b Fix spelling mistake in pre on js page (/ul instead of /div). 2011-09-16 13:01:49 -07:00
Jacob Thornton
f03f7da08b fix readme link spacing 2011-09-16 12:30:30 -07:00
Jacob Thornton
cd556cfacd remake for version 1.3 2011-09-16 11:24:45 -07:00
Jacob Thornton
c7c5ce8dcd Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less
2011-09-16 11:24:07 -07:00
Jacob Thornton
aa43239088 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-16 11:09:46 -07:00
Jacob Thornton
f0d5caf054 check for jquery/ender on window 2011-09-16 11:09:26 -07:00
Mark Otto
e8d9eb264c update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing 2011-09-16 10:51:44 -07:00
Mark Otto
29033316e4 Merge pull request #219 from caniszczyk/1.3-wip
Merge in pull request to clarify docs licensing as CC BY 3.0
2011-09-16 10:37:52 -07:00
Chris Aniszczyk
08b6c47ad7 Clarify documentation license to be CC BY 3.0
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2011-09-16 10:30:47 -07:00
Mark Otto
597590c15d add active class back to tabs 2011-09-16 10:15:45 -07:00
Mark Otto
e663cfb43f fix tabs jitter bug when there is no active class 2011-09-16 10:14:35 -07:00
Mark Otto
c579e4d550 expanding comment in application.js 2011-09-16 09:55:12 -07:00
Mark Otto
8ff18a9ffc fixing conflict and recompiling 2011-09-16 09:47:36 -07:00
Mark Otto
b188c0da8b updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having 2011-09-16 09:41:58 -07:00
Jacob Thornton
d1b594db7a $(document).ready instead of $(function() {}) for ender support 2011-09-15 23:16:06 -07:00
Jacob Thornton
472632ba51 mv 1.3.0 file names to plane bootstrap.css for submodulers 2011-09-15 23:09:56 -07:00
Jacob Thornton
5675d8f00a remove table border seperate for ie 2011-09-15 22:40:50 -07:00
Jacob Thornton
39aca918d0 move clearfix logic back onto clearfix class for ie7 2011-09-15 22:36:32 -07:00
Jacob Thornton
68f89d109f little fixes for ie 7 2011-09-15 22:27:41 -07:00
Jacob Thornton
8896497ea8 update attributes for js and make tooltips reposition on resize 2011-09-15 21:19:39 -07:00
Mark Otto
dcf6a051e7 allow multi-select lists in forms 2011-09-14 08:58:20 -07:00
Mark Otto
32a690af98 apply clearfix to appended input pattern to clear the floats 2011-09-13 22:23:08 -07:00
Mark Otto
01d9cd88e8 updated browsers image 2011-09-13 20:24:30 -07:00
Mark Otto
2af3eb6ce2 fix tab-content and pre funkiness, convert p in tab content to div 2011-09-13 14:47:18 -07:00
Mark Otto
121b62d54e updates to docs to include more example html, include links to javascript docs where necessary 2011-09-13 10:08:24 -07:00
Mark Otto
35bc3ae8d2 remove theming section from docs 2011-09-13 09:44:43 -07:00
Mark Otto
1d50fa77e4 adding quick and dirty favicons and touch icons for iOS 2011-09-13 09:35:43 -07:00
Mark Otto
bc2ae90e3a Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 22:19:44 -07:00
Mark Otto
5249483850 comment out box-shadow on masthead and footer in docs.css because Opera sucks at inset box-shadow :" 2011-09-12 22:19:28 -07:00
Jacob Thornton
e34bc6e294 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 21:06:53 -07:00
Jacob Thornton
5ee11ec8bd fix docs for opera 2011-09-12 21:06:29 -07:00
Mark Otto
206334ba70 remove theme.less and split preboot.less to mixins.less and variables.less to isolate customization from function 2011-09-12 20:07:26 -07:00
Mark Otto
2978934bd5 remove adaptive, recomment theme.less to avoid comments in compiled 2011-09-12 19:40:48 -07:00
Mark Otto
218976a7d8 resolve conflict 2011-09-12 19:00:59 -07:00
Mark Otto
3f64aaf82b fix topbar link with button bug 2011-09-12 19:00:44 -07:00
Mark Otto
427a001c47 Link Twitter account in readme 2011-09-12 14:33:39 -07:00
Mark Otto
a218475ffc Edited README.md via GitHub 2011-09-12 14:33:00 -07:00
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