]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agoUse ref instead of label when checking branches in issue-guidelines 4241/head
Kyle Robinson Young [Tue, 31 Jul 2012 22:16:40 +0000 (15:16 -0700)] 
Use ref instead of label when checking branches in issue-guidelines

13 years agocopy edits to docs
Mark Otto [Tue, 31 Jul 2012 07:06:37 +0000 (00:06 -0700)] 
copy edits to docs

13 years agoreorder docs css
Mark Otto [Tue, 31 Jul 2012 07:01:04 +0000 (00:01 -0700)] 
reorder docs css

13 years agoplace chevrons first in sidenav in docs, fix ie7 bugs for said sidenav
Mark Otto [Tue, 31 Jul 2012 06:48:26 +0000 (23:48 -0700)] 
place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav

13 years agofixes #3615: remove last-child hack for IE7 since IE7 doesn't support :last-child
Mark Otto [Tue, 31 Jul 2012 05:26:54 +0000 (22:26 -0700)] 
fixes #3615: remove last-child hack for IE7 since IE7 doesn't support :last-child

13 years agoremove position from labels/badges in mini btns
Mark Otto [Mon, 30 Jul 2012 22:54:03 +0000 (15:54 -0700)] 
remove position from labels/badges in mini btns

13 years agofix download page links
Mark Otto [Mon, 30 Jul 2012 22:52:38 +0000 (15:52 -0700)] 
fix download page links

13 years agofixes #3665: ensure inputs in a fluid row maintain grid sizing
Mark Otto [Mon, 30 Jul 2012 22:38:36 +0000 (15:38 -0700)] 
fixes #3665: ensure inputs in a fluid row maintain grid sizing

13 years agoMerge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Mark Otto [Mon, 30 Jul 2012 20:25:49 +0000 (13:25 -0700)] 
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

13 years agofixes #3900: nudge badges in buttons up 1px
Mark Otto [Mon, 30 Jul 2012 20:25:27 +0000 (13:25 -0700)] 
fixes #3900: nudge badges in buttons up 1px

13 years agoMerge pull request #4229 from conzett/master
Mark Otto [Mon, 30 Jul 2012 20:08:29 +0000 (13:08 -0700)] 
Merge pull request #4229 from conzett/master

Add 'dist' directory to .gitignore

13 years agoupdate button styles to use updated 14px base font size, align carets to others with...
Mark Otto [Mon, 30 Jul 2012 19:52:44 +0000 (12:52 -0700)] 
update button styles to use updated 14px base font size, align carets to others with no opacity changes

13 years agofix navbar form alignment, and update examples to show these cases
Mark Otto [Mon, 30 Jul 2012 19:15:08 +0000 (12:15 -0700)] 
fix navbar form alignment, and update examples to show these cases

13 years agoAdd 'dist' directory to .gitignore 4229/head
Graham Conzett [Mon, 30 Jul 2012 18:10:01 +0000 (14:10 -0400)] 
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

13 years agonew fav and touch icons to match new masthead
Mark Otto [Mon, 30 Jul 2012 17:33:48 +0000 (10:33 -0700)] 
new fav and touch icons to match new masthead

13 years agofixes #3858: add var for responsive navbar. also add additional examples to navbar...
Mark Otto [Mon, 30 Jul 2012 17:24:41 +0000 (10:24 -0700)] 
fixes #3858: add var for responsive navbar. also add additional examples to navbar docs

13 years agofix examples collapse classes, rename navbar-redux to navbar and delete the old one
Mark Otto [Mon, 30 Jul 2012 17:08:27 +0000 (10:08 -0700)] 
fix examples collapse classes, rename navbar-redux to navbar and delete the old one

13 years agofixes #4221: correct border-collapse property for IE7 hack
Mark Otto [Mon, 30 Jul 2012 06:51:40 +0000 (23:51 -0700)] 
fixes #4221: correct border-collapse property for IE7 hack

13 years agofix footer in responsive
Mark Otto [Mon, 30 Jul 2012 06:51:18 +0000 (23:51 -0700)] 
fix footer in responsive

