]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agotypo fixed: highligted source code of second radio button was missing in css.html... 8528/head
Max [Fri, 19 Jul 2013 10:28:26 +0000 (13:28 +0300)] 
typo fixed: highligted source code of second radio button was missing in css.html -> checkboxes & radios -> default section

12 years agoMerge pull request #8524 from jholl/patch-1
Mark Otto [Fri, 19 Jul 2013 04:07:34 +0000 (21:07 -0700)] 
Merge pull request #8524 from jholl/patch-1

fix typo / doc components.html responsive menu dropdowns now have ref to...

12 years agofix typo / doc components.html responsive menu dropdowns now have ref to .dropdown... 8524/head
James Holland [Fri, 19 Jul 2013 04:04:58 +0000 (00:04 -0400)] 
fix typo / doc components.html responsive menu dropdowns now have ref to .dropdown-header instead of .nav-header

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 19 Jul 2013 02:53:53 +0000 (19:53 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years ago`<input>` and `<select>` sizing update
Mark Otto [Fri, 19 Jul 2013 02:53:32 +0000 (19:53 -0700)] 
`<input>` and  `<select>` sizing update

Restores `font-size` and more to the `<select>` element while also
changing from `min-height` to `height` for input sizing.

Fixes #8520 as opened by @ShaunR (would've merged that PR but I moved
everything around right before).

12 years agoMerge pull request #8521 from epicyclist/3.0.0-wip
Mark Otto [Fri, 19 Jul 2013 02:36:16 +0000 (19:36 -0700)] 
Merge pull request #8521 from epicyclist/3.0.0-wip

Documentation updates.

12 years agoRemove Mustache comment regarding contribution: it's going away. 8521/head
Christopher Canipe [Fri, 19 Jul 2013 02:09:33 +0000 (20:09 -0600)] 
Remove Mustache comment regarding contribution: it's going away.

12 years agoClean up tooltip's trigger description in the docs.
Christopher Canipe [Fri, 19 Jul 2013 01:41:42 +0000 (19:41 -0600)] 
Clean up tooltip's trigger description in the docs.

12 years agoAdd minified CSS to dist folder
Mark Otto [Fri, 19 Jul 2013 01:33:20 +0000 (18:33 -0700)] 
Add minified CSS to dist folder

12 years agoMerge branch 'bs3_rc1' into 3.0.0-wip
Mark Otto [Fri, 19 Jul 2013 01:16:50 +0000 (18:16 -0700)] 
Merge branch 'bs3_rc1' into 3.0.0-wip

12 years agofinish flattening repo structure; add dist folder of compiled css/js
Mark Otto [Fri, 19 Jul 2013 01:14:49 +0000 (18:14 -0700)] 
finish flattening repo structure; add dist folder of compiled css/js

12 years agoflatten docs dir back into root
Mark Otto [Fri, 19 Jul 2013 00:41:30 +0000 (17:41 -0700)] 
flatten docs dir back into root

12 years agoFixes #8516: correct input-small and input-large on select elements
Mark Otto [Thu, 18 Jul 2013 22:36:41 +0000 (15:36 -0700)] 
Fixes #8516: correct input-small and input-large on select elements

