0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Commit Graph

5437 Commits

Author SHA1 Message Date
Mark Otto
2e9ca57781 Merge branch '3.0.0-wip' into gh-pages 2013-07-28 00:09:05 -07:00
Mark Otto
b9ff423443 derp, no s on that url 2013-07-28 00:08:55 -07:00
Mark Otto
f319ec1f2a add new zip 2013-07-28 00:04:09 -07:00
Mark Otto
92bd778f45 Merge branch '3.0.0-wip' into gh-pages 2013-07-28 00:03:33 -07:00
Mark Otto
c6aedfb877 point to different download urls 2013-07-28 00:03:24 -07:00
Mark Otto
841711f2f6 Merge branch '3.0.0-wip' into gh-pages 2013-07-27 23:53:23 -07:00
Mark Otto
4f793752c5 temporarily undo @fat's scrollspy enhancement since it fucks firefox and ie 2013-07-27 23:53:09 -07:00
Mark Otto
939c9590e5 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-27 23:45:11 -07:00
Mark Otto
3d06ee3fa8 restore 2.3.2 zip 2013-07-27 23:40:39 -07:00
Chris Rebert
908f4c342b Merge pull request #8696 from twbs/jshintrc
get jshint close to passing by updating .jshintrc settings
2013-07-27 23:12:00 -07:00
Chris Rebert
9c672c6b20 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.
2013-07-27 21:56:44 -07:00
Chris Rebert
c25bf6ba46 Merge pull request #8695 from twbs/fix-grunt-jshint
Fix grunt jshint
2013-07-27 21:43:27 -07:00
Chris Rebert
03b2866b9e tweak Gruntfile.js so it passes jshint 2013-07-27 21:39:11 -07:00
Chris Rebert
ba62cfeffe workaround possible bug in grunt-contrib-jshint 2013-07-27 21:38:59 -07:00
Chris Rebert
880f43221d tweak Gruntfile.js so it passes jshint 2013-07-27 21:33:41 -07:00
Chris Rebert
8a430b3698 workaround possible bug in grunt-contrib-jshint 2013-07-27 21:33:11 -07:00
Mark Otto
7b6f85c179 Remove back to top link from docs 2013-07-27 19:50:33 -07:00
Mark Otto
ce57378705 fixes #8665: have modals use auto margin on sides and widen it instead of positioning and negative margin 2013-07-27 19:38:05 -07:00
Mark Otto
5aad25b34b Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-27 18:56:52 -07:00
Mark Otto
b281ad6409 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
2013-07-27 18:56:31 -07:00
Chris Rebert
2f39259d9b Merge pull request #8685 from jouve/3.0.0-wip
fix README.md
2013-07-27 18:13:54 -07:00
Cyril Jouve
b4f5687c05 fix README.md 2013-07-28 02:52:39 +02:00
Mark Otto
e953c23019 fixes #8659: remove lingering .nav-header 2013-07-27 16:51:04 -07:00
Mark Otto
8cb1b766f8 fixes #8642: use .pull-right to keep dropdowns aligned in example 2013-07-27 16:41:02 -07:00
Mark Otto
14f688c7fc fixes #8675: align horizontal form label and input 2013-07-27 16:37:45 -07:00
Mark Otto
51515e6791 Merge pull request #8676 from sprice/update-editorconfig
Remove Makefile section from .editorconfig
2013-07-27 14:56:29 -07:00
Shawn Price
d14c72f334 Remove Makefile section from .editorconfig 2013-07-27 14:04:46 -07:00
Mark Otto
57bc65f7f8 Merge pull request #8650 from loic/3.0.0-wip
Fixed minor typos in css.html
2013-07-27 11:26:28 -07:00
Mark Otto
1fb1c40aba Merge pull request #8657 from Micronax/3.0.0-wip
Added rel="stylesheet" to CDN-Examples
2013-07-27 11:25:17 -07:00
Mark Otto
1ca5c2bdb9 Merge pull request #8663 from mekishizufu/fix-typo
Fix typo in css.html
2013-07-27 11:24:32 -07:00
Loic Bistuer
273a388995 Fixed minor typos in javascript.html 2013-07-28 00:57:12 +07:00
Jiri Pospisil
f670282b40 Fix typo in css.html 2013-07-27 18:40:35 +02:00
Fabian Golle
9eef7e0b1d Update getting-started.html 2013-07-27 17:30:44 +02:00
Loic Bistuer
7f6c089e45 Fixed minor typos in css.html 2013-07-27 19:27:45 +07:00
Mark Otto
2572f6fcd7 Merge branch '3.0.0-wip' into gh-pages 2013-07-27 01:09:35 -07:00
Mark Otto
9c63ffa00f update links to point to download links 2013-07-27 01:06:59 -07:00
Mark Otto
866353ea4f Merge branch '3.0.0-wip' into gh-pages 2013-07-27 00:47:18 -07:00
Mark Otto
d78c85c82a unfuck broke links in docs 2013-07-27 00:47:08 -07:00
Mark Otto
8c7b0785f4 restore ads 2013-07-27 00:43:20 -07:00
Mark Otto
05ed37fbeb Merge branch '3.0.0-wip' into gh-pages 2013-07-27 00:35:38 -07:00
Mark Otto
80123fc039 mo links, fix ads and analytics in gh pages 2013-07-27 00:35:26 -07:00
Mark Otto
2e9d3a69fd Merge branch '3.0.0-wip' into gh-pages 2013-07-27 00:28:39 -07:00
Mark Otto
94df8090a7 fixes for hella broken links on account of jekyll and twbs.github.com links 2013-07-27 00:28:23 -07:00
Mark Otto
77cfe6f4b2 Merge branch '3.0.0-wip' into gh-pages 2013-07-27 00:18:27 -07:00
Mark Otto
0f2b22a210 herpy derpy shit for urls 2013-07-27 00:18:12 -07:00
Mark Otto
dde6c2ae45 adding 2.3.2 dir 2013-07-26 23:55:46 -07:00
Mark Otto
295a87ab0f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 23:28:20 -07:00
Mark Otto
c884e51bfc 2.3.2 not 2.3.3 2013-07-26 23:24:02 -07:00
fat
ec42ddf1f4 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 23:14:48 -07:00
fat
b1e01a1b04 update js title 2013-07-26 23:14:21 -07:00