rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity
2,905 Commits 108 Branches 89 Tags 547 MiB
46c10c8b58
Commit Graph

2905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
a9bf1e6e35 fixes #3900: nudge badges in buttons up 1px 2012-07-30 13:25:27 -07:00
Mark Otto
1f30faac73 Merge pull request #4229 from conzett/master 
Add 'dist' directory to .gitignore
 2012-07-30 13:08:29 -07:00
Mark Otto
b2ebd5c46c update button styles to use updated 14px base font size, align carets to others with no opacity changes 2012-07-30 12:52:44 -07:00
Mark Otto
7fa99fb1fe fix navbar form alignment, and update examples to show these cases 2012-07-30 12:15:08 -07:00
Graham Conzett
178397ae5e Add 'dist' directory to .gitignore 
Allows you to keep a 'dist' directory in the repository as a target build location.
This can be useful if you have bootstrap as a submodule in a project and want to build it,
but still keep it self-contained. Similar to how jQuery does their default builds:
https://github.com/jquery/jquery/#how-to-build-your-own-jquery
 2012-07-30 14:10:01 -04:00
Mark Otto
6bf661aceb new fav and touch icons to match new masthead 2012-07-30 10:33:48 -07:00
Mark Otto
04164e4367 fixes #3858: add var for responsive navbar. also add additional examples to navbar docs 2012-07-30 10:25:04 -07:00
Mark Otto
b63543181a fix examples collapse classes, rename navbar-redux to navbar and delete the old one 2012-07-30 10:08:27 -07:00
Mark Otto
cfac4bb59d fixes #4221: correct border-collapse property for IE7 hack 2012-07-29 23:51:40 -07:00
Mark Otto
84a9c74efd fix footer in responsive 2012-07-29 23:51:18 -07:00
Mark Otto
22a9a83656 fixes #3694: provide override classes for .hide and .pull-right for grid columns 2012-07-29 16:51:24 -07:00
Mark Otto
d63ebe3f3c more breadcrumb tweaks for contrast 2012-07-29 16:37:37 -07:00
Mark Otto
87ce3489d3 remove gradient, border, and box-shadow from .breadcrumb to differentiate from nav and buttons 2012-07-29 16:25:20 -07:00
Mark Otto
761429d88a Merge branch '2.1.0-wip-navbar' into 2.1.0-wip 2012-07-29 16:24:05 -07:00
Mark Otto
134d11b528 use shorthand on form field transitions for box-shadow mixin 2012-07-29 12:10:29 -07:00
Mark Otto
e56a700849 fixes #4210: indenting on hero example 2012-07-29 12:07:18 -07:00
Mark Otto
5184da39f4 clear out docs assets, update and png crush features image 2012-07-29 00:44:55 -07:00
Mark Otto
a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -07:00
Mark Otto
fe6a4b0b54 add .btn-block for a full-width button option 2012-07-27 15:42:58 -07:00
Mark Otto
16b4ac0d8f add docs for sub menu support on dropdowns, add caret via :after to submenu toggles 2012-07-27 10:35:15 -07:00
Mark Otto
9d5c431223 add basic support for sub menus in dropdown menus 2012-07-27 10:06:54 -07:00
Mark Otto
1e9b450619 add image styles, for now to scaffolding (soon to own file) 2012-07-27 00:06:43 -07:00
Mark Otto
6474190746 increase height of homepage jumbotron, update vars and styles of popovers 2012-07-26 23:42:36 -07:00
Mark Otto
79067721b1 fix js docs formatting 2012-07-26 23:21:06 -07:00
Mark Otto
4bb2a13776 rerun make 2012-07-26 21:45:30 -07:00
Mark Otto
f75277e62d indenting and such 2012-07-26 21:45:19 -07:00
Mark Otto
880bdbc4dd simplify styles for bs docs nav 2012-07-24 16:07:25 -07:00
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
7ce048bccd Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-23 23:57:13 -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
♒∆✝
802ced9ca5 Merge pull request #4166 from jonathansampson/2.1.0-wip 
IE10 uses 'transition' and 'transitionend'
 2012-07-23 23:15:46 -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
Jonathan Sampson
2a0cf0f131 IE10 uses 'transition' and 'transitionend' 
msTransition, while supported in IE, should be ignored in favor of the
unprefixed property. Additionally, MSTransitionEnd should also be
ignored in favor of the unprefixed event transitionend.

Current unit test requires no attention in light of this change.

MSDN:
http://msdn.microsoft.com/en-us/library/ie/hh673535(v=vs.85).aspx#transitions_dom_events
 2012-07-24 01:50:38 -04:00
Mark Otto
0dda2c4659 make docs scroll over jumbotrons, but only for 980px up 2012-07-23 22:36:08 -07:00
Jacob Thornton
614d52bd7f delete this test for now - as affix is still heavily underdevelopment 2012-07-23 18:17:43 -07:00
Jacob Thornton
5247b15411 following #4148 2012-07-23 18:12:23 -07:00
♒∆✝
685785d2c2 Merge pull request #4159 from ixti/opera11-transitions-fix 
Fix transition end name for opera 11+12
 2012-07-23 17:58:38 -07:00