]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agoAdding 'connect' npm requirement as it is required to run `make test` (in order for... 3993/head
Phil Freo [Wed, 4 Jul 2012 06:34:11 +0000 (23:34 -0700)] 
Adding 'connect' npm requirement as it is required to run `make test` (in order for it to run `node js/tests/server.js`)

13 years agoUpdate master
Mark Otto [Thu, 7 Jun 2012 17:31:26 +0000 (10:31 -0700)] 
Update master

13 years ago2.0.3 -> 2.0.4 v2.0.4
Jacob Thornton [Fri, 1 Jun 2012 18:04:27 +0000 (11:04 -0700)] 
2.0.3 -> 2.0.4

13 years agoMerge branch '2.0.4-wip'
Jacob Thornton [Fri, 1 Jun 2012 17:53:47 +0000 (10:53 -0700)] 
Merge branch '2.0.4-wip'

13 years agorebuild and fix test
Jacob Thornton [Thu, 31 May 2012 17:24:23 +0000 (10:24 -0700)] 
rebuild and fix test

13 years agoMerge pull request #3655 from jorgenfb/8dda83906d72ade81ecf9b21d55b5a2922589d30
Jacob Thornton [Thu, 31 May 2012 16:03:53 +0000 (09:03 -0700)] 
Merge pull request #3655 from jorgenfb/8dda83906d72ade81ecf9b21d55b5a2922589d30

Updated unit test for tooltips. Now using is() instead of hasClass()

13 years agofix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend...
Mark Otto [Tue, 29 May 2012 00:32:24 +0000 (17:32 -0700)] 
fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing

13 years agoremake after merging IE7/8 bugfix for animations
Mark Otto [Tue, 29 May 2012 00:17:55 +0000 (17:17 -0700)] 
remake after merging IE7/8 bugfix for animations

13 years agoMerge branch 'raymccoy-no-filters' into 2.0.4-wip
Mark Otto [Tue, 29 May 2012 00:17:36 +0000 (17:17 -0700)] 
Merge branch 'raymccoy-no-filters' into 2.0.4-wip

13 years agoscope float right dropdown menus to immediate children
Mark Otto [Mon, 28 May 2012 08:13:24 +0000 (01:13 -0700)] 
scope float right dropdown menus to immediate children

13 years agoMerge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder
Mark Otto [Mon, 28 May 2012 08:00:23 +0000 (01:00 -0700)] 
Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder

2.0.4 wip fix placeholder

13 years agoadd note about contributing
Jacob Thornton [Mon, 28 May 2012 03:07:58 +0000 (20:07 -0700)] 
add note about contributing

13 years agofixes .placeholder to work as a "grouped selector" 3619/head
Corey Innis [Mon, 28 May 2012 01:12:08 +0000 (18:12 -0700)] 
fixes .placeholder to work as a "grouped selector"

adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`

the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.

13 years agoadd tracking but for production only
Mark Otto [Sun, 27 May 2012 06:17:23 +0000 (23:17 -0700)] 
add tracking but for production only

13 years agoadding google analytics tracking to docs
Mark Otto [Sat, 26 May 2012 23:35:28 +0000 (16:35 -0700)] 
adding google analytics tracking to docs

13 years agoremove color from labels
Mark Otto [Fri, 25 May 2012 16:19:10 +0000 (09:19 -0700)] 
remove color from labels

13 years agofix navbar button for mobile tapping (turn to button instead of adding href=#), strea...
Mark Otto [Fri, 25 May 2012 04:30:43 +0000 (21:30 -0700)] 
fix navbar button for mobile tapping (turn to button instead of adding href=#), streamline less docs page

13 years agofix example code for carousel
Mark Otto [Fri, 25 May 2012 03:26:08 +0000 (20:26 -0700)] 
fix example code for carousel

13 years agomake bootstrap like google maps a bit more
Mark Otto [Fri, 25 May 2012 03:18:52 +0000 (20:18 -0700)] 
make bootstrap like google maps a bit more

13 years agomake nested cols code match given example
Mark Otto [Fri, 25 May 2012 03:16:25 +0000 (20:16 -0700)] 
make nested cols code match given example

13 years ago#3592: clarify grid sizing in grid docs
Mark Otto [Fri, 25 May 2012 03:13:59 +0000 (20:13 -0700)] 
#3592: clarify grid sizing in grid docs

13 years agorecompile after adding ms-placeholder
Mark Otto [Fri, 25 May 2012 02:18:06 +0000 (19:18 -0700)] 
recompile after adding ms-placeholder

13 years agoMerge branch 'ademaro-patch-1' into 2.0.4-wip
Mark Otto [Fri, 25 May 2012 02:17:49 +0000 (19:17 -0700)] 
Merge branch 'ademaro-patch-1' into 2.0.4-wip

13 years agoie support placeholder color (http://msdn.microsoft.com/en-us/library/ie/hh772745... 3584/head
Ademaro [Thu, 24 May 2012 09:57:02 +0000 (13:57 +0400)] 
ie support placeholder color (http://msdn.microsoft.com/en-us/library/ie/hh772745(v=vs.85).aspx)

13 years agoremove redeclared font styles from <p> and rebuild
Mark Otto [Wed, 23 May 2012 07:05:30 +0000 (00:05 -0700)] 
remove redeclared font styles from <p> and rebuild

13 years agoMerge branch 'pvorb-patch-1' into 2.0.4-wip
Mark Otto [Wed, 23 May 2012 07:05:13 +0000 (00:05 -0700)] 
Merge branch 'pvorb-patch-1' into 2.0.4-wip

13 years agofix field state mixin
Mark Otto [Wed, 23 May 2012 07:04:54 +0000 (00:04 -0700)] 
fix field state mixin

13 years agoDo not use filters in fade animations 3552/head
Tomás Arribas [Mon, 21 May 2012 00:56:57 +0000 (02:56 +0200)] 
Do not use filters in fade animations

13 years agoSwapped out .hasClass() with .is() when checking for multiple classes 3551/head 3655/head
Jørgen Borgesen [Sun, 20 May 2012 18:10:21 +0000 (20:10 +0200)] 
Swapped out .hasClass() with .is() when checking for multiple classes

13 years agoAdded unit test to check that tooltips is not showed when leave event is triggered... 3550/head 3654/head
Jørgen Borgesen [Sun, 20 May 2012 17:59:53 +0000 (19:59 +0200)] 
Added unit test to check that tooltips is not showed when leave event is triggered before show delay has expired AND the hide delay is set to 0

13 years agoRemove re-declaration of font-fam, font-size, and line-height in p 3545/head
Paul Vorbach [Sun, 20 May 2012 08:54:21 +0000 (11:54 +0300)] 
Remove re-declaration of font-fam, font-size, and line-height in p

13 years agofix resizing issues from incorrectly changing <767px grid classes to inline-block...
Mark Otto [Fri, 18 May 2012 05:00:49 +0000 (22:00 -0700)] 
fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas

13 years agofix modal example per #3510
Mark Otto [Fri, 18 May 2012 04:48:13 +0000 (21:48 -0700)] 
fix modal example per #3510

13 years agomanually resolve #3516: type in less docs
Mark Otto [Fri, 18 May 2012 04:45:45 +0000 (21:45 -0700)] 
manually resolve #3516: type in less docs

13 years agoversion bump on docs home
Mark Otto [Tue, 15 May 2012 17:59:06 +0000 (10:59 -0700)] 
version bump on docs home

13 years agomove navbar and update paths so it sits in tests
Mark Otto [Tue, 15 May 2012 16:45:53 +0000 (09:45 -0700)] 
move navbar and update paths so it sits in tests

13 years agoclarify button type on dismiss icons
Mark Otto [Tue, 15 May 2012 16:41:06 +0000 (09:41 -0700)] 
clarify button type on dismiss icons

13 years agoexample incorrect for modal dismiss button
Mark Otto [Tue, 15 May 2012 16:37:28 +0000 (09:37 -0700)] 
example incorrect for modal dismiss button

13 years agoremake again after pull
Mark Otto [Tue, 15 May 2012 16:07:55 +0000 (09:07 -0700)] 
remake again after pull

13 years agoMerge branch '2.0.4-wip-forms' of github.com:twitter/bootstrap into 2.0.4-wip-forms
Mark Otto [Tue, 15 May 2012 16:07:31 +0000 (09:07 -0700)] 
Merge branch '2.0.4-wip-forms' of github.com:twitter/bootstrap into 2.0.4-wip-forms

13 years agofinish fixing uneditable-input and remake
Mark Otto [Tue, 15 May 2012 16:07:19 +0000 (09:07 -0700)] 
finish fixing uneditable-input and remake

13 years agoupdated forms to rearrange focus state, reinstate uneditable-input, and a few other...
Mark Otto [Tue, 15 May 2012 16:04:44 +0000 (09:04 -0700)] 
updated forms to rearrange focus state, reinstate uneditable-input, and a few other cleanup tidbits

13 years agocorrect regressions against 2.0.3
Mark Otto [Tue, 15 May 2012 07:17:02 +0000 (00:17 -0700)] 
correct regressions against 2.0.3

13 years agothree columns
Mark Otto [Tue, 15 May 2012 06:50:34 +0000 (23:50 -0700)] 
three columns

13 years agomove forms test to less/tests
Mark Otto [Tue, 15 May 2012 06:45:25 +0000 (23:45 -0700)] 
move forms test to less/tests

13 years agoconsolidate and relabel new form selectors
Mark Otto [Tue, 15 May 2012 06:42:32 +0000 (23:42 -0700)] 
consolidate and relabel new form selectors

13 years agoadd forms test page for all html5 input types and refactor selectors
Mark Otto [Tue, 15 May 2012 06:40:06 +0000 (23:40 -0700)] 
add forms test page for all html5 input types and refactor selectors

13 years agodocument .lead per #3213
Mark Otto [Tue, 15 May 2012 05:02:51 +0000 (22:02 -0700)] 
document .lead per #3213

13 years agoadding navbar example, for fixed and static navbars
Mark Otto [Mon, 14 May 2012 15:57:24 +0000 (08:57 -0700)] 
adding navbar example, for fixed and static navbars

13 years agoCancel running timer for tooltips with delayed show, but instant hide. This prevents... 3478/head
Jørgen Borgesen [Mon, 14 May 2012 12:03:36 +0000 (14:03 +0200)] 
Cancel running timer for tooltips with delayed show, but instant hide. This prevents delayed tooltips from appearing if the mouse leaves the elements before tooltip is showed and the hiding delay is 0.

13 years ago#3257: share .navbar-fixed-top styles with .navbar-fixed-bottom
Mark Otto [Mon, 14 May 2012 05:11:35 +0000 (22:11 -0700)] 
#3257: share .navbar-fixed-top styles with .navbar-fixed-bottom

13 years ago#3420: properly scope dropdown open state to immediate children only
Mark Otto [Mon, 14 May 2012 04:52:18 +0000 (21:52 -0700)] 
#3420: properly scope dropdown open state to immediate children only

13 years ago#3438: fix typo on i18n tag
Mark Otto [Mon, 14 May 2012 00:43:56 +0000 (17:43 -0700)] 
#3438: fix typo on i18n tag

13 years ago#3449: make legend and form-actions the same border color
Mark Otto [Mon, 14 May 2012 00:43:04 +0000 (17:43 -0700)] 
#3449: make legend and form-actions the same border color

13 years agoMerge branch 'aziz-patch-7' into 2.0.4-wip
Mark Otto [Sun, 13 May 2012 21:42:12 +0000 (14:42 -0700)] 
Merge branch 'aziz-patch-7' into 2.0.4-wip

13 years agodocument .hyphens() mixin
Mark Otto [Sun, 13 May 2012 21:31:31 +0000 (14:31 -0700)] 
document .hyphens() mixin

13 years agoMerge branch 'Synchro-hyphenation' into 2.0.4-wip
Mark Otto [Sun, 13 May 2012 21:29:08 +0000 (14:29 -0700)] 
Merge branch 'Synchro-hyphenation' into 2.0.4-wip

13 years agoMerge branch 'hyphenation' of https://github.com/Synchro/bootstrap into Synchro-hyphe...
Mark Otto [Sun, 13 May 2012 21:28:32 +0000 (14:28 -0700)] 
Merge branch 'hyphenation' of https://github.com/Synchro/bootstrap into Synchro-hyphenation

13 years ago#3465 part 2: add mention to docs of type button issue
Mark Otto [Sun, 13 May 2012 21:03:32 +0000 (14:03 -0700)] 
#3465 part 2: add mention to docs of type button issue

13 years ago#3465 part 1: add type="button" to all dismiss buttons in docs
Mark Otto [Sun, 13 May 2012 21:01:57 +0000 (14:01 -0700)] 
#3465 part 1: add type="button" to all dismiss buttons in docs

13 years agoMerge branch '2.0.4-wip' of github.com:twitter/bootstrap into 2.0.4-wip
Mark Otto [Sun, 13 May 2012 20:59:26 +0000 (13:59 -0700)] 
Merge branch '2.0.4-wip' of github.com:twitter/bootstrap into 2.0.4-wip

13 years ago#3468: 140 icons, not 120
Mark Otto [Sun, 13 May 2012 20:59:20 +0000 (13:59 -0700)] 
#3468: 140 icons, not 120

13 years ago#3469: add variables for dropdown menu dividers
Mark Otto [Sun, 13 May 2012 20:58:42 +0000 (13:58 -0700)] 
#3469: add variables for dropdown menu dividers

13 years agoremove wrapping <label> from all js docs
Mark Otto [Sun, 13 May 2012 18:10:08 +0000 (11:10 -0700)] 
remove wrapping <label> from all js docs

13 years agoMerge pull request #3428 from Gavrisimo/patch-1
Mark Otto [Sat, 12 May 2012 18:37:53 +0000 (11:37 -0700)] 
Merge pull request #3428 from Gavrisimo/patch-1

Update .placeholder() mixin call

13 years agoUpdate .placeholder() mixin call 3428/head
Milos Gavrilovic [Thu, 10 May 2012 09:25:22 +0000 (12:25 +0300)] 
Update .placeholder() mixin call

In less/mixins.less this mixin is being created with @placeholderText
color as default, which is actually set as @placeholderText: @grayLight
in less/variables.less so it's redundant to make call like this:

.placeholder(@grayLight);

13 years agoAdd Opera prefix 3388/head
Synchro [Tue, 1 May 2012 15:54:53 +0000 (17:54 +0200)] 
Add Opera prefix

13 years agoCoding style
Synchro [Tue, 1 May 2012 15:06:19 +0000 (17:06 +0200)] 
Coding style

13 years agoAdd .hyphens mixin
Synchro [Tue, 1 May 2012 15:01:26 +0000 (17:01 +0200)] 
Add .hyphens mixin

13 years ago#3263: typo in forms docs
Mark Otto [Mon, 30 Apr 2012 22:43:47 +0000 (15:43 -0700)] 
#3263: typo in forms docs

13 years ago#3255: typo in components for tabbable tabs
Mark Otto [Mon, 30 Apr 2012 22:42:55 +0000 (15:42 -0700)] 
#3255: typo in components for tabbable tabs

13 years agoMerge branch 'anirvan-master' into 2.0.4-wip
Mark Otto [Mon, 30 Apr 2012 22:41:47 +0000 (15:41 -0700)] 
Merge branch 'anirvan-master' into 2.0.4-wip

13 years agomake responsive input fields not wrap for fluid input prepend/append by setting block...
Mark Otto [Mon, 30 Apr 2012 22:40:49 +0000 (15:40 -0700)] 
make responsive input fields not wrap for fluid input prepend/append by setting block back to inline-block (oversight of 2.0.3)

13 years ago#3237: change to CSS comments in responsive docs
Mark Otto [Mon, 30 Apr 2012 22:33:35 +0000 (15:33 -0700)] 
#3237: change to CSS comments in responsive docs

13 years ago#3228: update docs to list dependencies from 2.0.3 for compiling via make
Mark Otto [Mon, 30 Apr 2012 22:30:56 +0000 (15:30 -0700)] 
#3228: update docs to list dependencies from 2.0.3 for compiling via make

13 years agoexpand input css tests to fixed width grid
Mark Otto [Mon, 30 Apr 2012 22:06:26 +0000 (15:06 -0700)] 
expand input css tests to fixed width grid

13 years agoseveral spelling corrections 3268/head
Anirvan Chatterjee [Fri, 27 Apr 2012 17:48:59 +0000 (10:48 -0700)] 
several spelling corrections

13 years agolet's reuse color variables, instead of hardcoding colors. 3243/head
Allen Bargi [Thu, 26 Apr 2012 14:38:47 +0000 (17:38 +0300)] 
let's reuse color variables, instead of hardcoding colors.

13 years agoMerge pull request #3226 from aziz/patch-6
Jacob Thornton [Thu, 26 Apr 2012 05:19:49 +0000 (22:19 -0700)] 
Merge pull request #3226 from aziz/patch-6

No need to specify units when a value is 0, thanks to RECESS

13 years agorebuild with typeahead change
Jacob Thornton [Thu, 26 Apr 2012 05:15:39 +0000 (22:15 -0700)] 
rebuild with typeahead change

13 years agorevert position -> offset for typeahead position
Jacob Thornton [Thu, 26 Apr 2012 05:14:39 +0000 (22:14 -0700)] 
revert position -> offset for typeahead position

13 years agofix #3234
Jacob Thornton [Thu, 26 Apr 2012 04:52:05 +0000 (21:52 -0700)] 
fix #3234

13 years agoNo need to specify units when a value is 0, thanks to RECESS 3226/head
Allen Bargi [Wed, 25 Apr 2012 15:16:59 +0000 (18:16 +0300)] 
No need to specify units when a value is 0, thanks to RECESS

13 years agofix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild) v2.0.3
Jacob Thornton [Wed, 25 Apr 2012 01:06:41 +0000 (18:06 -0700)] 
fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild)

13 years agoheading
Mark Otto [Tue, 24 Apr 2012 13:53:48 +0000 (06:53 -0700)] 
heading

13 years agoofficially drop support for offset on thumbnails since it breaks BC
Mark Otto [Tue, 24 Apr 2012 13:52:57 +0000 (06:52 -0700)] 
officially drop support for offset on thumbnails since it breaks BC

13 years agorestore margins on thumbnails, add comments about it's changes and how responsive...
Mark Otto [Tue, 24 Apr 2012 13:45:21 +0000 (06:45 -0700)] 
restore margins on thumbnails, add comments about it's changes and how responsive affects it

13 years agomake component animations work cross browsers with opacity mixin, restore float on...
Mark Otto [Tue, 24 Apr 2012 13:39:14 +0000 (06:39 -0700)] 
make component animations work cross browsers with opacity mixin, restore float on thumbnails > li

13 years agoMerge branch '2.0.3-wip'
Jacob Thornton [Tue, 24 Apr 2012 09:21:45 +0000 (02:21 -0700)] 
Merge branch '2.0.3-wip'

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

13 years ago2.0.2 -> 2.0.3
Jacob Thornton [Tue, 24 Apr 2012 09:19:02 +0000 (02:19 -0700)] 
2.0.2 -> 2.0.3

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

13 years agoimplement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect...
Mark Otto [Tue, 24 Apr 2012 09:11:59 +0000 (02:11 -0700)] 
implement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect, but mostly solid

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Tue, 24 Apr 2012 09:02:28 +0000 (02:02 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

13 years agochanges for build in preperation for 2.0.3 release
Jacob Thornton [Tue, 24 Apr 2012 09:02:06 +0000 (02:02 -0700)] 
changes for build in preperation for 2.0.3 release

13 years agofix ie7 button group toggles and button borders
Mark Otto [Tue, 24 Apr 2012 08:46:20 +0000 (01:46 -0700)] 
fix ie7 button group toggles and button borders

13 years agofix #3179: cut off radios and checkboxes
Mark Otto [Tue, 24 Apr 2012 08:33:00 +0000 (01:33 -0700)] 
fix #3179: cut off radios and checkboxes

13 years agofix #3202: add cursor to .accordion-toggle
Mark Otto [Tue, 24 Apr 2012 08:23:24 +0000 (01:23 -0700)] 
fix #3202: add cursor to .accordion-toggle

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

13 years agofix up buttons after recess property order
Mark Otto [Mon, 23 Apr 2012 17:06:35 +0000 (10:06 -0700)] 
fix up buttons after recess property order

13 years agohr to var in makefil
Jacob Thornton [Mon, 23 Apr 2012 11:16:27 +0000 (04:16 -0700)] 
hr to var in makefil