]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoFix typo on JavaScript documentation 6944/head
Can Burak Cilingir [Fri, 15 Feb 2013 10:47:34 +0000 (18:47 +0800)] 
Fix typo on JavaScript documentation

12 years agoFixes #6941: add alt attribute to images
Mark Otto [Fri, 15 Feb 2013 07:55:04 +0000 (23:55 -0800)] 
Fixes #6941: add alt attribute to images

12 years agofix spelling as pointed out by @jodytate that got nuked in the merge
Mark Otto [Fri, 15 Feb 2013 07:51:35 +0000 (23:51 -0800)] 
fix spelling as pointed out by @jodytate that got nuked in the merge

12 years agorearrange readme
Mark Otto [Fri, 15 Feb 2013 07:48:29 +0000 (23:48 -0800)] 
rearrange readme

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 15 Feb 2013 07:44:50 +0000 (23:44 -0800)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
docs/examples/sticky-footer-navbar.html
docs/examples/sticky-footer.html

12 years agoMerge branch 'bs3_jekyll' into 3.0.0-wip
Mark Otto [Fri, 15 Feb 2013 07:42:47 +0000 (23:42 -0800)] 
Merge branch 'bs3_jekyll' into 3.0.0-wip

Conflicts:
docs/css.html
docs/templates/pages/css.mustache

12 years agoMake example pages use Jekyll; add sticky footer navbar image to examples 6925/head
Mark Otto [Fri, 15 Feb 2013 07:38:00 +0000 (23:38 -0800)] 
Make example pages use Jekyll; add sticky footer navbar image to examples

12 years agono need for scrollspy in example template
Mark Otto [Fri, 15 Feb 2013 07:07:36 +0000 (23:07 -0800)] 
no need for scrollspy in example template

12 years agoUpdate makefile
Mark Otto [Fri, 15 Feb 2013 06:57:25 +0000 (22:57 -0800)] 
Update makefile

12 years agoConvert JS page to pygments; nuke prettify assets
Mark Otto [Fri, 15 Feb 2013 06:33:26 +0000 (22:33 -0800)] 
Convert JS page to pygments; nuke prettify assets

12 years agoconvert components code examples to pygments
Mark Otto [Fri, 15 Feb 2013 05:42:33 +0000 (21:42 -0800)] 
convert components code examples to pygments

12 years agopygmentize the rest of the css page
Mark Otto [Fri, 15 Feb 2013 00:43:50 +0000 (16:43 -0800)] 
pygmentize the rest of the css page

12 years agoSpecify new local URL
Mark Otto [Fri, 15 Feb 2013 00:17:16 +0000 (16:17 -0800)] 
Specify new local URL

12 years agoMerge pull request #6936 from jodytate/3.0.0-wip
Mark Otto [Thu, 14 Feb 2013 21:59:05 +0000 (13:59 -0800)] 
Merge pull request #6936 from jodytate/3.0.0-wip

minor update to sticky-footer examples

12 years agoUpdate docs/examples/sticky-footer.html 6936/head
jody tate [Thu, 14 Feb 2013 21:30:22 +0000 (13:30 -0800)] 
Update docs/examples/sticky-footer.html

again, "it's" to "its" for grammar fun!

12 years agoUpdate docs/examples/sticky-footer-navbar.html
jody tate [Thu, 14 Feb 2013 21:26:52 +0000 (13:26 -0800)] 
Update docs/examples/sticky-footer-navbar.html

contraction "it's" to possessive "its", aka pedantic grammar fix

12 years agopygmentize grid section; update bs-docs-example corners
Mark Otto [Thu, 14 Feb 2013 08:43:43 +0000 (00:43 -0800)] 
pygmentize grid section; update bs-docs-example corners

12 years agotwerk dat manni pygment style
Mark Otto [Thu, 14 Feb 2013 08:39:32 +0000 (00:39 -0800)] 
twerk dat manni pygment style

