rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity
7,744 Commits 108 Branches 89 Tags 547 MiB
0fab6e7ea7
Commit Graph

66 Commits

Author SHA1 Message Date
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
Mark Otto
96b5ae8b6a grunt 2013-12-22 22:32:35 -08:00
Mark Otto
51628d2050 grunt 2013-12-22 21:00:53 -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
e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
Mark Otto
f29132350c grunt 2013-12-18 14:52:50 -08:00
Mark Otto
83c60ef3ee Merge branch 'master' into pr/11107 
Conflicts:
	docs-assets/js/raw-files.js
 2013-12-14 16:20:19 -08:00
Mark Otto
b9b17bc72b grunt 2013-12-09 00:09:52 -08:00
Mark Otto
cdb7d9839e grunt 2013-12-08 17:21:37 -08:00
Mark Otto
1f9bfa89dc Fixes #11741: Don't set headings font-family again, just use inherit 2013-12-08 02:14:24 -08:00
Mark Otto
a9b86cbfde Merge branch 'pr/11138' 
Conflicts:
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
 2013-12-07 14:10:41 -08:00
Mark Otto
aac4f0189e one last grunt 2013-12-04 22:54:03 -08:00
Mark Otto
45930acdf7 Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization. 
Also addresses #10371, #10395, and #10465.
 2013-12-04 22:32:56 -08:00
Mark Otto
cf81cb60ef Merge branch 'master' into gradient-prefix-cleanup 
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
 2013-12-04 21:23:09 -08:00
Mark Otto
8c5dc542a5 grunt 2013-12-04 21:22:24 -08:00
awebdeveloper
3f1e4b92ee -moz and old webkit syntax removed for gradients based on 
http://caniuse.com/#search=grad
 2013-12-03 14:13:55 -08:00
Chris Rebert
303f8a33c3 add <table> case to responsive-visibility mixin; see #10056 2013-12-03 13:57:28 -08:00
Chris Rebert
bac153127c grunt 2013-12-03 13:54:56 -08:00
Mark Otto
8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto
118e901eb1 grunt 2013-12-01 19:30:10 -08:00
Mark Otto
25bc5322aa grunt 2013-12-01 18:35:58 -08:00
Mark Otto
556d6cef3e Fixes #10941: Fix Glyphicons path for those importing bootstrap.less from another directory 2013-12-01 00:20:47 -08:00
Mark Otto
53047fa587 Merge branch 'master' into pr/11536 
Conflicts:
	dist/css/bootstrap.min.css
 2013-11-30 23:35:56 -08:00
Mark Otto
57070dcf45 grunt 2013-11-30 23:35:08 -08:00
Mark Otto
22da6fcfb2 grunt 2013-11-30 21:17:53 -08:00
Mark Otto
359ac8f66a grunt 2013-11-30 16:21:19 -08:00
Mark Otto
080aa7f5c8 Merge branch 'master' into pr/11299 
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
 2013-11-30 00:55:00 -08:00
Mark Otto
8674228521 Merge branch 'pr/11493' 
Conflicts:
	dist/css/bootstrap.min.css
 2013-11-29 23:30:26 -08:00
Mark Otto
09cd5289ab Fixes #11468: Prevent default gradient on in Firefox for Android 2013-11-29 17:47:27 -08:00
Mark Otto
0be94180b9 grunt 2013-11-28 15:45:45 -08:00
Mark Otto
594d0c700d grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing 2013-11-28 11:33:00 -08:00
Mark Otto
9829c86f7c run grunt 2013-11-26 15:21:27 -08:00
Mark Otto
ae4d5f21a9 fixes #11449: use menlo over monaco 2013-11-16 18:01:59 -08:00
Mark Otto
a2c6daafd0 fixes #10744: back to solid borders on carets 2013-11-16 17:48:31 -08:00
fat
7545da2e3c fixes #11477 and updates slid event in carousel with namespace 2013-11-14 23:58:29 -08:00
Chris Rebert
7a3f41b11b <3 @asselin for figuring out this combo of 2 patches for #9920; re-grunt 2013-11-10 17:25:17 -08:00
Mark Otto
eaff6bc49a grunt 2013-11-06 13:10:51 -08:00
Mark Otto
d1048a7837 run grunt after version bumps 2013-11-06 13:02:15 -08:00
Chris Rebert
89d489dfc7 re-grunt 2013-11-05 16:58:18 -08:00