4f793752c5
temporarily undo @fat's scrollspy enhancement since it fucks firefox and ie
2013-07-27 23:53:09 -07:00
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
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
efac0bf8d6
make pull-right !important
2013-07-28 14:05:47 +08:00
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
c25bf6ba46
Merge pull request #8695 from twbs/fix-grunt-jshint
...
Fix grunt jshint
2013-07-27 21:43:27 -07:00
03b2866b9e
tweak Gruntfile.js so it passes jshint
2013-07-27 21:39:11 -07:00
ba62cfeffe
workaround possible bug in grunt-contrib-jshint
2013-07-27 21:38:59 -07:00
880f43221d
tweak Gruntfile.js so it passes jshint
2013-07-27 21:33:41 -07:00
8a430b3698
workaround possible bug in grunt-contrib-jshint
2013-07-27 21:33:11 -07:00
d149f651f2
Add Bootstrap JS to make collapsible nav work
...
This example uses the collapsible nav for smaller screen sizes, and it
requires Bootstrap JS to get that functionality.
2013-07-27 20:40:24 -07:00
cee5f6fbdf
Add new 'form-control' class to style header inputs
2013-07-27 20:39:24 -07:00
1a1bc33406
Replace 'input-block-level' with 'form-control'
...
'input-block-level' was replaced with 'form-control' in v3. To get
block-level inputs, the 'form-control' class is now needed.
2013-07-27 20:24:28 -07:00
ce1fdc5ded
Update carousel example JS path
...
'bootstrap.min.js' lives in '../bootstrap/js' now. Switch to the
minified version for a smaller download since this example is focused
on CSS changes, not JavaScript ones.
2013-07-27 20:17:53 -07:00
c834b4027c
Match .carousel-inner specificity to beat styles
...
'.carousel ing' was replaced with '.carousel-inner > .item > img' in
3.0 and now loses the specificity war. To make carousel images 500px
tall, match specificity to make carousel.css win.
2013-07-27 20:14:49 -07:00
7b6f85c179
Remove back to top link from docs
2013-07-27 19:50:33 -07:00
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
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
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
2f39259d9b
Merge pull request #8685 from jouve/3.0.0-wip
...
fix README.md
2013-07-27 18:13:54 -07:00
b4f5687c05
fix README.md
2013-07-28 02:52:39 +02:00
e953c23019
fixes #8659 : remove lingering .nav-header
2013-07-27 16:51:04 -07:00
8cb1b766f8
fixes #8642 : use .pull-right to keep dropdowns aligned in example
2013-07-27 16:41:02 -07:00
14f688c7fc
fixes #8675 : align horizontal form label and input
2013-07-27 16:37:45 -07:00
51515e6791
Merge pull request #8676 from sprice/update-editorconfig
...
Remove Makefile section from .editorconfig
2013-07-27 14:56:29 -07:00
d8b477f273
Use local copy of jquery instead of hotlinking
2013-07-27 14:30:38 -07:00
dfa71726a9
Fix path to bootstrap javascript
2013-07-27 14:28:13 -07:00
d14c72f334
Remove Makefile section from .editorconfig
2013-07-27 14:04:46 -07:00
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
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
1ca5c2bdb9
Merge pull request #8663 from mekishizufu/fix-typo
...
Fix typo in css.html
2013-07-27 11:24:32 -07:00
273a388995
Fixed minor typos in javascript.html
2013-07-28 00:57:12 +07:00
f670282b40
Fix typo in css.html
2013-07-27 18:40:35 +02:00
9eef7e0b1d
Update getting-started.html
2013-07-27 17:30:44 +02:00
7f6c089e45
Fixed minor typos in css.html
2013-07-27 19:27:45 +07:00
9c63ffa00f
update links to point to download links
2013-07-27 01:06:59 -07:00
d78c85c82a
unfuck broke links in docs
2013-07-27 00:47:08 -07:00
80123fc039
mo links, fix ads and analytics in gh pages
2013-07-27 00:35:26 -07:00
94df8090a7
fixes for hella broken links on account of jekyll and twbs.github.com links
2013-07-27 00:28:23 -07:00
0f2b22a210
herpy derpy shit for urls
2013-07-27 00:18:12 -07:00
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
c884e51bfc
2.3.2 not 2.3.3
2013-07-26 23:24:02 -07:00
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
b1e01a1b04
update js title
2013-07-26 23:14:21 -07:00
40d398bcd0
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 23:04:12 -07:00
c8883647ae
add cname
2013-07-26 23:04:03 -07:00
d0cafdd3a8
rebuild + use serif arrows
2013-07-26 22:59:21 -07:00
4f4e74be78
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 22:41:34 -07:00
0da0b321ab
small copy change
2013-07-26 22:36:23 -07:00
45f6f1629b
ignore the gruntfile from jekyll
2013-07-26 22:31:14 -07:00
Mark Otto