]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agoAdd Travis CI Support 3157/head
Chris Aniszczyk [Thu, 19 Apr 2012 22:32:41 +0000 (15:32 -0700)] 
Add Travis CI Support

Continous integration is nice, fixes #3155

Signed-off-by: Chris Aniszczyk <zx@twitter.com>
13 years agomention responsive css in navbar responsive section
Mark Otto [Thu, 19 Apr 2012 16:28:40 +0000 (09:28 -0700)] 
mention responsive css in navbar responsive section

13 years agomake build prettier - hopefully this works, maybe some makefile bro's can improve
Jacob Thornton [Thu, 19 Apr 2012 05:49:31 +0000 (22:49 -0700)] 
make build prettier - hopefully this works, maybe some makefile bro's can improve

13 years agomake bootstrap compile with Recess instead of Less
Jacob Thornton [Wed, 18 Apr 2012 23:16:42 +0000 (16:16 -0700)] 
make bootstrap compile with Recess instead of Less

13 years agoallow for pushstate in scrollspy
Jacob Thornton [Wed, 18 Apr 2012 20:35:14 +0000 (13:35 -0700)] 
allow for pushstate in scrollspy

13 years agoMerge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Wed, 18 Apr 2012 20:15:58 +0000 (13:15 -0700)] 
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

13 years agooffset -> position #3088
Jacob Thornton [Wed, 18 Apr 2012 20:15:13 +0000 (13:15 -0700)] 
offset -> position #3088

13 years agofix #3111, badge and label alignment with surrounding text
Mark Otto [Wed, 18 Apr 2012 16:47:30 +0000 (09:47 -0700)] 
fix #3111, badge and label alignment with surrounding text

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Wed, 18 Apr 2012 16:37:12 +0000 (09:37 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

13 years agofix some text around media queries in the docs
Mark Otto [Wed, 18 Apr 2012 16:37:07 +0000 (09:37 -0700)] 
fix some text around media queries in the docs

13 years agoMerge pull request #3128 from codler/patch-2
Mark Otto [Wed, 18 Apr 2012 16:22:38 +0000 (09:22 -0700)] 
Merge pull request #3128 from codler/patch-2

Add -ms-user-select

13 years agoadd -ms-user-select 3128/head
Han Lin Yap [Wed, 18 Apr 2012 08:38:14 +0000 (11:38 +0300)] 
add -ms-user-select

13 years agorebuild
Jacob Thornton [Tue, 17 Apr 2012 00:36:03 +0000 (17:36 -0700)] 
rebuild

13 years agoMerge pull request #3104 from iamnirav/2.0.3-wip
Jacob Thornton [Tue, 17 Apr 2012 00:35:32 +0000 (17:35 -0700)] 
Merge pull request #3104 from iamnirav/2.0.3-wip

Allow updater function in bootstrap-typeahead.js (updates the value of the input field) to be overridden

13 years agoUpdate new typeahead method docs to be a bit clearer. 3104/head
Nirav Sanghani [Tue, 17 Apr 2012 00:27:34 +0000 (17:27 -0700)] 
Update new typeahead method docs to be a bit clearer.

13 years agoUpdate typeahead docs to reflect new option.
Nirav Sanghani [Tue, 17 Apr 2012 00:24:51 +0000 (17:24 -0700)] 
Update typeahead docs to reflect new option.

13 years agoAllow updater function (updates the value of the input field) to be overridden.
Nirav Sanghani [Tue, 17 Apr 2012 00:05:35 +0000 (17:05 -0700)] 
Allow updater function (updates the value of the input field) to be overridden.

13 years agolots of property ordering
Jacob Thornton [Mon, 16 Apr 2012 23:34:08 +0000 (16:34 -0700)] 
lots of property ordering

13 years agofew more property orders
Jacob Thornton [Mon, 16 Apr 2012 22:37:17 +0000 (15:37 -0700)] 
few more property orders

13 years agoMerge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Mon, 16 Apr 2012 22:09:26 +0000 (15:09 -0700)] 
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