12 years agoStart pygmentizing css.html; add new theme for pygments
Mark Otto [Thu, 14 Feb 2013 08:23:23 +0000 (00:23 -0800)] 
Start pygmentizing css.html; add new theme for pygments

12 years agoStart using some includes; test out some pygments highlighting
Mark Otto [Thu, 14 Feb 2013 07:37:08 +0000 (23:37 -0800)] 
Start using some includes; test out some pygments highlighting

12 years agoupdate readme to point to getting started page; twerk link
Mark Otto [Thu, 14 Feb 2013 06:01:34 +0000 (22:01 -0800)] 
update readme to point to getting started page; twerk link

12 years agoreadme improvements
Mark Otto [Thu, 14 Feb 2013 04:01:36 +0000 (20:01 -0800)] 
readme improvements

12 years agoupdate readme to reflect jekyll docs and local npm install method
Mark Otto [Wed, 13 Feb 2013 20:51:25 +0000 (12:51 -0800)] 
update readme to reflect jekyll docs and local npm install method

12 years agomake same css docs fix from upstream
Mark Otto [Wed, 13 Feb 2013 20:32:29 +0000 (12:32 -0800)] 
make same css docs fix from upstream

12 years agoupdate makefile to work again; gitignore the compiled docs _gh_pages folder; test...
Mark Otto [Wed, 13 Feb 2013 20:30:56 +0000 (12:30 -0800)] 
update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg

12 years agoRestore gallery page, add active nav class jankitude, auto regenerate docs on file...
Mark Otto [Wed, 13 Feb 2013 19:48:22 +0000 (11:48 -0800)] 
Restore gallery page, add active nav class jankitude, auto regenerate docs on file save

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Wed, 13 Feb 2013 19:28:00 +0000 (11:28 -0800)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agorearrange jekyll and docs
Mark Otto [Tue, 12 Feb 2013 20:44:41 +0000 (12:44 -0800)] 
rearrange jekyll and docs

12 years agoupdate makefile to work given nuked docs dir
Mark Otto [Tue, 12 Feb 2013 20:27:18 +0000 (12:27 -0800)] 
update makefile to work given nuked docs dir

12 years agonuke what we don't need for jekyll
Mark Otto [Tue, 12 Feb 2013 20:25:05 +0000 (12:25 -0800)] 
nuke what we don't need for jekyll

12 years agoconvert to jekyll
Mark Otto [Tue, 12 Feb 2013 20:16:32 +0000 (12:16 -0800)] 
convert to jekyll

12 years agonuke dat extend docs page
Mark Otto [Tue, 12 Feb 2013 05:38:44 +0000 (21:38 -0800)] 
nuke dat extend docs page

12 years agoMerge pull request #6863 from devknoll/fix-css-docs
Mark Otto [Sat, 9 Feb 2013 07:28:18 +0000 (23:28 -0800)] 
Merge pull request #6863 from devknoll/fix-css-docs

Fix the Star glyphicon in the CSS docs

12 years agoFix the Star glyphicon in the CSS docs 6863/head
Gerald Monaco [Sat, 9 Feb 2013 00:52:50 +0000 (19:52 -0500)] 
Fix the Star glyphicon in the CSS docs

12 years agoFixes #6852: add cursor pointer to carousel indicators
Mark Otto [Fri, 8 Feb 2013 17:56:04 +0000 (09:56 -0800)] 
Fixes #6852: add cursor pointer to carousel indicators

12 years agoFixes #6841: Add new Firefox placeholder, comments
Mark Otto [Fri, 8 Feb 2013 16:32:29 +0000 (08:32 -0800)] 
Fixes #6841: Add new Firefox placeholder, comments

12 years agoFixes #6837: Enable text alignment utility classes on tables
Mark Otto [Fri, 8 Feb 2013 16:24:10 +0000 (08:24 -0800)] 
Fixes #6837: Enable text alignment utility classes on tables

* Removes text-align from td elements (no need to set that one)
* Specifically sets th to text-align: left; at a global level (no longer within .table) to override browser defaults
* Removes font-weight: bold; from th while we're at it since that's browser default already