13 years agofixes #3694: provide override classes for .hide and .pull-right for grid columns
Mark Otto [Sun, 29 Jul 2012 23:51:24 +0000 (16:51 -0700)] 
fixes #3694: provide override classes for .hide and .pull-right for grid columns

13 years agomore breadcrumb tweaks for contrast
Mark Otto [Sun, 29 Jul 2012 23:36:16 +0000 (16:36 -0700)] 
more breadcrumb tweaks for contrast

13 years agoremove gradient, border, and box-shadow from .breadcrumb to differentiate from nav...
Mark Otto [Sun, 29 Jul 2012 23:25:20 +0000 (16:25 -0700)] 
remove gradient, border, and box-shadow from .breadcrumb to differentiate from nav and buttons

13 years agoMerge branch '2.1.0-wip-navbar' into 2.1.0-wip
Mark Otto [Sun, 29 Jul 2012 23:24:05 +0000 (16:24 -0700)] 
Merge branch '2.1.0-wip-navbar' into 2.1.0-wip

13 years agouse shorthand on form field transitions for box-shadow mixin
Mark Otto [Sun, 29 Jul 2012 19:10:29 +0000 (12:10 -0700)] 
use shorthand on form field transitions for box-shadow mixin

13 years agofixes #4210: indenting on hero example
Mark Otto [Sun, 29 Jul 2012 19:07:18 +0000 (12:07 -0700)] 
fixes #4210: indenting on hero example

13 years agoclear out docs assets, update and png crush features image
Mark Otto [Sun, 29 Jul 2012 07:44:55 +0000 (00:44 -0700)] 
clear out docs assets, update and png crush features image

13 years agoreverse navbar styles to save code
Mark Otto [Sun, 29 Jul 2012 07:30:15 +0000 (00:30 -0700)] 
reverse navbar styles to save code

13 years agoadd .btn-block for a full-width button option
Mark Otto [Fri, 27 Jul 2012 22:42:58 +0000 (15:42 -0700)] 
add .btn-block for a full-width button option

13 years agoadd docs for sub menu support on dropdowns, add caret via :after to submenu toggles
Mark Otto [Fri, 27 Jul 2012 17:35:15 +0000 (10:35 -0700)] 
add docs for sub menu support on dropdowns, add caret via :after to submenu toggles

13 years agoadd basic support for sub menus in dropdown menus
Mark Otto [Fri, 27 Jul 2012 17:06:54 +0000 (10:06 -0700)] 
add basic support for sub menus in dropdown menus

13 years agoadd image styles, for now to scaffolding (soon to own file)
Mark Otto [Fri, 27 Jul 2012 07:06:43 +0000 (00:06 -0700)] 
add image styles, for now to scaffolding (soon to own file)

13 years agoincrease height of homepage jumbotron, update vars and styles of popovers
Mark Otto [Fri, 27 Jul 2012 06:42:36 +0000 (23:42 -0700)] 
increase height of homepage jumbotron, update vars and styles of popovers

13 years agofix js docs formatting
Mark Otto [Fri, 27 Jul 2012 06:21:06 +0000 (23:21 -0700)] 
fix js docs formatting

13 years agorerun make
Mark Otto [Fri, 27 Jul 2012 04:45:30 +0000 (21:45 -0700)] 
rerun make

13 years agoindenting and such
Mark Otto [Fri, 27 Jul 2012 04:45:19 +0000 (21:45 -0700)] 
indenting and such

13 years agosimplify styles for bs docs nav
Mark Otto [Tue, 24 Jul 2012 23:07:25 +0000 (16:07 -0700)] 
simplify styles for bs docs nav

13 years agodon't bite so hard
Jacob Thornton [Tue, 24 Jul 2012 19:57:00 +0000 (12:57 -0700)] 
don't bite so hard

13 years agoMerge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Mark Otto [Tue, 24 Jul 2012 08:53:45 +0000 (01:53 -0700)] 
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

13 years agowrap footer in bs docs canvas for scrolling doodad
Mark Otto [Tue, 24 Jul 2012 08:53:32 +0000 (01:53 -0700)] 
wrap footer in bs docs canvas for scrolling doodad

