rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-10 03:46:13 +01:00
Code Issues Actions Packages Releases Activity
13,541 Commits 108 Branches 89 Tags
Commit Graph

6349 Commits

Author SHA1 Message Date
Jacob Thornton
c10a357bb3 don't bite so hard 2012-07-24 12:57:00 -07:00
Mark Otto
fa6a131eb6 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-24 01:53:45 -07:00
Mark Otto
b7b4fd5c82 wrap footer in bs docs canvas for scrolling doodad 2012-07-24 01:53:32 -07:00
Mark Otto
7590e65f6f fix search form, mostly in navbar 2012-07-24 01:44:12 -07:00
Jacob Thornton
e2fc202df2 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-24 00:49:19 -07:00
Jacob Thornton
c98b75c979 added fade out on scroll - we can pull this if you prefer it 2012-07-24 00:48:45 -07:00
Mark Otto
394922a1bf Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-24 00:44:20 -07:00
Mark Otto
87aa61001e fixes #4118: responsive modal gets width auto and improved positioning for narrower widths 2012-07-24 00:44:11 -07:00
Mark Otto
c37aa99e28 modal heading line-height 2012-07-24 00:37:19 -07:00
Mark Otto
4912dd441d fix h3 in modal and make modal unhidden by removing important from earlier issue 2012-07-24 00:35:54 -07:00
Jacob Thornton
e38fa4b1f4 fix scroll thinggg 2012-07-24 00:30:58 -07:00
Jacob Thornton
5b2f2ed821 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache
 2012-07-24 00:24:25 -07:00
Jacob Thornton
4ea7c47235 slightly fix side bar 2012-07-24 00:21:40 -07:00
Mark Otto
cd441e082f fixes #4156: don't override border radius if stacked nav has one child 2012-07-23 23:56:13 -07:00
Mark Otto
6245886b26 tweak docs shadows 2012-07-23 23:54:26 -07:00
Mark Otto
f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
 2012-07-23 23:01:38 -07:00
Mark Otto
0dda2c4659 make docs scroll over jumbotrons, but only for 980px up 2012-07-23 22:36:08 -07:00
Mark Otto
5b8838aeac more alignment fixes for customize page 2012-07-23 12:51:48 -07:00
Jacob Thornton
dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
Jacob Thornton
fa1e1e34df Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-22 14:52:13 -07:00
Jacob Thornton
fae6c36874 adds minLength #3960 2012-07-22 14:50:52 -07:00
♒∆✝
48fc0ad569 Merge pull request #4104 from lookfirst/2.1.0-wip-fix-destroy 
namespace the events for popover/tooltip
 2012-07-22 14:40:09 -07:00
Jon Stevens
d76c899142 remove the ns option 2012-07-22 14:36:23 -07:00
Mark Otto
b9105b98f9 move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons 2012-07-20 22:06:47 -07:00
Mark Otto
ee750bbce1 tweak docs masthead links hover 2012-07-20 21:38:28 -07:00
Jon Stevens
117f65d431 on destroy, also hide. issue #3880, pull #4104 2012-07-20 09:47:12 -07:00
Mark Otto
1d4660beea nuke commented out code from last fix 2012-07-19 21:25:42 -07:00
Mark Otto
3c1a0fbda4 fixes #4103: simpler fix for tfoot in .table-border 2012-07-19 21:25:24 -07:00
Mark Otto
89d7ec5290 fixes #4102: properly round top left corners of .table-border with caption/colgroup; also fix css tests page layout and footer 2012-07-19 21:06:42 -07:00
Mark Otto
6c23fff4d6 misc docs content changes 2012-07-18 01:06:52 -07:00
Mark Otto
c8fa2600f2 copy change 2012-07-17 23:38:29 -07:00
Mark Otto
aac3736eea fixes #3845: add .btn-link for transparent buttons styled as links 2012-07-17 23:32:52 -07:00
Mark Otto
cb1a59caa0 Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip 
Conflicts:
	docs/base-css.html
	docs/templates/pages/base-css.mustache
 2012-07-17 23:14:58 -07:00
Mark Otto
ba90d0fc5e Merge pull request #4110 from purwandi/develop 
Moved JS to bottom on extends page
 2012-07-17 22:44:26 -07:00
Mark Otto
326b665065 de-scope nav-header from .nav 2012-07-17 22:40:38 -07:00
Purwandi
a8316c780d Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into develop 2012-07-18 12:33:16 +07:00
Mark Otto
39f8996d6a fix dropdown vars and make hover state be link color again, add gradient to dropdown link hovers, fix caret positions and active states on nav tabs, tweak nav link padding 2012-07-17 22:26:53 -07:00
Purwandi
51c9fa1697 Moved JS to bottom on extends page 2012-07-18 12:19:02 +07:00
Mark Otto
6a663081a7 remove separate examples page, add to getting started page 2012-07-17 21:45:57 -07:00
Mark Otto
a1ad6d124a Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip 
Conflicts:
	docs/extend.html
	docs/templates/pages/extend.mustache
 2012-07-17 20:57:20 -07:00
Mark Otto
62f6368344 center masthead bg pattern 2012-07-17 20:22:55 -07:00
Mark Otto
25bc298aff pngcrush masthead pattern to save 10k 2012-07-17 19:55:02 -07:00
Mark Otto
4008d666a5 new pattern for masthead 2012-07-17 19:54:29 -07:00
Mark Otto
16fa610ea4 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-17 19:11:51 -07:00
Mark Otto
478396fd4e remove list-type declarations from ul and ol elements since those should just use browser defaults 2012-07-17 19:11:41 -07:00
Jon Stevens
2ee9b2717b namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880 2012-07-16 16:01:11 -07:00
Ben Oakes
426e7d9fbd Compiled; ignoring bootstrap.css change to avoid conflicts 2012-07-16 09:31:18 -04:00
Ben Oakes
9581cbfe32 Two of the three apps are for Linux/Windows; adjust accordingly 2012-07-16 09:29:49 -04:00
Mark Otto
40ab928315 Merge pull request #4083 from martinbean/2.1.0-wip 
Moved JS to bottom as per best practices
 2012-07-15 16:26:42 -07:00
Mark Otto
e20d2dfe9d docs cleanup and blockquote cleanup for .pull-right option 2012-07-15 16:13:25 -07:00