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

7895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
0a75e4c09b fixes #10283 2013-12-24 12:40:24 -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
1da3a8c6b1 Merge pull request #12001 from soundarapandian/fix_typo_contributing 
Use correct directory name for bootstrap contribution
 2013-12-24 12:24:07 -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
Gleb Mazovetskiy
25390716ea Reflect sass readme change in css.html 2013-12-24 17:20:52 +01:00
soundarapandian
8b564f9e32 Use correct directory name for bootstrap contribution 2013-12-24 16:05:19 +05:30
Jacob
237b85a7c1 Merge pull request #11933 from twbs/fat-10105 
change where modal loads content -– fixes #10105, #9318, #9459
 2013-12-23 23:31:11 -08:00
fat
fe839e6e78 change where modal loads content -– fixes #10105, #9318, #9459 2013-12-23 23:30:06 -08:00
Mark Otto
52a964d19b Merge pull request #11999 from XhmikosR/respond.js 
Update Respond.js
 2013-12-23 23:26:05 -08:00
XhmikosR
3d65fc2b65 Update Respond.js to v1.4.2. 2013-12-24 09:22:53 +02: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
71e9db4183 add callout about justified button group borders to address #11964 2013-12-23 20:28:21 -08:00
Mark Otto
340e2f5534 Merge pull request #11970 from supergibbs/Better_10492_fix 
Fixes #10492 better
 2013-12-23 18:53:30 -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
0bd5bca695 Fixes #11975: Change from png to .ico for favicon 2013-12-23 15:16:25 -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
Mark Otto
00850e247c Merge pull request #11989 from ZDroid/banner 
Improve banner
 2013-12-23 12:42:41 -08:00
Zlatan Vasović
608926e808 Improve banner 2013-12-23 18:02:42 +01:00
Mark Otto
f32796559a Merge pull request #11978 from XhmikosR/clean-up-_gh-pages 
Jekyll: exclude more files/folders.
 2013-12-22 23:15:35 -08:00
Mark Otto
96b5ae8b6a grunt 2013-12-22 22:32:35 -08:00
Mark Otto
6fda30e1c4 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-22 22:31:28 -08: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
Mark Otto
45a8a9508e Merge pull request #11974 from XhmikosR/meta 
Normalize meta
 2013-12-22 22:20:23 -08:00
Mark Otto
90ba7fa836 Merge pull request #11972 from XhmikosR/comma 
Get rid of JSHint's `laxcomma` option now that the comma is used on the ...
 2013-12-22 22:08:33 -08:00
Mark Otto
b505c8557d fixes #11961: dropdown alignment docs improvements 2013-12-22 22:07:01 -08:00
Mark Otto
6cde19fc33 Merge pull request #11963 from twbs/sass_docs 
Add docs for Sass port
 2013-12-22 21:47:11 -08:00
Mark Otto
fd15b00861 space 2013-12-22 21:42:08 -08:00
Mark Otto
8bc6aeb60a add what's included 2013-12-22 21:27:12 -08:00
Mark Otto
906b0c595b Merge branch 'master' into sass_docs 2013-12-22 21:23:24 -08:00
Mark Otto
cb7cdd0c05 Revert to CSScomb 1.1.0 because 1.2.0 and 1.2.1 fuck up our compiled CSS 2013-12-22 21:18:45 -08:00
Mark Otto
ec13eb8d38 Remove timestamp on generated Glyhpicons 2013-12-22 21:05:08 -08:00
Mark Otto
7ccb0333e4 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-22 21:01:00 -08:00
Mark Otto
51628d2050 grunt 2013-12-22 21:00:53 -08:00
Mark Otto
146800ef43 Merge pull request #11979 from ZDroid/fix-old-links 
Fix old links
 2013-12-22 17:30:35 -08:00
Chris Rebert
fa2380758e Merge pull request #11982 from ZDroid/update-deps 
Update dependencies
 2013-12-22 12:23:52 -08:00
Zlatan Vasović
88c3619d2c Update dependencies 2013-12-22 19:01:00 +01:00
Zlatan Vasović
28adcbe439 Fix old links 
Replace recess with less.
 2013-12-22 16:26:05 +01:00
XhmikosR
ea5a4ec31e Jekyll: exclude more files/folders. 
We still can't exclude `./fonts/" and "./js/" due to https://github.com/jekyll/jekyll/issues/906
 2013-12-22 11:45:18 +02:00
XhmikosR
a05a11e5dc Get rid of JSHint's laxcomma option now that the comma is used on the right side. 2013-12-22 09:02:08 +02:00
XhmikosR
b27fecb7a3 bower.json: sort by name. 2013-12-22 08:59:36 +02:00
XhmikosR
29aaf66a8a Normalize package.json. 2013-12-22 08:59:36 +02:00
XhmikosR
6e3ac8f2a4 js/.jscs.json: sort by name. 2013-12-22 08:59:36 +02:00
Mark Otto
c66924cc1b add section for contents 2013-12-21 10:36:20 -08:00
Mark Otto
2f56922937 config url 2013-12-21 10:09:39 -08:00