13 years agofix search form, mostly in navbar
Mark Otto [Tue, 24 Jul 2012 08:44:12 +0000 (01:44 -0700)] 
fix search form, mostly in navbar

13 years agoMerge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Jacob Thornton [Tue, 24 Jul 2012 07:49:19 +0000 (00:49 -0700)] 
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip

13 years agoadded fade out on scroll - we can pull this if you prefer it
Jacob Thornton [Tue, 24 Jul 2012 07:48:45 +0000 (00:48 -0700)] 
added fade out on scroll - we can pull this if you prefer it

13 years agoMerge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Mark Otto [Tue, 24 Jul 2012 07:44:20 +0000 (00:44 -0700)] 
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

13 years agofixes #4118: responsive modal gets width auto and improved positioning for narrower...
Mark Otto [Tue, 24 Jul 2012 07:44:11 +0000 (00:44 -0700)] 
fixes #4118: responsive modal gets width auto and improved positioning for narrower widths

13 years agomodal heading line-height
Mark Otto [Tue, 24 Jul 2012 07:37:19 +0000 (00:37 -0700)] 
modal heading line-height

13 years agofix h3 in modal and make modal unhidden by removing important from earlier issue
Mark Otto [Tue, 24 Jul 2012 07:35:54 +0000 (00:35 -0700)] 
fix h3 in modal and make modal unhidden by removing important from earlier issue

13 years agofix scroll thinggg
Jacob Thornton [Tue, 24 Jul 2012 07:30:58 +0000 (00:30 -0700)] 
fix scroll thinggg

13 years agoMerge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Jacob Thornton [Tue, 24 Jul 2012 07:24:25 +0000 (00:24 -0700)] 
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

13 years agoslightly fix side bar
Jacob Thornton [Tue, 24 Jul 2012 07:21:40 +0000 (00:21 -0700)] 
slightly fix side bar

13 years agoMerge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Mark Otto [Tue, 24 Jul 2012 06:57:13 +0000 (23:57 -0700)] 
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

13 years agofixes #4156: don't override border radius if stacked nav has one child
Mark Otto [Tue, 24 Jul 2012 06:56:13 +0000 (23:56 -0700)] 
fixes #4156: don't override border radius if stacked nav has one child

13 years agotweak docs shadows
Mark Otto [Tue, 24 Jul 2012 06:54:26 +0000 (23:54 -0700)] 
tweak docs shadows

13 years agoMerge pull request #4166 from jonathansampson/2.1.0-wip
♒∆✝ [Tue, 24 Jul 2012 06:15:46 +0000 (23:15 -0700)] 
Merge pull request #4166 from jonathansampson/2.1.0-wip

IE10 uses 'transition' and 'transitionend'

13 years agoMerge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Mark Otto [Tue, 24 Jul 2012 06:01:38 +0000 (23:01 -0700)] 
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

13 years agoIE10 uses 'transition' and 'transitionend' 4166/head
Jonathan Sampson [Tue, 24 Jul 2012 05:50:38 +0000 (01:50 -0400)] 
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

13 years agomake docs scroll over jumbotrons, but only for 980px up
Mark Otto [Tue, 24 Jul 2012 05:36:08 +0000 (22:36 -0700)] 
make docs scroll over jumbotrons, but only for 980px up

13 years agodelete this test for now - as affix is still heavily underdevelopment
Jacob Thornton [Tue, 24 Jul 2012 01:17:43 +0000 (18:17 -0700)] 
delete this test for now - as affix is still heavily underdevelopment

13 years agofollowing #4148
Jacob Thornton [Tue, 24 Jul 2012 01:12:23 +0000 (18:12 -0700)] 
following #4148

13 years agoMerge pull request #4159 from ixti/opera11-transitions-fix
♒∆✝ [Tue, 24 Jul 2012 00:58:38 +0000 (17:58 -0700)] 
Merge pull request #4159 from ixti/opera11-transitions-fix

Fix transition end name for opera 11+12