12 years agoJankily fix input group wrapping with button groups in Firefox (fixes #8321, #8429...
Mark Otto [Thu, 18 Jul 2013 22:28:38 +0000 (15:28 -0700)] 
Jankily fix input group wrapping with button groups in Firefox (fixes #8321, #8429, and #8067)

12 years agoMerge pull request #8517 from cvrebert/gloss-unicode
Mark Otto [Thu, 18 Jul 2013 21:43:38 +0000 (14:43 -0700)] 
Merge pull request #8517 from cvrebert/gloss-unicode

add comments to gloss Unicode codepoint hex

12 years agochange download button label
Mark Otto [Thu, 18 Jul 2013 21:08:40 +0000 (14:08 -0700)] 
change download button label

12 years agocopy change to css page subheading
Mark Otto [Thu, 18 Jul 2013 21:06:13 +0000 (14:06 -0700)] 
copy change to css page subheading

12 years agorelative url
Mark Otto [Thu, 18 Jul 2013 20:51:08 +0000 (13:51 -0700)] 
relative url

12 years agovertically center ad
Mark Otto [Thu, 18 Jul 2013 20:35:55 +0000 (13:35 -0700)] 
vertically center ad

12 years agoMerge branch 'bs3_old_docs_callout' into bs3_rc1
Mark Otto [Thu, 18 Jul 2013 20:07:49 +0000 (13:07 -0700)] 
Merge branch 'bs3_old_docs_callout' into bs3_rc1

12 years agoMerge branch 'bs3_add_ads' into bs3_rc1
Mark Otto [Thu, 18 Jul 2013 20:07:17 +0000 (13:07 -0700)] 
Merge branch 'bs3_add_ads' into bs3_rc1

12 years agoclarify IE support and rearrange getting started docs a bit
Mark Otto [Thu, 18 Jul 2013 20:05:53 +0000 (13:05 -0700)] 
clarify IE support and rearrange getting started docs a bit

12 years agoadd comments to gloss Unicode codepoint hex 8517/head
Chris Rebert [Thu, 18 Jul 2013 18:49:39 +0000 (11:49 -0700)] 
add comments to gloss Unicode codepoint hex

12 years agofixes #8206: Use navbar height var to compute vertical padding on navbar-brand
Mark Otto [Thu, 18 Jul 2013 09:23:38 +0000 (02:23 -0700)] 
fixes #8206: Use navbar height var to compute vertical padding on navbar-brand

12 years agofor some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed...
Mark Otto [Thu, 18 Jul 2013 09:19:13 +0000 (02:19 -0700)] 
for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions

12 years agoQuick pass at new touch and favicons
Mark Otto [Thu, 18 Jul 2013 09:05:41 +0000 (02:05 -0700)] 
Quick pass at new touch and favicons

12 years agotwerk comment
Mark Otto [Thu, 18 Jul 2013 08:46:31 +0000 (01:46 -0700)] 
twerk comment

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 08:25:28 +0000 (01:25 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoFixes #8374: ensure navbar is always at least 50px
Mark Otto [Thu, 18 Jul 2013 08:25:08 +0000 (01:25 -0700)] 
Fixes #8374: ensure navbar is always at least 50px

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Thu, 18 Jul 2013 08:08:19 +0000 (01:08 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

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

12 years agocleaner way of preventing double click events + clean up tests for jshint
fat [Thu, 18 Jul 2013 08:07:11 +0000 (01:07 -0700)] 
cleaner way of preventing double click events + clean up tests for jshint

12 years agoFixes #8397: better navbar padding with grid gutter stuff
Mark Otto [Thu, 18 Jul 2013 08:04:54 +0000 (01:04 -0700)] 
Fixes #8397: better navbar padding with grid gutter stuff

12 years agoget button js working with actual form elements p cooll
fat [Thu, 18 Jul 2013 07:59:31 +0000 (00:59 -0700)] 
get button js working with actual form elements p cooll

12 years agospacing and local var rename
Mark Otto [Thu, 18 Jul 2013 07:56:36 +0000 (00:56 -0700)] 
spacing and local var rename

12 years agoMerge branch 'patch-1' of https://github.com/bassjobsen/bootstrap into bassjobsen...
Mark Otto [Thu, 18 Jul 2013 07:55:36 +0000 (00:55 -0700)] 
Merge branch 'patch-1' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-1

12 years agorun make on mixin changes from #8380
Mark Otto [Thu, 18 Jul 2013 07:50:57 +0000 (00:50 -0700)] 
run make on mixin changes from #8380

12 years agoMerge pull request #8380 from joeybaker/patch-1
Mark Otto [Thu, 18 Jul 2013 07:50:15 +0000 (00:50 -0700)] 
Merge pull request #8380 from joeybaker/patch-1

Remove unneeded prefixes from some mixins

12 years agochange characters
Mark Otto [Thu, 18 Jul 2013 07:48:02 +0000 (00:48 -0700)] 
change characters

12 years agoMerge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3...
Mark Otto [Thu, 18 Jul 2013 07:43:48 +0000 (00:43 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip

12 years agoVurrriables and shit
Mark Otto [Thu, 18 Jul 2013 07:23:35 +0000 (00:23 -0700)] 
Vurrriables and shit

12 years agoFixes #8452: adds `.active` to table classes
Mark Otto [Thu, 18 Jul 2013 07:10:22 +0000 (00:10 -0700)] 
Fixes #8452: adds `.active` to table classes

12 years agomake on collapse changes
Mark Otto [Thu, 18 Jul 2013 06:56:38 +0000 (23:56 -0700)] 
make on collapse changes

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 06:56:27 +0000 (23:56 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoFixes #8441: remove `@font-size-mini`
Mark Otto [Thu, 18 Jul 2013 06:56:20 +0000 (23:56 -0700)] 
Fixes #8441: remove `@font-size-mini`

12 years agoBump tooltips to use `@font-size-small` (11px to 12px)
Mark Otto [Thu, 18 Jul 2013 06:55:58 +0000 (23:55 -0700)] 
Bump tooltips to use `@font-size-small` (11px to 12px)

12 years agoDrop `.nav-header` for `.dropdown-header`
Mark Otto [Thu, 18 Jul 2013 06:54:09 +0000 (23:54 -0700)] 
Drop `.nav-header` for `.dropdown-header`

* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Thu, 18 Jul 2013 06:52:55 +0000 (23:52 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofixes #7880
fat [Thu, 18 Jul 2013 06:52:29 +0000 (23:52 -0700)] 
fixes #7880

12 years agofixes #8477: use var for rounded image border-radius
Mark Otto [Thu, 18 Jul 2013 06:41:05 +0000 (23:41 -0700)] 
fixes #8477: use var for rounded image border-radius

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 06:34:31 +0000 (23:34 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

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

12 years agofixes #8491: add vars for table padding
Mark Otto [Thu, 18 Jul 2013 06:34:04 +0000 (23:34 -0700)] 
fixes #8491: add vars for table padding

12 years agomake on prev js changes
Mark Otto [Thu, 18 Jul 2013 06:33:34 +0000 (23:33 -0700)] 
make on prev js changes

12 years agofixes #7777
fat [Thu, 18 Jul 2013 06:30:05 +0000 (23:30 -0700)] 
fixes #7777

12 years agofixes #7776
fat [Thu, 18 Jul 2013 06:25:26 +0000 (23:25 -0700)] 
fixes #7776

12 years agoadd ads to v3 docs
Mark Otto [Thu, 18 Jul 2013 06:22:28 +0000 (23:22 -0700)] 
add ads to v3 docs

12 years agofixes #7755
fat [Thu, 18 Jul 2013 06:15:50 +0000 (23:15 -0700)] 
fixes #7755

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Thu, 18 Jul 2013 06:02:15 +0000 (23:02 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofix #7660
fat [Thu, 18 Jul 2013 06:01:33 +0000 (23:01 -0700)] 
fix #7660

12 years agoadd callouts for bootstrap 2.3.2 docs and 3.0 rc1 post
Mark Otto [Thu, 18 Jul 2013 05:58:49 +0000 (22:58 -0700)] 
add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post

12 years agoMerge pull request #8511 from twitter/bs3_remove_examples
Mark Otto [Thu, 18 Jul 2013 05:17:30 +0000 (22:17 -0700)] 
Merge pull request #8511 from twitter/bs3_remove_examples

BS3: Move examples to @twbs/bootstrap-examples

12 years agoversioning perhaps for jquery i don't even know man
fat [Thu, 18 Jul 2013 04:38:52 +0000 (21:38 -0700)] 
versioning perhaps for jquery i don't even know man

12 years agorebuild js + fixes #7583
fat [Thu, 18 Jul 2013 04:35:28 +0000 (21:35 -0700)] 
rebuild js + fixes #7583

12 years agomake sure triggering element is visible before focusing #7521
fat [Thu, 18 Jul 2013 04:30:38 +0000 (21:30 -0700)] 
make sure triggering element is visible before focusing #7521

12 years agofix @muan's unit test ;)
fat [Thu, 18 Jul 2013 04:17:39 +0000 (21:17 -0700)] 
fix @muan's unit test ;)

12 years agoMerge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
fat [Thu, 18 Jul 2013 04:14:02 +0000 (21:14 -0700)] 
Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip

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

12 years agoremove duh ugly
fat [Thu, 18 Jul 2013 04:10:33 +0000 (21:10 -0700)] 
remove duh ugly

12 years agofix #7000
fat [Thu, 18 Jul 2013 04:08:50 +0000 (21:08 -0700)] 
fix #7000

12 years agofix link to grid example 8511/head
Mark Otto [Thu, 18 Jul 2013 04:04:27 +0000 (21:04 -0700)] 
fix link to grid example

12 years agoremove colophon include because there's only one layout using it now
Mark Otto [Thu, 18 Jul 2013 04:02:50 +0000 (21:02 -0700)] 
remove colophon include because there's only one layout using it now

12 years agolink order
Mark Otto [Thu, 18 Jul 2013 03:44:55 +0000 (20:44 -0700)] 
link order

12 years agoMerge branch '3.0.0-wip' into bs3_remove_examples
Mark Otto [Thu, 18 Jul 2013 03:44:27 +0000 (20:44 -0700)] 
Merge branch '3.0.0-wip' into bs3_remove_examples

Conflicts:
docs/_includes/nav-getting-started.html
docs/examples/navbar-fixed-top.html
docs/examples/navbar-static-top.html
docs/examples/navbar.html
docs/getting-started.html

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Thu, 18 Jul 2013 03:30:09 +0000 (20:30 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofixes #6691
fat [Thu, 18 Jul 2013 03:29:41 +0000 (20:29 -0700)] 
fixes #6691

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 03:18:03 +0000 (20:18 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofix broken docs callouts
Mark Otto [Thu, 18 Jul 2013 03:17:56 +0000 (20:17 -0700)] 
fix broken docs callouts

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Thu, 18 Jul 2013 02:33:49 +0000 (19:33 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoMerge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip...
Mark Otto [Thu, 18 Jul 2013 02:33:30 +0000 (19:33 -0700)] 
Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam

Conflicts:
docs/components.html
docs/css.html
docs/customize.html

12 years agorebuild doe
fat [Thu, 18 Jul 2013 02:33:21 +0000 (19:33 -0700)] 
rebuild doe

12 years agomaybe fix this old ass issue #5973
fat [Thu, 18 Jul 2013 02:28:43 +0000 (19:28 -0700)] 
maybe fix this old ass issue #5973

12 years agoFixes #8360: Add mention of IE compatibility mode to docs
Mark Otto [Thu, 18 Jul 2013 02:26:37 +0000 (19:26 -0700)] 
Fixes #8360: Add mention of IE compatibility mode to docs

12 years agoMove license FAQs to the docs, add link to side nav
Mark Otto [Thu, 18 Jul 2013 02:20:08 +0000 (19:20 -0700)] 
Move license FAQs to the docs, add link to side nav

12 years agoFixes #8356: Move browser compatibility from wiki into real docs
Mark Otto [Thu, 18 Jul 2013 02:08:08 +0000 (19:08 -0700)] 
Fixes #8356: Move browser compatibility from wiki into real docs

12 years agoUpdate readme to point previous releases to GitHub project releases (fixes #8508)
Mark Otto [Thu, 18 Jul 2013 00:21:11 +0000 (17:21 -0700)] 
Update readme to point previous releases to GitHub project releases (fixes #8508)

12 years agoRemove changelog in favor of GitHub releases
Mark Otto [Thu, 18 Jul 2013 00:20:47 +0000 (17:20 -0700)] 
Remove changelog in favor of GitHub releases

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Tue, 16 Jul 2013 20:36:02 +0000 (13:36 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoremove margin from left side of navs since it's no longer being set
Mark Otto [Tue, 16 Jul 2013 18:49:04 +0000 (11:49 -0700)] 
remove margin from left side of navs since it's no longer being set

12 years agoMerge pull request #8498 from cvrebert/patch-1
Mark Otto [Tue, 16 Jul 2013 18:27:33 +0000 (11:27 -0700)] 
Merge pull request #8498 from cvrebert/patch-1

Add missing backtick in comment

12 years agoremove webkit-overflow-scrolling from modal for now /cc #8495
Mark Otto [Tue, 16 Jul 2013 18:26:48 +0000 (11:26 -0700)] 
remove webkit-overflow-scrolling from modal for now /cc #8495

12 years agoAdd missing backtick in comment 8498/head
Chris Rebert [Tue, 16 Jul 2013 17:49:59 +0000 (10:49 -0700)] 
Add missing backtick in comment

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Mon, 15 Jul 2013 19:00:10 +0000 (12:00 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofix broken scrollspy example
Mark Otto [Mon, 15 Jul 2013 19:00:01 +0000 (12:00 -0700)] 
fix broken scrollspy example

12 years agoMerge pull request #8478 from juthilo/3.0.0-customizer
Mark Otto [Sun, 14 Jul 2013 23:56:56 +0000 (16:56 -0700)] 
Merge pull request #8478 from juthilo/3.0.0-customizer

Update customizer

12 years agoUpdate customizer 8478/head
Julian Thilo [Sun, 14 Jul 2013 10:50:14 +0000 (12:50 +0200)] 
Update customizer

Add all the new things to customizer:
* `@headings-font-family`
* `@container-*`
* darker `@btn-default-bg`

12 years agoMerge pull request #8453 from cvrebert/retina-rename
Mark Otto [Thu, 11 Jul 2013 21:17:11 +0000 (14:17 -0700)] 
Merge pull request #8453 from cvrebert/retina-rename

rename .retina-image => .img-retina

12 years agoMerge pull request #8454 from bassjobsen/patch-2
Mark Otto [Thu, 11 Jul 2013 21:16:58 +0000 (14:16 -0700)] 
Merge pull request #8454 from bassjobsen/patch-2

Update forms.less

12 years agoMerge pull request #8455 from cvrebert/control-group-dead
Mark Otto [Thu, 11 Jul 2013 21:16:29 +0000 (14:16 -0700)] 
Merge pull request #8455 from cvrebert/control-group-dead

rm .control-group from docs since it's no longer in the LESS

12 years agorm .control-group from docs since it's no longer in the LESS 8455/head
Chris Rebert [Thu, 11 Jul 2013 19:57:44 +0000 (12:57 -0700)] 
rm .control-group from docs since it's no longer in the LESS

12 years agoUpdate forms.less 8454/head
Bass Jobsen [Thu, 11 Jul 2013 19:24:06 +0000 (21:24 +0200)] 
Update forms.less

All variables should be set in variables.less?

12 years agorename .retina-image => .img-retina 8453/head
Chris Rebert [Thu, 11 Jul 2013 19:07:35 +0000 (12:07 -0700)] 
rename .retina-image => .img-retina

12 years agoMerge pull request #8426 from liuyl/simplify-type
Mark Otto [Tue, 9 Jul 2013 19:43:15 +0000 (12:43 -0700)] 
Merge pull request #8426 from liuyl/simplify-type

simplify type.less