13 years agoa few property reordering things
Jacob Thornton [Mon, 16 Apr 2012 22:09:05 +0000 (15:09 -0700)] 
a few property reordering things

13 years agofix modal per #3086
Mark Otto [Mon, 16 Apr 2012 21:38:22 +0000 (14:38 -0700)] 
fix modal per #3086

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Mon, 16 Apr 2012 00:25:38 +0000 (17:25 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

13 years agonuke line
Mark Otto [Mon, 16 Apr 2012 00:25:32 +0000 (17:25 -0700)] 
nuke line

13 years agobuild bootstrap.js and bootstrap.min.js into docs
Jacob Thornton [Mon, 16 Apr 2012 00:03:33 +0000 (17:03 -0700)] 
build bootstrap.js and bootstrap.min.js into docs

13 years agoremove @gridRowWidth var since we don't use it anywhere
Mark Otto [Sun, 15 Apr 2012 23:57:11 +0000 (16:57 -0700)] 
remove @gridRowWidth var since we don't use it anywhere

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 23:48:26 +0000 (16:48 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

13 years agosimplify the left margin for offset grid columns
Mark Otto [Sun, 15 Apr 2012 23:48:17 +0000 (16:48 -0700)] 
simplify the left margin for offset grid columns

13 years agofixes #2941 + whitespace in collapse
Jacob Thornton [Sun, 15 Apr 2012 23:15:32 +0000 (16:15 -0700)] 
fixes #2941 + whitespace in collapse

13 years agofix #2990: text wrapping in .uneditable-input
Mark Otto [Sun, 15 Apr 2012 07:35:30 +0000 (00:35 -0700)] 
fix #2990: text wrapping in .uneditable-input

13 years agoMerge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Sun, 15 Apr 2012 07:20:50 +0000 (00:20 -0700)] 
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoadd zip to git ignore, and fix gh-pages make
Jacob Thornton [Sun, 15 Apr 2012 07:19:25 +0000 (00:19 -0700)] 
add zip to git ignore, and fix gh-pages make

13 years agosimplify make - move zipping to gh-pages only
Jacob Thornton [Sun, 15 Apr 2012 07:16:09 +0000 (00:16 -0700)] 
simplify make - move zipping to gh-pages only

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 07:06:35 +0000 (00:06 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agomove js tooltip link
Mark Otto [Sun, 15 Apr 2012 07:06:11 +0000 (00:06 -0700)] 
move js tooltip link

13 years agochange comments to preserve for yui
Jacob Thornton [Sun, 15 Apr 2012 06:51:08 +0000 (23:51 -0700)] 
change comments to preserve for yui

13 years agowhitespace
Jacob Thornton [Sun, 15 Apr 2012 06:38:11 +0000 (23:38 -0700)] 
whitespace

13 years agofix opera bug \o/ !!!! #1776
Jacob Thornton [Sun, 15 Apr 2012 06:24:19 +0000 (23:24 -0700)] 
fix opera bug \o/ !!!! #1776

13 years agofix #2989: clear .checkbox/.radio floats
Mark Otto [Sun, 15 Apr 2012 06:19:42 +0000 (23:19 -0700)] 
fix #2989: clear .checkbox/.radio floats

13 years agorebuild with tooltip formatting change
Jacob Thornton [Sun, 15 Apr 2012 06:11:19 +0000 (23:11 -0700)] 
rebuild with tooltip formatting change

13 years agoMerge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Sun, 15 Apr 2012 06:10:41 +0000 (23:10 -0700)] 
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

13 years agoadd tests for mouseout delay in tooltip
Jacob Thornton [Sun, 15 Apr 2012 06:10:03 +0000 (23:10 -0700)] 
add tests for mouseout delay in tooltip

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 06:07:51 +0000 (23:07 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoditch the .navbar in the selectors since it's the same specificity level, and thus...
Mark Otto [Sun, 15 Apr 2012 06:06:00 +0000 (23:06 -0700)] 
ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous

13 years agochange position of var in dropdown + cleanup makefile vars
Jacob Thornton [Sun, 15 Apr 2012 05:43:36 +0000 (22:43 -0700)] 
change position of var in dropdown + cleanup makefile vars

13 years agoMerge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into...
Mark Otto [Sun, 15 Apr 2012 05:43:26 +0000 (22:43 -0700)] 
Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse

Conflicts:
docs/assets/bootstrap.zip

13 years agoMerge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Sun, 15 Apr 2012 04:45:23 +0000 (21:45 -0700)] 
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

13 years agodon't open dropdown if target is disabled
Jacob Thornton [Sun, 15 Apr 2012 04:44:57 +0000 (21:44 -0700)] 
don't open dropdown if target is disabled

13 years agofix #3068: compile after changing comment
Mark Otto [Sun, 15 Apr 2012 03:56:50 +0000 (20:56 -0700)] 
fix #3068: compile after changing comment

13 years agoMerge branch 'au-phiware-patch-1' into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 03:56:13 +0000 (20:56 -0700)] 
Merge branch 'au-phiware-patch-1' into 2.0.3-wip

