]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
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.
Chris Rebert [Sun, 28 Jul 2013 04:33:41 +0000 (21:33 -0700)]
tweak Gruntfile.js so it passes jshint
Chris Rebert [Sun, 28 Jul 2013 04:33:11 +0000 (21:33 -0700)]
workaround possible bug in grunt-contrib-jshint
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
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
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
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
Cyril Jouve [Sun, 28 Jul 2013 00:52:39 +0000 (02:52 +0200)]
fix README.md
Mark Otto [Sat, 27 Jul 2013 23:51:04 +0000 (16:51 -0700)]
fixes #8659: remove lingering .nav-header
Mark Otto [Sat, 27 Jul 2013 23:41:02 +0000 (16:41 -0700)]
fixes #8642: use .pull-right to keep dropdowns aligned in example
Mark Otto [Sat, 27 Jul 2013 23:37:45 +0000 (16:37 -0700)]
fixes #8675: align horizontal form label and input
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
Shawn Price [Sat, 27 Jul 2013 21:04:46 +0000 (14:04 -0700)]
Remove Makefile section from .editorconfig
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
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
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
Loic Bistuer [Sat, 27 Jul 2013 17:57:12 +0000 (00:57 +0700)]
Fixed minor typos in javascript.html
Jiri Pospisil [Sat, 27 Jul 2013 16:40:35 +0000 (18:40 +0200)]
Fix typo in css.html
Fabian Golle [Sat, 27 Jul 2013 15:30:44 +0000 (17:30 +0200)]
Update getting-started.html
Loic Bistuer [Sat, 27 Jul 2013 12:27:45 +0000 (19:27 +0700)]
Fixed minor typos in css.html
Mark Otto [Sat, 27 Jul 2013 08:06:59 +0000 (01:06 -0700)]
update links to point to download links
Mark Otto [Sat, 27 Jul 2013 07:47:08 +0000 (00:47 -0700)]
unfuck broke links in docs
Mark Otto [Sat, 27 Jul 2013 07:35:26 +0000 (00:35 -0700)]
mo links, fix ads and analytics in gh pages
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
Mark Otto [Sat, 27 Jul 2013 07:18:12 +0000 (00:18 -0700)]
herpy derpy shit for urls
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
Mark Otto [Sat, 27 Jul 2013 06:24:02 +0000 (23:24 -0700)]
2.3.2 not 2.3.3
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
fat [Sat, 27 Jul 2013 06:14:21 +0000 (23:14 -0700)]
update js title
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
Mark Otto [Sat, 27 Jul 2013 06:04:03 +0000 (23:04 -0700)]
add cname
fat [Sat, 27 Jul 2013 05:59:21 +0000 (22:59 -0700)]
rebuild + use serif arrows
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
fat [Sat, 27 Jul 2013 05:36:23 +0000 (22:36 -0700)]
small copy change
Mark Otto [Sat, 27 Jul 2013 05:31:14 +0000 (22:31 -0700)]
ignore the gruntfile from jekyll
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
fat [Sat, 27 Jul 2013 05:24:51 +0000 (22:24 -0700)]
fix scrollspy for window *and* children
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
Mark Otto [Sat, 27 Jul 2013 05:17:53 +0000 (22:17 -0700)]
responsive tables all up in js docs
Mark Otto [Sat, 27 Jul 2013 05:11:58 +0000 (22:11 -0700)]
Fix up dropdowns being incorrectly positioned on nav pills
fat [Sat, 27 Jul 2013 05:09:31 +0000 (22:09 -0700)]
use transforms to make the dialog smooooth
Mark Otto [Sat, 27 Jul 2013 05:09:05 +0000 (22:09 -0700)]
Fix broke ass navbar example docs stuff
Mark Otto [Sat, 27 Jul 2013 05:03:52 +0000 (22:03 -0700)]
Fix clipped dropdowns in input groups section of docs
Mark Otto [Sat, 27 Jul 2013 04:52:23 +0000 (21:52 -0700)]
simpler forms docs structure
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
Mark Otto [Sat, 27 Jul 2013 04:40:58 +0000 (21:40 -0700)]
derp
Mark Otto [Sat, 27 Jul 2013 04:35:56 +0000 (21:35 -0700)]
mo tables mo responsive or whatever the hell that means
Mark Otto [Sat, 27 Jul 2013 04:31:00 +0000 (21:31 -0700)]
another responsivey table
Mark Otto [Sat, 27 Jul 2013 04:28:44 +0000 (21:28 -0700)]
Responsivey docs table for grid section
Mark Otto [Sat, 27 Jul 2013 04:12:48 +0000 (21:12 -0700)]
Twerk lead font-size for mobile devices
Mark Otto [Sat, 27 Jul 2013 04:12:35 +0000 (21:12 -0700)]
Broser meta tag docs layout change
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
fat [Sat, 27 Jul 2013 04:01:14 +0000 (21:01 -0700)]
fixes #6937
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
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
fat [Sat, 27 Jul 2013 03:44:35 +0000 (20:44 -0700)]
rebuild + fix #2539
Mark Otto [Sat, 27 Jul 2013 03:36:02 +0000 (20:36 -0700)]
Contrast on old docs callout
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
fat [Sat, 27 Jul 2013 03:34:39 +0000 (20:34 -0700)]
change how collapse works - collapse, collapsing, and in
Mark Otto [Sat, 27 Jul 2013 03:20:21 +0000 (20:20 -0700)]
Color change to sidenav
Mark Otto [Sat, 27 Jul 2013 02:58:46 +0000 (19:58 -0700)]
Mo betta side nav colors
Mark Otto [Sat, 27 Jul 2013 02:50:02 +0000 (19:50 -0700)]
Fix broke ass popovers direction example
Mark Otto [Sat, 27 Jul 2013 02:46:42 +0000 (19:46 -0700)]
Unfuck JS docs spacing and closing divs
Mark Otto [Sat, 27 Jul 2013 02:38:12 +0000 (19:38 -0700)]
Update IDs on customize page
Mark Otto [Sat, 27 Jul 2013 02:37:31 +0000 (19:37 -0700)]
Upate IDs on components page
Mark Otto [Sat, 27 Jul 2013 02:35:24 +0000 (19:35 -0700)]
Update IDs on css page
Mark Otto [Sat, 27 Jul 2013 02:32:15 +0000 (19:32 -0700)]
Update IDs on getting started page
Mark Otto [Sat, 27 Jul 2013 02:32:05 +0000 (19:32 -0700)]
Better spacing of le docs sections
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
fat [Sat, 27 Jul 2013 02:25:45 +0000 (19:25 -0700)]
update docs nav targets
Mark Otto [Sat, 27 Jul 2013 02:25:13 +0000 (19:25 -0700)]
Tweak getting started section
Mark Otto [Sat, 27 Jul 2013 02:24:59 +0000 (19:24 -0700)]
More vars work
Mark Otto [Sat, 27 Jul 2013 02:05:43 +0000 (19:05 -0700)]
Use some vars for key urls for easier updating
Mark Otto [Sat, 27 Jul 2013 01:52:05 +0000 (18:52 -0700)]
more space in sidenav
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
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.
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
Mark Otto [Fri, 26 Jul 2013 23:52:09 +0000 (16:52 -0700)]
Fixes #8293: sub nav links in JS docs
Mark Otto [Fri, 26 Jul 2013 23:01:34 +0000 (16:01 -0700)]
Simpler horizontal form button placement
Mark Otto [Fri, 26 Jul 2013 23:01:24 +0000 (16:01 -0700)]
Ignore less dir in Jekyll
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
Mark Otto [Fri, 26 Jul 2013 22:41:16 +0000 (15:41 -0700)]
Use `.form-control` in input sizing CSS
Mark Otto [Fri, 26 Jul 2013 22:34:50 +0000 (15:34 -0700)]
Tweak side nav styles
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
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
Mark Otto [Fri, 26 Jul 2013 22:13:03 +0000 (15:13 -0700)]
grunt on previous commits
Chris Rebert [Fri, 26 Jul 2013 22:12:32 +0000 (15:12 -0700)]
README: update stray "2.3.2" to "2.3.3"
Fred Delrieu [Fri, 26 Jul 2013 22:09:27 +0000 (00:09 +0200)]
Example of textarea
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
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
Mark Otto [Fri, 26 Jul 2013 21:15:48 +0000 (14:15 -0700)]
more readme clarity and reorg--think this makes more sense now
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
Mark Otto [Fri, 26 Jul 2013 21:09:12 +0000 (14:09 -0700)]
more readme love
Chris Rebert [Fri, 26 Jul 2013 21:04:35 +0000 (14:04 -0700)]
tweak terminology to be pedantically correct & add link
Mark Otto [Fri, 26 Jul 2013 20:59:56 +0000 (13:59 -0700)]
update 2.3.x version mention and link in readme
Mark Otto [Fri, 26 Jul 2013 20:58:18 +0000 (13:58 -0700)]
update readme per comments in pr
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
Mark Otto [Fri, 26 Jul 2013 20:50:55 +0000 (13:50 -0700)]
Make customize layout match default layout
Mark Otto [Fri, 26 Jul 2013 18:17:48 +0000 (11:17 -0700)]
More customizer changes, and revert to placeholder layout
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.