]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
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 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

12 years agoFix broke ass popovers direction example
Mark Otto [Sat, 27 Jul 2013 02:50:02 +0000 (19:50 -0700)] 
Fix broke ass popovers direction example

12 years agoUnfuck JS docs spacing and closing divs
Mark Otto [Sat, 27 Jul 2013 02:46:42 +0000 (19:46 -0700)] 
Unfuck JS docs spacing and closing divs

12 years agoUpdate IDs on customize page
Mark Otto [Sat, 27 Jul 2013 02:38:12 +0000 (19:38 -0700)] 
Update IDs on customize page

12 years agoUpate IDs on components page
Mark Otto [Sat, 27 Jul 2013 02:37:31 +0000 (19:37 -0700)] 
Upate IDs on components page

12 years agoUpdate IDs on css page
Mark Otto [Sat, 27 Jul 2013 02:35:24 +0000 (19:35 -0700)] 
Update IDs on css page

12 years agoUpdate IDs on getting started page
Mark Otto [Sat, 27 Jul 2013 02:32:15 +0000 (19:32 -0700)] 
Update IDs on getting started page

12 years agoBetter spacing of le docs sections
Mark Otto [Sat, 27 Jul 2013 02:32:05 +0000 (19:32 -0700)] 
Better spacing of le docs sections

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

12 years agoupdate docs nav targets
fat [Sat, 27 Jul 2013 02:25:45 +0000 (19:25 -0700)] 
update docs nav targets

12 years agoTweak getting started section
Mark Otto [Sat, 27 Jul 2013 02:25:13 +0000 (19:25 -0700)] 
Tweak getting started section

12 years agoMore vars work
Mark Otto [Sat, 27 Jul 2013 02:24:59 +0000 (19:24 -0700)] 
More vars work

12 years agoUse some vars for key urls for easier updating
Mark Otto [Sat, 27 Jul 2013 02:05:43 +0000 (19:05 -0700)] 
Use some vars for key urls for easier updating

12 years agomore space in sidenav
Mark Otto [Sat, 27 Jul 2013 01:52:05 +0000 (18:52 -0700)] 
more space in sidenav

12 years agoMerge pull request #8631 from jamescostian/patch-1
Mark Otto [Sat, 27 Jul 2013 01:47:08 +0000 (18:47 -0700)] 
Merge pull request #8631 from jamescostian/patch-1

Fix ID of buttons section on javascript page

12 years agoFix ID of buttons section on javascript page 8631/head
James Costian [Sat, 27 Jul 2013 00:15:11 +0000 (19:15 -0500)] 
Fix ID of buttons section on javascript page

The old ID caused the link on affix to not work.

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

12 years agoFixes #8293: sub nav links in JS docs
Mark Otto [Fri, 26 Jul 2013 23:52:09 +0000 (16:52 -0700)] 
Fixes #8293: sub nav links in JS docs

12 years agoSimpler horizontal form button placement
Mark Otto [Fri, 26 Jul 2013 23:01:34 +0000 (16:01 -0700)] 
Simpler horizontal form button placement

12 years agoIgnore less dir in Jekyll
Mark Otto [Fri, 26 Jul 2013 23:01:24 +0000 (16:01 -0700)] 
Ignore less dir in Jekyll

12 years agoUpdate inline and horizontal forms
Mark Otto [Fri, 26 Jul 2013 22:51:25 +0000 (15:51 -0700)] 
Update inline and horizontal forms

* No more need for `.row.form-group`--only need `.form-group`
* Change tag selectors for inline form to use `.form-control`
* Docs improved to explain what's happening

12 years agoUse `.form-control` in input sizing CSS
Mark Otto [Fri, 26 Jul 2013 22:41:16 +0000 (15:41 -0700)] 
Use `.form-control` in input sizing CSS

12 years agoTweak side nav styles
Mark Otto [Fri, 26 Jul 2013 22:34:50 +0000 (15:34 -0700)] 
Tweak side nav styles

12 years agoMerge pull request #8630 from caouecs/patch-1
Chris Rebert [Fri, 26 Jul 2013 22:14:08 +0000 (15:14 -0700)] 
Merge pull request #8630 from caouecs/patch-1

Fix example of textarea in css.html

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 26 Jul 2013 22:13:41 +0000 (15:13 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agogrunt on previous commits
Mark Otto [Fri, 26 Jul 2013 22:13:03 +0000 (15:13 -0700)] 
grunt on previous commits

12 years agoREADME: update stray "2.3.2" to "2.3.3"
Chris Rebert [Fri, 26 Jul 2013 22:12:32 +0000 (15:12 -0700)] 
README: update stray "2.3.2" to "2.3.3"

12 years agoExample of textarea 8630/head
Fred Delrieu [Fri, 26 Jul 2013 22:09:27 +0000 (00:09 +0200)] 
Example of textarea

12 years agoMerge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3
Mark Otto [Fri, 26 Jul 2013 22:08:45 +0000 (15:08 -0700)] 
Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3

Conflicts:
css.html

12 years agoFixes #8605: use `.form-control` in `.input-group` instead of HTML tags
Mark Otto [Fri, 26 Jul 2013 21:31:24 +0000 (14:31 -0700)] 
Fixes #8605: use `.form-control` in `.input-group` instead of HTML tags

12 years agomore readme clarity and reorg--think this makes more sense now
Mark Otto [Fri, 26 Jul 2013 21:15:48 +0000 (14:15 -0700)] 
more readme clarity and reorg--think this makes more sense now

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 26 Jul 2013 21:09:45 +0000 (14:09 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agomore readme love
Mark Otto [Fri, 26 Jul 2013 21:09:12 +0000 (14:09 -0700)] 
more readme love

12 years agotweak terminology to be pedantically correct & add link
Chris Rebert [Fri, 26 Jul 2013 21:04:35 +0000 (14:04 -0700)] 
tweak terminology to be pedantically correct & add link

12 years agoupdate 2.3.x version mention and link in readme
Mark Otto [Fri, 26 Jul 2013 20:59:56 +0000 (13:59 -0700)] 
update 2.3.x version mention and link in readme

12 years agoupdate readme per comments in pr
Mark Otto [Fri, 26 Jul 2013 20:58:18 +0000 (13:58 -0700)] 
update readme per comments in pr

12 years agoMerge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3...
Mark Otto [Fri, 26 Jul 2013 20:51:27 +0000 (13:51 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3.0.0-wip

12 years agoMake customize layout match default layout
Mark Otto [Fri, 26 Jul 2013 20:50:55 +0000 (13:50 -0700)] 
Make customize layout match default layout

12 years agoMore customizer changes, and revert to placeholder layout
Mark Otto [Fri, 26 Jul 2013 18:17:48 +0000 (11:17 -0700)] 
More customizer changes, and revert to placeholder layout

12 years agoFix broken indentation
Mark Otto [Fri, 26 Jul 2013 18:11:09 +0000 (11:11 -0700)] 
Fix broken indentation

Not sure when or how this happened, but I just noticed it—4 spaces were
used instead of 2.

12 years agoVars update
Mark Otto [Fri, 26 Jul 2013 18:08:27 +0000 (11:08 -0700)] 
Vars update

* Drop progress bar text-shadow
* Reorganize popover and tooltip vars and fix complier error due to
missing `;`
* Run `grunt`