13 years agomore alignment fixes for customize page
Mark Otto [Mon, 23 Jul 2012 19:51:48 +0000 (12:51 -0700)] 
more alignment fixes for customize page

13 years agofixes #4148, readme typo
Mark Otto [Mon, 23 Jul 2012 19:51:36 +0000 (12:51 -0700)] 
fixes #4148, readme typo

13 years agoFix transition end name for opera 11+12 4159/head
Aleksey V Zapparov [Mon, 23 Jul 2012 18:55:27 +0000 (20:55 +0200)] 
Fix transition end name for opera 11+12

Fix transition end name for Opera 11 and Opera 12.
Should fix issues: #3896, #3897, #4157, #4158

13 years agoMerge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Jacob Thornton [Mon, 23 Jul 2012 01:29:01 +0000 (18:29 -0700)] 
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip

13 years agosome progress on affix plugin
Jacob Thornton [Mon, 23 Jul 2012 01:28:39 +0000 (18:28 -0700)] 
some progress on affix plugin

13 years agoMerge pull request #3842 from alienlebarge/2.1.0-wip
♒∆✝ [Sun, 22 Jul 2012 21:59:08 +0000 (14:59 -0700)] 
Merge pull request #3842 from alienlebarge/2.1.0-wip

<img /> tag with `height` attr are not responsive

13 years agoMerge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Jacob Thornton [Sun, 22 Jul 2012 21:52:13 +0000 (14:52 -0700)] 
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip

13 years agoadds minLength #3960
Jacob Thornton [Sun, 22 Jul 2012 21:50:52 +0000 (14:50 -0700)] 
adds minLength #3960

13 years agoMerge pull request #4104 from lookfirst/2.1.0-wip-fix-destroy
♒∆✝ [Sun, 22 Jul 2012 21:40:09 +0000 (14:40 -0700)] 
Merge pull request #4104 from lookfirst/2.1.0-wip-fix-destroy

namespace the events for popover/tooltip

13 years agoremove the ns option 4104/head
Jon Stevens [Sun, 22 Jul 2012 21:36:23 +0000 (14:36 -0700)] 
remove the ns option

13 years agoMerge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Mark Otto [Sun, 22 Jul 2012 21:31:58 +0000 (14:31 -0700)] 
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

13 years agofixes #4136: use @dropdownBorder var, but keep IE7-8 fallback
Mark Otto [Sun, 22 Jul 2012 21:31:39 +0000 (14:31 -0700)] 
fixes #4136: use @dropdownBorder var, but keep IE7-8 fallback

13 years agosimplify things to one line. pull #4104
Jon Stevens [Sun, 22 Jul 2012 21:19:11 +0000 (14:19 -0700)] 
simplify things to one line. pull #4104

13 years ago*face palm*
Jacob Thornton [Sun, 22 Jul 2012 20:21:44 +0000 (13:21 -0700)] 
*face palm*

13 years agochange haunt to write
Jacob Thornton [Sun, 22 Jul 2012 20:00:17 +0000 (13:00 -0700)] 
change haunt to write

13 years agoadd haunt w/ issue guideline spec
Jacob Thornton [Sun, 22 Jul 2012 19:57:39 +0000 (12:57 -0700)] 
add haunt w/ issue guideline spec

13 years agomove from downloads.html to customize.html to better match purpose of page, fix up...
Mark Otto [Sat, 21 Jul 2012 05:06:47 +0000 (22:06 -0700)] 
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

13 years agotweak docs masthead links hover
Mark Otto [Sat, 21 Jul 2012 04:38:28 +0000 (21:38 -0700)] 
tweak docs masthead links hover

13 years agoon destroy, also hide. issue #3880, pull #4104
Jon Stevens [Fri, 20 Jul 2012 16:47:12 +0000 (09:47 -0700)] 
on destroy, also hide. issue #3880, pull #4104

13 years agonuke commented out code from last fix
Mark Otto [Fri, 20 Jul 2012 04:25:42 +0000 (21:25 -0700)] 
nuke commented out code from last fix

13 years agofixes #4103: simpler fix for tfoot in .table-border
Mark Otto [Fri, 20 Jul 2012 04:25:24 +0000 (21:25 -0700)] 
fixes #4103: simpler fix for tfoot in .table-border

