clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-27 05:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 116 Branches 89 Tags 631 MiB
5dbfdd47c5
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
5dbfdd47c5 fixes #13375 2014-06-08 14:08:06 -07:00
Mark Otto
d1872b4c98 Merge branch 'master' into pr/13736 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-06-08 13:57:44 -07:00
Mark Otto
5cd72ce230 grunt 2014-06-08 13:55:40 -07:00
Mark Otto
14c3760033 Merge pull request #13735 from skhilko/master 
Fix bug where a panel recieve extra top border when placed within a collapsible panel
 2014-06-08 13:53:53 -07:00
Mark Otto
88068e93fa Merge branch 'master' of github.com:twbs/bootstrap 2014-06-08 13:28:56 -07:00
Mark Otto
d1cf27bd03 fix nested containers (addresses some of #13682) 2014-06-08 13:28:45 -07:00
Mark Otto
2919a3dd80 Merge pull request #13542 from twbs/icon_paths 
Fixes #13478, reverts #10941
 2014-06-08 11:23:20 -07:00
Mark Otto
34891de173 grunt 2014-06-08 11:19:35 -07:00
Mark Otto
1e3b93804f grunt 2014-06-08 11:18:59 -07:00
Mark Otto
3ee5542c99 Merge pull request #13649 from ItsJonQ/repaint-fixes-2 
Repaint Fixes When Scrolling
 2014-06-08 11:14:57 -07:00
Mark Otto
7231efabde Merge pull request #13745 from twbs/fix-13281 
set not-allowed cursor on disabled radio+checkbox labels
 2014-06-08 11:05:39 -07:00
Mark Otto
5fd8ca9089 fixes #13210: clean up tooltip example 2014-06-08 10:51:32 -07:00
Mark Otto
98574cd018 Merge pull request #13744 from twbs/fix-13650 
replace SemVer summary with a link to its website
 2014-06-08 10:25:50 -07:00
Chris Rebert
57c8982b1c Merge branch 'mikegreiling-scrollspy-update' 2014-06-07 18:27:32 -07:00
Mike Greiling
1cfa902e31 refactor scrollspy refresh method 
Closes #13702 by merging a rebased version of it.
 2014-06-07 18:26:39 -07:00
Mike Greiling
bc8e6ffb7d removing this.$element as it is a superfluous copy of this.$scrollElement 2014-06-07 18:09:53 -07:00
Mike Greiling
632313d631 no need to check for href attribute on the scrollable element 2014-06-07 18:09:53 -07:00
Mike Greiling
0be4109688 there is no need for this.offsets and this.targets to be jQuery objects 2014-06-07 18:09:53 -07:00
Chris Rebert
2ca6581798 Merge pull request #13752 from twbs/fix-13268 
Proposed fix for #13268
 2014-06-07 18:03:49 -07:00
Chris Rebert
21de05c8c0 don't show tooltips/popovers whose element isn't in the DOM; fixes #13268 2014-06-07 17:54:11 -07:00
Chris Rebert
b23ed1b034 put the tooltips into the DOM in the tooltip unit tests 2014-06-07 17:54:11 -07:00
Chris Rebert
20c099d41a add failing test for #13268 2014-06-07 17:54:10 -07:00
XhmikosR
3b99a41246 Merge pull request #13388 from twbs/xhmikosr-js-style 
Improve JS style
 2014-06-07 09:13:05 +03:00
Chris Rebert
dd7ee517e4 add docs for #13745 
Good catch @juthilo
[skip sauce]
 2014-06-06 17:29:36 -07:00
Chris Rebert
739bf379a9 set not-allowed cursor on disabled radio+checkbox labels; fixes #13281 
[skip validator] [skip sauce]
 2014-06-06 17:23:28 -07:00
Chris Rebert
3cbbc70d55 Merge pull request #13627 from twbs/maybe-fix-12364 
Hopefully fixes trigger focus restoration on modal close
 2014-06-06 15:59:17 -07:00
XhmikosR
03a8949d7c Run grunt. 2014-06-06 01:23:07 +03:00
XhmikosR
e2cabe4971 Minor style tweaks. 2014-06-06 01:23:07 +03:00
XhmikosR
82fc03f3b6 carousel.js: remove unneeded variable assignment. 
`slideIndex` is assigned to the same value a few lines above.
 2014-06-06 01:23:07 +03:00
XhmikosR
7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03:00
XhmikosR
5ef9383f53 Tweak JSHint and JSCS checks. 
Be more consistent across the whole codebase.

Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest.
 2014-06-06 01:23:06 +03:00
Chris Rebert
a8641b4db7 Merge pull request #10632 from stuartpb/patch-1 
Customizer: Alert on successful save to Gist
 2014-06-05 13:58:22 -07:00
Chris Rebert
47a0de9b93 replace SemVer summary with a link to its website; fixes #13650 
[skip validator] [skip sauce]
 2014-06-05 12:06:09 -07:00
Chris Rebert
ef436c761b Merge pull request #13740 from jasny/patch-composer-replace 
Added rename directive for composer
 2014-06-05 09:02:36 -07:00
Arnold Daniels
53b8254fe0 Added directive for composer 2014-06-05 13:24:56 +02:00
Ben Zumhagen
5872a7e0ac Resolves Issue #13689 
Doing this the right way this time. Hiding .panel-footer top border when
preceeded by a .list-group. This should resolve the "double border"
issue.
 2014-06-04 22:18:40 -04:00
Siarhei Khilko
f87a023153 Fix bug where a panel recieve extra top border 
https://github.com/twbs/bootstrap/issues/13734

A panel placed inside of a collapsible panel recieve extra top border.

This commit reduces the effect of a selector to apply a border only to
the collapsible panel body itself, not to any panel placed within it.
 2014-06-04 15:20:36 -07:00
Chris Rebert
f9495eab12 Merge pull request #13732 from twbs/bump-sauce 
Bump grunt-saucelabs to ~8.0.2
 2014-06-04 13:40:23 -07:00
Chris Rebert
e91eaa2884 update shrinkwrap 
[skip validator]
 2014-06-04 12:40:53 -07:00
Chris Rebert
f0c97bf758 bump grunt-saucelabs to ~8.0.2 2014-06-04 12:38:26 -07:00
Chris Rebert
6d7c0b2513 Merge pull request #13731 from twbs/bump-deps 
Bump dependency versions
 2014-06-04 12:36:17 -07:00
Chris Rebert
19987cc285 update shrinkwrap 
[skip sauce] [skip validator]
 2014-06-04 12:21:42 -07:00
Chris Rebert
34621740b3 bump grunt-contrib-jade to ~0.12.0 2014-06-04 12:06:47 -07:00
Chris Rebert
094e42883a bump grunt-contrib-qunit to ~0.5.1 2014-06-04 12:06:03 -07:00
Chris Rebert
c0ba4622c1 Merge pull request #13716 from rustinlee/fix-creators-anchor 
Changed broken #authors anchor to #creators
 2014-06-02 13:02:27 -07:00
Rustin Wollin
22cdf4ae94 Changed broken #authors anchor to #creators 2014-06-02 15:43:57 -04:00
Chris Rebert
5a1614466d Merge pull request #13700 from twbs/role-menu-all-the-things 
add missing role="menu" attrs to .dropdown-menu elements in docs+examples
 2014-05-28 17:21:58 -07:00
Chris Rebert
95ff94091e add missing role="menu" attrs to .dropdown-menu elements in docs+examples 
Docs audit prompted by #13697.
[skip sauce]
 2014-05-28 17:18:22 -07:00
Chris Rebert
ad34c3b061 fix #13697 
[skip sauce]
 2014-05-28 16:52:47 -07:00
Chris Rebert
8e568a8e36 grunt dist 2014-05-23 15:49:13 -07:00