12 years agoclean up responsive docs and global css styles
Mark Otto [Fri, 8 Feb 2013 08:13:44 +0000 (00:13 -0800)] 
clean up responsive docs and global css styles

12 years agoMerge branch 'master' into 3.0.0-wip
Mark Otto [Fri, 8 Feb 2013 06:18:53 +0000 (22:18 -0800)] 
Merge branch 'master' into 3.0.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js

12 years agoMerge branch '2.3.0-wip' v2.3.0
fat [Fri, 8 Feb 2013 06:13:13 +0000 (22:13 -0800)] 
Merge branch '2.3.0-wip'

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 6346/head
Mark Otto [Fri, 8 Feb 2013 06:08:13 +0000 (22:08 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoadd 2.3 changelog section
Mark Otto [Fri, 8 Feb 2013 06:08:04 +0000 (22:08 -0800)] 
add 2.3 changelog section

12 years agoremove prevent default on focus
fat [Fri, 8 Feb 2013 05:42:34 +0000 (21:42 -0800)] 
remove prevent default on focus

12 years agoonly fire hidden once backdrop has been removed
fat [Fri, 8 Feb 2013 04:13:40 +0000 (20:13 -0800)] 
only fire hidden once backdrop has been removed

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
fat [Fri, 8 Feb 2013 03:47:01 +0000 (19:47 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js

12 years agoif no callback, don't try to call callback ya goof
fat [Fri, 8 Feb 2013 03:45:42 +0000 (19:45 -0800)] 
if no callback, don't try to call callback ya goof

12 years agofix js from @fat feedback for modal
Mark Otto [Fri, 8 Feb 2013 03:38:46 +0000 (19:38 -0800)] 
fix js from @fat feedback for modal

12 years agoremove modal test file
Mark Otto [Fri, 8 Feb 2013 03:34:23 +0000 (19:34 -0800)] 
remove modal test file

12 years agoupdate example code
Mark Otto [Fri, 8 Feb 2013 03:34:06 +0000 (19:34 -0800)] 
update example code

12 years agonuke that whitespace
Mark Otto [Fri, 8 Feb 2013 03:32:30 +0000 (19:32 -0800)] 
nuke that whitespace

12 years agofinish modal tweaks 6830/head
Mark Otto [Fri, 8 Feb 2013 03:31:12 +0000 (19:31 -0800)] 
finish modal tweaks

12 years agoupdate docs modals
Mark Otto [Fri, 8 Feb 2013 03:21:56 +0000 (19:21 -0800)] 
update docs modals

12 years agoadd new modal to docs example
Mark Otto [Fri, 8 Feb 2013 03:00:48 +0000 (19:00 -0800)] 
add new modal to docs example

12 years agoFixes #6823: add some docs notes about tooltips in input groups
Mark Otto [Thu, 7 Feb 2013 01:25:58 +0000 (17:25 -0800)] 
Fixes #6823: add some docs notes about tooltips in input groups

12 years agoMerge pull request #6813 from Yohn/patch-12
Mark Otto [Wed, 6 Feb 2013 21:19:50 +0000 (13:19 -0800)] 
Merge pull request #6813 from Yohn/patch-12

don't remove title attribute for tooltips for 2.3-wip

12 years agounit tests 6813/head
Yohn [Wed, 6 Feb 2013 11:20:05 +0000 (06:20 -0500)] 
unit tests

12 years agodont remove title attribute part 2
Yohn [Wed, 6 Feb 2013 11:17:48 +0000 (06:17 -0500)] 
dont remove title attribute part 2

12 years agoOverhaul modal to make it responsive and not super lame
Mark Otto [Wed, 6 Feb 2013 10:07:40 +0000 (02:07 -0800)] 
Overhaul modal to make it responsive and not super lame

12 years agoMerge branch '2.3.0-wip' into 3.0.0-wip
Mark Otto [Wed, 6 Feb 2013 06:47:00 +0000 (22:47 -0800)] 
Merge branch '2.3.0-wip' into 3.0.0-wip

12 years agoUpdate link to changelog
Mark Otto [Wed, 6 Feb 2013 06:46:45 +0000 (22:46 -0800)] 
Update link to changelog

12 years agoMerge branch '2.3.0-wip' into 3.0.0-wip
Mark Otto [Wed, 6 Feb 2013 06:42:54 +0000 (22:42 -0800)] 
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.less

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
fat [Wed, 6 Feb 2013 06:30:54 +0000 (22:30 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js

12 years agoclean up styles
fat [Wed, 6 Feb 2013 06:29:59 +0000 (22:29 -0800)] 
clean up styles

12 years agoport docs fix from 2.3.0-wip to new css page
Mark Otto [Wed, 6 Feb 2013 06:29:01 +0000 (22:29 -0800)] 
port docs fix from 2.3.0-wip to new css page

12 years agoFixes #6808: mention IE lame-itude in docs for invalid inputs
Mark Otto [Wed, 6 Feb 2013 06:28:18 +0000 (22:28 -0800)] 
Fixes #6808: mention IE lame-itude in docs for invalid inputs

12 years agoFixes #6190: Add print utility classes
Mark Otto [Wed, 6 Feb 2013 06:17:28 +0000 (22:17 -0800)] 
Fixes #6190: Add print utility classes

12 years agoMerge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip
fat [Wed, 6 Feb 2013 06:10:41 +0000 (22:10 -0800)] 
Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip

12 years agoMerge pull request #6783 from joprice/popoverOptionsOverride
fat-kun [Wed, 6 Feb 2013 05:48:34 +0000 (21:48 -0800)] 
Merge pull request #6783 from joprice/popoverOptionsOverride

reordered access of options in tooltip and popover

12 years agoMerge pull request #6780 from agatronic/2.3.0-wip
fat-kun [Wed, 6 Feb 2013 05:29:59 +0000 (21:29 -0800)] 
Merge pull request #6780 from agatronic/2.3.0-wip

less: Move to new selector interpolation, supported from 1.3.1

12 years agoscrewed up a merge and an old version number crept in
Mark Otto [Wed, 6 Feb 2013 05:20:29 +0000 (21:20 -0800)] 
screwed up a merge and an old version number crept in

12 years agodon't hide if already hidden ya n00b
fat [Wed, 6 Feb 2013 05:08:56 +0000 (21:08 -0800)] 
don't hide if already hidden ya n00b

12 years agoadd codecademy to gallery
Mark Otto [Wed, 6 Feb 2013 05:07:30 +0000 (21:07 -0800)] 
add codecademy to gallery

12 years agoDat compression
Mark Otto [Wed, 6 Feb 2013 05:05:24 +0000 (21:05 -0800)] 
Dat compression

12 years agoUpdate homepage examples, add hella new sites to gallery
Mark Otto [Wed, 6 Feb 2013 05:04:46 +0000 (21:04 -0800)] 
Update homepage examples, add hella new sites to gallery

12 years agoWhite navbar brand text for inverted navbar
Mark Otto [Wed, 6 Feb 2013 04:39:09 +0000 (20:39 -0800)] 
White navbar brand text for inverted navbar

12 years agoclear interval in cycle + rebuild
fat [Wed, 6 Feb 2013 04:34:39 +0000 (20:34 -0800)] 
clear interval in cycle + rebuild

12 years agoMerge pull request #6481 from pseidemann/patch-1
fat-kun [Wed, 6 Feb 2013 04:13:57 +0000 (20:13 -0800)] 
Merge pull request #6481 from pseidemann/patch-1

don't remove title attribute for tooltips

12 years agoMerge pull request #6488 from nanek/dropdowns-remove-touchstart
fat-kun [Wed, 6 Feb 2013 04:08:42 +0000 (20:08 -0800)] 
Merge pull request #6488 from nanek/dropdowns-remove-touchstart

Remove touchstart from bootstrap-dropdown.js.

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
fat [Wed, 6 Feb 2013 04:01:25 +0000 (20:01 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoupdate jquery to 1.9
fat [Wed, 6 Feb 2013 04:00:50 +0000 (20:00 -0800)] 
update jquery to 1.9

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Mark Otto [Wed, 6 Feb 2013 03:59:25 +0000 (19:59 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agonuke rogue conflict comment and remake
Mark Otto [Wed, 6 Feb 2013 03:59:02 +0000 (19:59 -0800)] 
nuke rogue conflict comment and remake

12 years agoMerge branch '2.3.0-wip' into 3.0.0-wip
Mark Otto [Wed, 6 Feb 2013 03:53:44 +0000 (19:53 -0800)] 
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/examples/hero.html
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/labels-badges.less
less/mixins.less
less/navbar.less
less/navs.less
less/pagination.less
less/responsive-navbar.less
less/scaffolding.less
less/sprites.less
less/thumbnails.less
less/type.less

12 years agoderp, fix broke css and recompile
Mark Otto [Wed, 6 Feb 2013 03:43:49 +0000 (19:43 -0800)] 
derp, fix broke css and recompile

12 years agorestore comma between selectors
Mark Otto [Wed, 6 Feb 2013 03:40:32 +0000 (19:40 -0800)] 
restore comma between selectors

12 years agoMerge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhl...
Mark Otto [Wed, 6 Feb 2013 03:39:49 +0000 (19:39 -0800)] 
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip

Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less

12 years agoMerge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8
fat-kun [Wed, 6 Feb 2013 03:22:34 +0000 (19:22 -0800)] 
Merge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8

Fix tooltip positioning for IE8 broken in 2.3.0

12 years agosimplify media docs
Mark Otto [Tue, 5 Feb 2013 09:12:39 +0000 (01:12 -0800)] 
simplify media docs

12 years agoreorganize progress bars docs
Mark Otto [Tue, 5 Feb 2013 09:11:41 +0000 (01:11 -0800)] 
reorganize progress bars docs

12 years agosimpler alerts docs
Mark Otto [Tue, 5 Feb 2013 09:07:43 +0000 (01:07 -0800)] 
simpler alerts docs

12 years agomo betta thumbnails docs
Mark Otto [Tue, 5 Feb 2013 09:01:23 +0000 (01:01 -0800)] 
mo betta thumbnails docs

12 years agoreorder counters docs
Mark Otto [Tue, 5 Feb 2013 08:59:22 +0000 (00:59 -0800)] 
reorder counters docs

12 years agopagination docs cleanup
Mark Otto [Tue, 5 Feb 2013 08:54:48 +0000 (00:54 -0800)] 
pagination docs cleanup

12 years agosimpler breadcrumbs docs
Mark Otto [Tue, 5 Feb 2013 08:51:19 +0000 (00:51 -0800)] 
simpler breadcrumbs docs

12 years agoIncrease margins and line-height on h3; overhaul button dropdown docs
Mark Otto [Tue, 5 Feb 2013 08:49:54 +0000 (00:49 -0800)] 
Increase margins and line-height on h3; overhaul button dropdown docs

12 years agoAdd justified button groups for link buttons; reorganize dropdowns and button groups...
Mark Otto [Tue, 5 Feb 2013 08:30:03 +0000 (00:30 -0800)] 
Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections

12 years agoForgot to remove base-css.mustache
Mark Otto [Tue, 5 Feb 2013 08:22:20 +0000 (00:22 -0800)] 
Forgot to remove base-css.mustache

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Mark Otto [Mon, 4 Feb 2013 19:25:46 +0000 (11:25 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoRemove base-css.html after recent merges
Mark Otto [Mon, 4 Feb 2013 19:12:32 +0000 (11:12 -0800)] 
Remove base-css.html after recent merges

12 years agoMerge branch '2.3.0-wip' into 3.0.0-wip
Mark Otto [Mon, 4 Feb 2013 19:12:09 +0000 (11:12 -0800)] 
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
docs/assets/css/bootstrap.css
less/type.less