13 years agofixes #4102: properly round top left corners of .table-border with caption/colgroup...
Mark Otto [Fri, 20 Jul 2012 04:06:42 +0000 (21:06 -0700)] 
fixes #4102: properly round top left corners of .table-border with caption/colgroup; also fix css tests page layout and footer

13 years agomisc docs content changes
Mark Otto [Wed, 18 Jul 2012 08:06:52 +0000 (01:06 -0700)] 
misc docs content changes

13 years agocopy change
Mark Otto [Wed, 18 Jul 2012 06:38:29 +0000 (23:38 -0700)] 
copy change

13 years agofixes #3845: add .btn-link for transparent buttons styled as links
Mark Otto [Wed, 18 Jul 2012 06:32:52 +0000 (23:32 -0700)] 
fixes #3845: add .btn-link for transparent buttons styled as links

13 years agoMerge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip
Mark Otto [Wed, 18 Jul 2012 06:14:58 +0000 (23:14 -0700)] 
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

13 years agoMerge pull request #4110 from purwandi/develop
Mark Otto [Wed, 18 Jul 2012 05:44:26 +0000 (22:44 -0700)] 
Merge pull request #4110 from purwandi/develop

Moved JS to bottom on extends page

13 years agode-scope nav-header from .nav
Mark Otto [Wed, 18 Jul 2012 05:40:38 +0000 (22:40 -0700)] 
de-scope nav-header from .nav

13 years agoMerge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into develop 4110/head
Purwandi [Wed, 18 Jul 2012 05:33:16 +0000 (12:33 +0700)] 
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into develop

13 years agofix dropdown vars and make hover state be link color again, add gradient to dropdown...
Mark Otto [Wed, 18 Jul 2012 05:26:53 +0000 (22:26 -0700)] 
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

13 years agoMoved JS to bottom on extends page
Purwandi [Wed, 18 Jul 2012 05:19:02 +0000 (12:19 +0700)] 
Moved JS to bottom on extends page

13 years agoremove separate examples page, add to getting started page
Mark Otto [Wed, 18 Jul 2012 04:45:57 +0000 (21:45 -0700)] 
remove separate examples page, add to getting started page

13 years agoMerge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjamino...
Mark Otto [Wed, 18 Jul 2012 03:57:20 +0000 (20:57 -0700)] 
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

13 years agocenter masthead bg pattern
Mark Otto [Wed, 18 Jul 2012 03:22:55 +0000 (20:22 -0700)] 
center masthead bg pattern

13 years agopngcrush masthead pattern to save 10k
Mark Otto [Wed, 18 Jul 2012 02:55:02 +0000 (19:55 -0700)] 
pngcrush masthead pattern to save 10k

13 years agonew pattern for masthead
Mark Otto [Wed, 18 Jul 2012 02:54:29 +0000 (19:54 -0700)] 
new pattern for masthead

13 years agoMerge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Mark Otto [Wed, 18 Jul 2012 02:11:51 +0000 (19:11 -0700)] 
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

13 years agoremove list-type declarations from ul and ol elements since those should just use...
Mark Otto [Wed, 18 Jul 2012 02:11:41 +0000 (19:11 -0700)] 
remove list-type declarations from ul and ol elements since those should just use browser defaults

13 years agonamespace the events for popover/tooltip so that they can be cleanly removed. issue...
Jon Stevens [Mon, 16 Jul 2012 23:01:11 +0000 (16:01 -0700)] 
namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880

13 years agoCompiled; ignoring bootstrap.css change to avoid conflicts 4101/head
Ben Oakes [Mon, 16 Jul 2012 13:31:18 +0000 (09:31 -0400)] 
Compiled; ignoring bootstrap.css change to avoid conflicts

13 years agoTwo of the three apps are for Linux/Windows; adjust accordingly
Ben Oakes [Mon, 16 Jul 2012 13:29:49 +0000 (09:29 -0400)] 
Two of the three apps are for Linux/Windows; adjust accordingly