]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agofix transition end 8774/head
liuyl [Mon, 29 Jul 2013 12:23:01 +0000 (20:23 +0800)] 
fix transition end

12 years agofix #8694: apply tooltip demo ordering change from #8730 to popovers too
Chris Rebert [Mon, 29 Jul 2013 10:35:45 +0000 (03:35 -0700)] 
fix #8694: apply tooltip demo ordering change from #8730 to popovers too

12 years agoupdate composer.json to reflect org change
Chris Rebert [Mon, 29 Jul 2013 07:21:18 +0000 (00:21 -0700)] 
update composer.json to reflect org change

12 years agofix #8745: fix html5shiv & respond.js script links in docs
Chris Rebert [Mon, 29 Jul 2013 06:13:43 +0000 (23:13 -0700)] 
fix #8745: fix html5shiv & respond.js script links in docs

12 years agoMerge pull request #8738 from twbs/clarify-width-vs-height-size-classes
Mark Otto [Mon, 29 Jul 2013 05:29:05 +0000 (22:29 -0700)] 
Merge pull request #8738 from twbs/clarify-width-vs-height-size-classes

form input docs: clarify height-related vs. width-related classes

12 years agoavoid ambiguous term "relative sizing"; clarify width vs. height control classes 8738/head
Chris Rebert [Sun, 28 Jul 2013 08:44:23 +0000 (01:44 -0700)] 
avoid ambiguous term "relative sizing"; clarify width vs. height control classes

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Jacob Thornton [Mon, 29 Jul 2013 05:23:56 +0000 (22:23 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofixed #8715
Jacob Thornton [Mon, 29 Jul 2013 05:23:20 +0000 (22:23 -0700)] 
fixed #8715

12 years agoMerge pull request #8737 from twbs/docs-html5-style-select-multiple
Mark Otto [Mon, 29 Jul 2013 05:22:10 +0000 (22:22 -0700)] 
Merge pull request #8737 from twbs/docs-html5-style-select-multiple

CSS docs page: Use simpler HTML5 style for `multiple` <select> attribute

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 29 Jul 2013 05:21:27 +0000 (22:21 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agoexpand grid system options table to include column widths, gutter widths, large deskt...
Mark Otto [Mon, 29 Jul 2013 05:21:16 +0000 (22:21 -0700)] 
expand grid system options table to include column widths, gutter widths, large desktop media query, and container widths (fixes #8733)

12 years agoCSS docs page: Use simpler HTML5 style for `multiple` boolean attribute of <select> 8737/head
Chris Rebert [Sun, 28 Jul 2013 08:42:55 +0000 (01:42 -0700)] 
CSS docs page: Use simpler HTML5 style for `multiple` boolean attribute of <select>

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Jacob Thornton [Mon, 29 Jul 2013 05:16:17 +0000 (22:16 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofixes #8703
Jacob Thornton [Mon, 29 Jul 2013 05:14:43 +0000 (22:14 -0700)] 
fixes #8703

12 years agoMerge pull request #8736 from twbs/css-docs-code
Chris Rebert [Mon, 29 Jul 2013 05:14:24 +0000 (22:14 -0700)] 
Merge pull request #8736 from twbs/css-docs-code

CSS docs page: apply <code> in a few places

12 years agoapply <code> in a few places 8736/head
Chris Rebert [Sun, 28 Jul 2013 08:38:48 +0000 (01:38 -0700)] 
apply <code> in a few places

12 years agoMerge pull request #8735 from twbs/docs-edits
Chris Rebert [Mon, 29 Jul 2013 05:07:46 +0000 (22:07 -0700)] 
Merge pull request #8735 from twbs/docs-edits

minor CSS docs edits

12 years agoexpand out IE for consistency w/ the rest of the page 8735/head
Chris Rebert [Sun, 28 Jul 2013 08:41:39 +0000 (01:41 -0700)] 
expand out IE for consistency w/ the rest of the page

12 years agoadd commas in a couple places
Chris Rebert [Sun, 28 Jul 2013 08:39:15 +0000 (01:39 -0700)] 
add commas in a couple places

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 29 Jul 2013 05:00:55 +0000 (22:00 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agoadd responsive images section to docs (fixes #8734)
Mark Otto [Mon, 29 Jul 2013 05:00:49 +0000 (22:00 -0700)] 
add responsive images section to docs (fixes #8734)

12 years agoMerge pull request #8730 from eluttner/3.0.0-wip
Mark Otto [Mon, 29 Jul 2013 04:50:06 +0000 (21:50 -0700)] 
Merge pull request #8730 from eluttner/3.0.0-wip

Javascript - tooltips directions - easier visualization

12 years agodocs.css: Remove border-color that's missing a value
Chris Rebert [Mon, 29 Jul 2013 03:53:59 +0000 (20:53 -0700)] 
docs.css: Remove border-color that's missing a value

/cc @mdo to fix this properly later
/cc @rcotrina94 from e1bb94c38370fd2542415557c660d0804d4f42b1

12 years agoJavascript - tooltips directions - easier visualization 8730/head
eduardo luttner [Mon, 29 Jul 2013 01:46:16 +0000 (22:46 -0300)] 
Javascript - tooltips directions - easier visualization

Changed the order of the visualization. It is not the css order, however it is easier to see the tooltips

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sun, 28 Jul 2013 16:42:56 +0000 (09:42 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agoMerge pull request #8712 from claydiffrient/3.0.0-wip
Mark Otto [Sun, 28 Jul 2013 16:38:12 +0000 (09:38 -0700)] 
Merge pull request #8712 from claydiffrient/3.0.0-wip

Fix wording in 'hidden on...' to be in line with 3.0 wording.

12 years agofixes #8714: correct stacked pills nav
Mark Otto [Sun, 28 Jul 2013 16:37:10 +0000 (09:37 -0700)] 
fixes #8714: correct stacked pills nav

12 years agoFix wording in 'hidden on...' to be in line with 3.0 wording. 8712/head
Clay Diffrient [Sun, 28 Jul 2013 14:57:10 +0000 (08:57 -0600)] 
Fix wording in 'hidden on...' to be in line with 3.0 wording.

12 years agofix #8701: IE 10+ supports <fieldset disabled>
Chris Rebert [Sun, 28 Jul 2013 10:48:40 +0000 (03:48 -0700)] 
fix #8701: IE 10+ supports <fieldset disabled>

*golf clap*

12 years agoSafari handles <fieldset disabled> just fine; fixes #8698
Chris Rebert [Sun, 28 Jul 2013 09:05:38 +0000 (02:05 -0700)] 
Safari handles <fieldset disabled> just fine; fixes #8698

This makes me wonder whether recent IE might actually support this too.
If not, your move IE Team.

12 years agoderp, no s on that url
Mark Otto [Sun, 28 Jul 2013 07:08:55 +0000 (00:08 -0700)] 
derp, no s on that url

12 years agopoint to different download urls
Mark Otto [Sun, 28 Jul 2013 07:03:24 +0000 (00:03 -0700)] 
point to different download urls

12 years agotemporarily undo @fat's scrollspy enhancement since it fucks firefox and ie
Mark Otto [Sun, 28 Jul 2013 06:53:09 +0000 (23:53 -0700)] 
temporarily undo @fat's scrollspy enhancement since it fucks firefox and ie

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sun, 28 Jul 2013 06:45:11 +0000 (23:45 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agoMerge pull request #8696 from twbs/jshintrc
Chris Rebert [Sun, 28 Jul 2013 06:12:00 +0000 (23:12 -0700)] 
Merge pull request #8696 from twbs/jshintrc

get jshint close to passing by updating .jshintrc settings

12 years agoget jshint close to passing by updating .jshintrc settings 8696/head
Chris Rebert [Sun, 28 Jul 2013 04:56:44 +0000 (21:56 -0700)] 
get jshint close to passing by updating .jshintrc settings

I don't agree with these personally, but they jive with BS/@fat's JS code style.
The remaining jshint complaints are things that really actually should get fixed.

12 years agoMerge pull request #8695 from twbs/fix-grunt-jshint
Chris Rebert [Sun, 28 Jul 2013 04:43:27 +0000 (21:43 -0700)] 
Merge pull request #8695 from twbs/fix-grunt-jshint

Fix grunt jshint

12 years agotweak Gruntfile.js so it passes jshint
Chris Rebert [Sun, 28 Jul 2013 04:33:41 +0000 (21:33 -0700)] 
tweak Gruntfile.js so it passes jshint

12 years agoworkaround possible bug in grunt-contrib-jshint
Chris Rebert [Sun, 28 Jul 2013 04:33:11 +0000 (21:33 -0700)] 
workaround possible bug in grunt-contrib-jshint

12 years agotweak Gruntfile.js so it passes jshint 8695/head
Chris Rebert [Sun, 28 Jul 2013 04:33:41 +0000 (21:33 -0700)] 
tweak Gruntfile.js so it passes jshint

12 years agoworkaround possible bug in grunt-contrib-jshint
Chris Rebert [Sun, 28 Jul 2013 04:33:11 +0000 (21:33 -0700)] 
workaround possible bug in grunt-contrib-jshint

12 years agoRemove back to top link from docs
Mark Otto [Sun, 28 Jul 2013 02:50:33 +0000 (19:50 -0700)] 
Remove back to top link from docs

12 years agofixes #8665: have modals use auto margin on sides and widen it instead of positioning...
Mark Otto [Sun, 28 Jul 2013 02:38:05 +0000 (19:38 -0700)] 
fixes #8665: have modals use auto margin on sides and widen it instead of positioning and negative margin

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

12 years agoInput groups overhaul
Mark Otto [Sun, 28 Jul 2013 01:56:31 +0000 (18:56 -0700)] 
Input groups overhaul

* Moves input groups CSS into separate file
* Moves input groups docs into the Components page
* Add support for radios and checkboxes in input groups to fix #8679

12 years agoMerge pull request #8685 from jouve/3.0.0-wip
Chris Rebert [Sun, 28 Jul 2013 01:13:54 +0000 (18:13 -0700)] 
Merge pull request #8685 from jouve/3.0.0-wip

fix README.md

12 years agofix README.md 8685/head
Cyril Jouve [Sun, 28 Jul 2013 00:52:39 +0000 (02:52 +0200)] 
fix README.md

12 years agofixes #8659: remove lingering .nav-header
Mark Otto [Sat, 27 Jul 2013 23:51:04 +0000 (16:51 -0700)] 
fixes #8659: remove lingering .nav-header

12 years agofixes #8642: use .pull-right to keep dropdowns aligned in example
Mark Otto [Sat, 27 Jul 2013 23:41:02 +0000 (16:41 -0700)] 
fixes #8642: use .pull-right to keep dropdowns aligned in example

12 years agofixes #8675: align horizontal form label and input
Mark Otto [Sat, 27 Jul 2013 23:37:45 +0000 (16:37 -0700)] 
fixes #8675: align horizontal form label and input

12 years agoMerge pull request #8676 from sprice/update-editorconfig
Mark Otto [Sat, 27 Jul 2013 21:56:29 +0000 (14:56 -0700)] 
Merge pull request #8676 from sprice/update-editorconfig

Remove Makefile section from .editorconfig

12 years agoRemove Makefile section from .editorconfig 8676/head
Shawn Price [Sat, 27 Jul 2013 21:04:46 +0000 (14:04 -0700)] 
Remove Makefile section from .editorconfig

12 years agoMerge pull request #8650 from loic/3.0.0-wip
Mark Otto [Sat, 27 Jul 2013 18:26:28 +0000 (11:26 -0700)] 
Merge pull request #8650 from loic/3.0.0-wip

Fixed minor typos in css.html

12 years agoMerge pull request #8657 from Micronax/3.0.0-wip
Mark Otto [Sat, 27 Jul 2013 18:25:17 +0000 (11:25 -0700)] 
Merge pull request #8657 from Micronax/3.0.0-wip

Added rel="stylesheet" to CDN-Examples

12 years agoMerge pull request #8663 from mekishizufu/fix-typo
Mark Otto [Sat, 27 Jul 2013 18:24:32 +0000 (11:24 -0700)] 
Merge pull request #8663 from mekishizufu/fix-typo

Fix typo in css.html

12 years agoFixed minor typos in javascript.html 8650/head
Loic Bistuer [Sat, 27 Jul 2013 17:57:12 +0000 (00:57 +0700)] 
Fixed minor typos in javascript.html

12 years agoFix typo in css.html 8663/head
Jiri Pospisil [Sat, 27 Jul 2013 16:40:35 +0000 (18:40 +0200)] 
Fix typo in css.html

12 years agoUpdate getting-started.html 8657/head
Fabian Golle [Sat, 27 Jul 2013 15:30:44 +0000 (17:30 +0200)] 
Update getting-started.html

12 years agoFixed minor typos in css.html
Loic Bistuer [Sat, 27 Jul 2013 12:27:45 +0000 (19:27 +0700)] 
Fixed minor typos in css.html

12 years agoupdate links to point to download links v3.0.0-rc1
Mark Otto [Sat, 27 Jul 2013 08:06:59 +0000 (01:06 -0700)] 
update links to point to download links

12 years agounfuck broke links in docs
Mark Otto [Sat, 27 Jul 2013 07:47:08 +0000 (00:47 -0700)] 
unfuck broke links in docs

12 years agomo links, fix ads and analytics in gh pages
Mark Otto [Sat, 27 Jul 2013 07:35:26 +0000 (00:35 -0700)] 
mo links, fix ads and analytics in gh pages

12 years agofixes for hella broken links on account of jekyll and twbs.github.com links
Mark Otto [Sat, 27 Jul 2013 07:28:23 +0000 (00:28 -0700)] 
fixes for hella broken links on account of jekyll and twbs.github.com links

12 years agoherpy derpy shit for urls
Mark Otto [Sat, 27 Jul 2013 07:18:12 +0000 (00:18 -0700)] 
herpy derpy shit for urls

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

12 years ago2.3.2 not 2.3.3
Mark Otto [Sat, 27 Jul 2013 06:24:02 +0000 (23:24 -0700)] 
2.3.2 not 2.3.3

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Sat, 27 Jul 2013 06:14:48 +0000 (23:14 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoupdate js title
fat [Sat, 27 Jul 2013 06:14:21 +0000 (23:14 -0700)] 
update js title

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

12 years agoadd cname
Mark Otto [Sat, 27 Jul 2013 06:04:03 +0000 (23:04 -0700)] 
add cname

12 years agorebuild + use serif arrows
fat [Sat, 27 Jul 2013 05:59:21 +0000 (22:59 -0700)] 
rebuild + use serif arrows

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Sat, 27 Jul 2013 05:41:34 +0000 (22:41 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agosmall copy change
fat [Sat, 27 Jul 2013 05:36:23 +0000 (22:36 -0700)] 
small copy change

12 years agoignore the gruntfile from jekyll
Mark Otto [Sat, 27 Jul 2013 05:31:14 +0000 (22:31 -0700)] 
ignore the gruntfile from jekyll

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Sat, 27 Jul 2013 05:25:11 +0000 (22:25 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofix scrollspy for window *and* children
fat [Sat, 27 Jul 2013 05:24:51 +0000 (22:24 -0700)] 
fix scrollspy for window *and* children

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

Conflicts:
dist/css/bootstrap.min.css

12 years agoresponsive tables all up in js docs
Mark Otto [Sat, 27 Jul 2013 05:17:53 +0000 (22:17 -0700)] 
responsive tables all up in js docs

12 years agoFix up dropdowns being incorrectly positioned on nav pills
Mark Otto [Sat, 27 Jul 2013 05:11:58 +0000 (22:11 -0700)] 
Fix up dropdowns being incorrectly positioned on nav pills

12 years agouse transforms to make the dialog smooooth
fat [Sat, 27 Jul 2013 05:09:31 +0000 (22:09 -0700)] 
use transforms to make the dialog smooooth

12 years agoFix broke ass navbar example docs stuff
Mark Otto [Sat, 27 Jul 2013 05:09:05 +0000 (22:09 -0700)] 
Fix broke ass navbar example docs stuff

12 years agoFix clipped dropdowns in input groups section of docs
Mark Otto [Sat, 27 Jul 2013 05:03:52 +0000 (22:03 -0700)] 
Fix clipped dropdowns in input groups section of docs

12 years agosimpler forms docs structure
Mark Otto [Sat, 27 Jul 2013 04:52:23 +0000 (21:52 -0700)] 
simpler forms docs structure

12 years agoUndo changes from #8582 because it made links uneven on desktop
Mark Otto [Sat, 27 Jul 2013 04:49:35 +0000 (21:49 -0700)] 
Undo changes from #8582 because it made links uneven on desktop

/cc @salman-javed-confiz

12 years agoderp
Mark Otto [Sat, 27 Jul 2013 04:40:58 +0000 (21:40 -0700)] 
derp

12 years agomo tables mo responsive or whatever the hell that means
Mark Otto [Sat, 27 Jul 2013 04:35:56 +0000 (21:35 -0700)] 
mo tables mo responsive or whatever the hell that means

12 years agoanother responsivey table
Mark Otto [Sat, 27 Jul 2013 04:31:00 +0000 (21:31 -0700)] 
another responsivey table

12 years agoResponsivey docs table for grid section
Mark Otto [Sat, 27 Jul 2013 04:28:44 +0000 (21:28 -0700)] 
Responsivey docs table for grid section

12 years agoTwerk lead font-size for mobile devices
Mark Otto [Sat, 27 Jul 2013 04:12:48 +0000 (21:12 -0700)] 
Twerk lead font-size for mobile devices

12 years agoBroser meta tag docs layout change
Mark Otto [Sat, 27 Jul 2013 04:12:35 +0000 (21:12 -0700)] 
Broser meta tag docs layout change

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Sat, 27 Jul 2013 04:01:50 +0000 (21:01 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofixes #6937
fat [Sat, 27 Jul 2013 04:01:14 +0000 (21:01 -0700)] 
fixes #6937

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Sat, 27 Jul 2013 03:53:26 +0000 (20:53 -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-js' of git://github.com/juthilo/bootstrap-wip into juthilo...
fat [Sat, 27 Jul 2013 03:50:51 +0000 (20:50 -0700)] 
Merge branch '3.0.0-docs-js' of git://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-js

Conflicts:
javascript.html

12 years agorebuild + fix #2539
fat [Sat, 27 Jul 2013 03:44:35 +0000 (20:44 -0700)] 
rebuild + fix #2539

12 years agoContrast on old docs callout
Mark Otto [Sat, 27 Jul 2013 03:36:02 +0000 (20:36 -0700)] 
Contrast on old docs callout

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Sat, 27 Jul 2013 03:34:59 +0000 (20:34 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agochange how collapse works - collapse, collapsing, and in
fat [Sat, 27 Jul 2013 03:34:39 +0000 (20:34 -0700)] 
change how collapse works - collapse, collapsing, and in

12 years agoColor change to sidenav
Mark Otto [Sat, 27 Jul 2013 03:20:21 +0000 (20:20 -0700)] 
Color change to sidenav

12 years agoMo betta side nav colors
Mark Otto [Sat, 27 Jul 2013 02:58:46 +0000 (19:58 -0700)] 
Mo betta side nav colors