13 years agoSilence comment (just like the others) 3068/head
au-phiware [Sun, 15 Apr 2012 02:31:07 +0000 (12:31 +1000)] 
Silence comment (just like the others)

13 years agofix #1823: styles of tabs within other tabs resolved
Mark Otto [Sun, 15 Apr 2012 01:47:27 +0000 (18:47 -0700)] 
fix #1823: styles of tabs within other tabs resolved

13 years agobump version on docs homepage to 2.0.3
Mark Otto [Sun, 15 Apr 2012 01:30:43 +0000 (18:30 -0700)] 
bump version on docs homepage to 2.0.3

13 years agomerge in #2684, offset on the .makeColumn mixin
Mark Otto [Sun, 15 Apr 2012 01:18:11 +0000 (18:18 -0700)] 
merge in #2684, offset on the .makeColumn mixin

13 years agoMerge branch 'gruvii-patch-2' into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 01:11:40 +0000 (18:11 -0700)] 
Merge branch 'gruvii-patch-2' into 2.0.3-wip

13 years agoMerge branch 'patch-2' of https://github.com/gruvii/bootstrap into gruvii-patch-2
Mark Otto [Sun, 15 Apr 2012 01:11:31 +0000 (18:11 -0700)] 
Merge branch 'patch-2' of https://github.com/gruvii/bootstrap into gruvii-patch-2

13 years agocalling pause on a slide should actually pause it - even when hovering
Jacob Thornton [Sun, 15 Apr 2012 00:49:51 +0000 (17:49 -0700)] 
calling pause on a slide should actually pause it - even when hovering

