Mark Otto
e68d3b961e
Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets
...
Conflicts:
package.json
2014-01-11 14:48:04 -08:00
Mark Otto
3a8e99e91e
Fixes #12171 : Ensure panel groups have a bottom margin since we nuke it on child panels
2014-01-10 18:56:44 -08:00
Mark Otto
7f153974e1
Fixes #11990 and #12159 : Make range inputs block level and 100% wide by default
2014-01-09 18:07:14 -08:00
Mark Otto
99b66c1f2c
grunt dist
2014-01-09 18:06:46 -08:00
Chris Rebert
fc62379e61
grunt dist
2014-01-09 11:11:13 -08:00
Chris Rebert
72ff8ff9fb
grunt dist
2014-01-08 18:39:08 -08:00
XhmikosR
d06d61dc12
Use single quotes in the jqueryCheck too.
2014-01-08 13:41:17 +02:00
XhmikosR
d7bf9372ec
Remove extra newline from banner.
2014-01-08 13:41:17 +02:00
Julian Thilo
8fd177bfa7
Fix #12073 : Consistent order of variations
...
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
2014-01-07 22:24:45 +01:00
Julian Thilo
7fcfe61f4d
Update copyright notices in all places
...
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
2014-01-07 01:05:24 +01:00
Zlatan Vasović
1c83d68ca4
New Year
2014-01-01 15:37:08 +01:00
Mark Otto
50cf0b1a9d
Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030 : navbar toggle focus state
2013-12-31 18:23:10 -08:00
fat
d18ba50837
add note about ios dropdown compat
2013-12-29 19:40:31 -08:00
fat
8a62f21113
fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')
2013-12-29 19:01:32 -08:00
fat
76f0d0ff32
fixes #11373 - adds related target to dropdown events
2013-12-29 18:57:22 -08:00
fat
162d9e1776
Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top
...
Conflicts:
dist/js/bootstrap.min.js
2013-12-29 18:04:43 -08:00
fat
ce4a2e4352
fixes #11288 - Vertical scroll position of modal saves between openings
2013-12-29 17:53:59 -08:00
fat
5bf13914e4
fixes #10658 jQuery Popover content loses bound events on second setContent call.
2013-12-28 20:59:45 -08:00
Mark Otto
a2aaf80c7e
grunt on last merge
2013-12-27 16:41:25 -08:00
fat
c595db19ff
fixes #10911 - add loading event for use with remote option :|
2013-12-26 20:26:27 -08:00
fat
d21369c1ed
fixes #10890
2013-12-26 19:40:18 -08:00
fat
cd0ad94aae
rebuild
2013-12-26 18:30:16 -08:00
fat
34fb5767cb
fixes #10798
2013-12-26 17:53:31 -08:00
fat
fc7049b18f
fixes #10675
2013-12-25 20:33:05 -08:00
fat
3161acd710
build js
2013-12-25 20:04:49 -08:00
fat
394e0fa611
fixes #11788 - focusin focusout instead of focus/blur
2013-12-24 17:00:34 -08:00
fat
c77740bd3a
fixes #11720 - Add events trigger to affix
2013-12-24 16:29:51 -08:00
fat
a93a753c7d
fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering
2013-12-24 13:07:42 -08:00
fat
fe7fffe034
Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
...
Conflicts:
js/tests/unit/carousel.js
2013-12-24 12:50:55 -08:00
fat
558b6a478d
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
2013-12-24 12:35:24 -08:00
fat
50bd4edb8c
fixes #10236
...
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load
2013-12-24 12:32:06 -08:00
Mark Otto
04ec4354ed
don't roll back that comment
2013-12-24 12:18:53 -08:00
Mark Otto
5c2dfbf33b
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
docs-assets/js/raw-files.js
2013-12-24 12:17:48 -08:00
Mark Otto
679c786237
roll back version numbers to avoid broken links in docs and readme ( fixes #12000 )
2013-12-24 12:16:17 -08:00
fat
fe839e6e78
change where modal loads content -– fixes #10105 , #9318 , #9459
2013-12-23 23:30:06 -08:00
fat
1fc08c1973
fixes #10568 - kill hoverstate info once command has been executed
2013-12-23 22:57:39 -08:00
fat
a87b150bc7
fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class
2013-12-23 22:08:43 -08:00
Supergibbs
f3ce6a9696
Fixes #10492 better:
...
- Made more generic. Applies to "> .table" and "> .table-responsive > .table" to support td/tr background colors too and not just .table-striped
- Supports tfoot
2013-12-23 16:07:55 -08:00
Mark Otto
37bc0c230d
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-23 13:26:01 -08:00
Mark Otto
4376ce8466
Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces
2013-12-23 13:25:51 -08:00
Zlatan Vasović
608926e808
Improve banner
2013-12-23 18:02:42 +01:00
Mark Otto
9fc0e20381
Fixes #10492 and some of #11970 : round the proper corner on table cells in panels
2013-12-22 22:31:13 -08:00
Tobias Lindig
7f599cedf3
add new variables for "pagination" to improve support of customizing
2013-12-20 17:06:53 +01:00
Mark Otto
2854c5c3fb
Fixes #11952 : Refactor blockquote styles
...
* Deprecate .pull-right class for .blockquote-reverse
* Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content
2013-12-19 19:40:08 -08:00
Zlatan Vasović
1bf5abab31
No leading pluses
2013-12-19 15:32:37 +01:00
fat
22f9767714
check that href id's are followed by valid char – fixes #10044
2013-12-18 21:14:01 -08:00
Chris Rebert
df3716647d
update licensing header in JS files & run grunt
2013-12-18 15:29:19 -08:00
Mark Otto
922cd046ef
grunt after that carousel merge
2013-12-18 15:13:50 -08:00
Mark Otto
40651cf1ea
more license mentions
2013-12-18 15:08:16 -08:00
Mark Otto
e8e60ae4bc
version bump
2013-12-18 14:56:08 -08:00