13 years agorebuild
Jacob Thornton [Sun, 15 Apr 2012 00:19:00 +0000 (17:19 -0700)] 
rebuild

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 00:16:37 +0000 (17:16 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoadding icon classes to finish off glyphicons 1.6 update
Mark Otto [Sun, 15 Apr 2012 00:15:16 +0000 (17:15 -0700)] 
adding icon classes to finish off glyphicons 1.6 update

13 years agohack for subnav
Jacob Thornton [Sun, 15 Apr 2012 00:15:03 +0000 (17:15 -0700)] 
hack for subnav

13 years agofix #3032: update glyphicons sprite to 1.6 release
Mark Otto [Sat, 14 Apr 2012 23:59:49 +0000 (16:59 -0700)] 
fix #3032: update glyphicons sprite to 1.6 release

13 years agowhitespace
Jacob Thornton [Sat, 14 Apr 2012 23:38:44 +0000 (16:38 -0700)] 
whitespace

13 years agofix typeahead test
Jacob Thornton [Sat, 14 Apr 2012 23:32:20 +0000 (16:32 -0700)] 
fix typeahead test

13 years agoadd jshint support + a few minor stylistic changes
Jacob Thornton [Sat, 14 Apr 2012 23:29:53 +0000 (16:29 -0700)] 
add jshint support + a few minor stylistic changes

13 years agoalt fix to #3029: change to single border-radii properties
Mark Otto [Sat, 14 Apr 2012 20:31:48 +0000 (13:31 -0700)] 
alt fix to #3029: change to single border-radii properties

13 years agofix #3036: add bg color to inputs
Mark Otto [Sat, 14 Apr 2012 20:18:37 +0000 (13:18 -0700)] 
fix #3036: add bg color to inputs

13 years agoMerge pull request #3042 from ctalkington/typo-fix-1
Mark Otto [Sat, 14 Apr 2012 00:14:11 +0000 (17:14 -0700)] 
Merge pull request #3042 from ctalkington/typo-fix-1

Doc Typo Fix

13 years agoadd 's' to 'classe' in components docs. thanks mishmosh. 3042/head
ctalkington [Thu, 12 Apr 2012 20:14:54 +0000 (15:14 -0500)] 
add 's' to 'classe' in components docs. thanks mishmosh.

13 years agoFixed extra margin on Navbar buttons. 2907/head
Bryan Petty [Tue, 10 Apr 2012 21:19:10 +0000 (15:19 -0600)] 
Fixed extra margin on Navbar buttons.

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Sun, 8 Apr 2012 06:41:27 +0000 (23:41 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoadd larger .input-* to block reset for responsive <767
Mark Otto [Sun, 8 Apr 2012 06:41:09 +0000 (23:41 -0700)] 
add larger .input-* to block reset for responsive <767

13 years agoMerge branch 'alecrust-patch-3' into 2.0.3-wip
Mark Otto [Sun, 8 Apr 2012 06:38:16 +0000 (23:38 -0700)] 
Merge branch 'alecrust-patch-3' into 2.0.3-wip

13 years agofix typo on js docs selector
Mark Otto [Sun, 8 Apr 2012 06:37:58 +0000 (23:37 -0700)] 
fix typo on js docs selector

13 years agohttps://github.com/twitter/bootstrap/issues/2954
Jacob Thornton [Sun, 8 Apr 2012 04:26:46 +0000 (21:26 -0700)] 
https://github.com/twitter/bootstrap/issues/2954

13 years agoUpdate the LICENSE to the actual APLv2
Chris Aniszczyk [Sun, 8 Apr 2012 00:17:39 +0000 (17:17 -0700)] 
Update the LICENSE to the actual APLv2

13 years agoclean up new input append examples
Mark Otto [Sat, 7 Apr 2012 23:49:06 +0000 (16:49 -0700)] 
clean up new input append examples

13 years agofix conflicts, add docs example for two buttons on an append
Mark Otto [Sat, 7 Apr 2012 23:44:03 +0000 (16:44 -0700)] 
fix conflicts, add docs example for two buttons on an append

13 years agoMerge branch 'jasny-patch-2' into 2.0.3-wip
Mark Otto [Sat, 7 Apr 2012 23:43:48 +0000 (16:43 -0700)] 
Merge branch 'jasny-patch-2' into 2.0.3-wip

Conflicts:
less/forms.less

13 years agoreadd bootstrap.zip, add @inputBorderRadius var to close #2946
Mark Otto [Sat, 7 Apr 2012 23:17:15 +0000 (16:17 -0700)] 
readd bootstrap.zip, add @inputBorderRadius var to close #2946

13 years agoupdate kippt screenshot
Mark Otto [Sat, 7 Apr 2012 22:59:14 +0000 (15:59 -0700)] 
update kippt screenshot

13 years agouse yui-compress by default instead of regular compress
Mark Otto [Sat, 7 Apr 2012 21:56:37 +0000 (14:56 -0700)] 
use yui-compress by default instead of regular compress

13 years agofix left margin on .thumbnails for responsive <767
Mark Otto [Sat, 7 Apr 2012 21:31:55 +0000 (14:31 -0700)] 
fix left margin on .thumbnails for responsive <767

13 years agofix #2968 manually: add consolas to monospace font stack
Mark Otto [Sat, 7 Apr 2012 21:25:58 +0000 (14:25 -0700)] 
fix #2968 manually: add consolas to monospace font stack

13 years agoChanged .nav-collapse to clear both instead of left, and added compiled files.
Bryan Petty [Thu, 5 Apr 2012 19:48:17 +0000 (13:48 -0600)] 
Changed .nav-collapse to clear both instead of left, and added compiled files.

13 years agoAllow multiple buttons in `.input-prepend` and `.input-append`. 2962/head
Arnold Daniels [Thu, 5 Apr 2012 20:08:32 +0000 (23:08 +0300)] 
Allow multiple buttons in `.input-prepend` and `.input-append`.
This has a look similar to button groups.

13 years agoMerge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Wed, 4 Apr 2012 22:13:27 +0000 (15:13 -0700)] 
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoremake and add isHTML check to popover as well
Jacob Thornton [Wed, 4 Apr 2012 22:02:30 +0000 (15:02 -0700)] 
remake and add isHTML check to popover as well

13 years agodetect if title in tooltip is text or html. if text - use `text` method to prevent...
Jacob Thornton [Wed, 4 Apr 2012 21:58:04 +0000 (14:58 -0700)] 
detect if title in tooltip is text or html. if text - use `text` method to prevent xss.

all add a few notes to js readme about updated event

13 years agoCorrected spacing 2923/head
Alec Rust [Tue, 3 Apr 2012 10:15:36 +0000 (12:15 +0200)] 
Corrected spacing

13 years agofix #2908: unfloat inputs using .span* in fluid row
Mark Otto [Tue, 3 Apr 2012 05:49:19 +0000 (22:49 -0700)] 
fix #2908: unfloat inputs using .span* in fluid row

13 years agofix #2911: correct /lib/ path to /less/
Mark Otto [Tue, 3 Apr 2012 05:40:06 +0000 (22:40 -0700)] 
fix #2911: correct /lib/ path to /less/

13 years agofix #2913: get more specific with button group selectors
Mark Otto [Tue, 3 Apr 2012 05:37:58 +0000 (22:37 -0700)] 
fix #2913: get more specific with button group selectors

13 years agoRestrict collapsed items in Navbar to only those in .nav-collapse, and buttons in...
Bryan Petty [Sun, 1 Apr 2012 22:22:52 +0000 (16:22 -0600)] 
Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar.

13 years agoMerge branch 'alecrust-patch-1' into 2.0.3-wip
Mark Otto [Sun, 1 Apr 2012 18:10:20 +0000 (11:10 -0700)] 
Merge branch 'alecrust-patch-1' into 2.0.3-wip

13 years agoCorrected "resises" to "resides" 2893/head
Alec Rust [Sun, 1 Apr 2012 15:25:43 +0000 (17:25 +0200)] 
Corrected "resises" to "resides"

13 years agofix #2296: allow fluid thumbnails
Mark Otto [Sun, 1 Apr 2012 08:05:00 +0000 (01:05 -0700)] 
fix #2296: allow fluid thumbnails

13 years agofix #2572: streamline thumbnails css to allow for offsets
Mark Otto [Sun, 1 Apr 2012 07:59:34 +0000 (00:59 -0700)] 
fix #2572: streamline thumbnails css to allow for offsets

13 years agofix #2811: left and right aligned tabbable tabs fixes so that .tab-content grows...
Mark Otto [Sun, 1 Apr 2012 07:15:04 +0000 (00:15 -0700)] 
fix #2811: left and right aligned tabbable tabs fixes so that .tab-content grows to match parent's width

13 years agofix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts
Mark Otto [Sun, 1 Apr 2012 06:53:54 +0000 (23:53 -0700)] 
fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts