rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Code Issues Actions Packages Releases Activity
9,813 Commits 108 Branches 89 Tags 553 MiB
a2fd9a4e90
Commit Graph

9813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
61dbc6134e Merge branch 'master' of github.com:twbs/bootstrap 2014-06-09 21:56:45 -07:00
Mark Otto
2535f7c79a fixes #13769 2014-06-09 21:45:55 -07:00
Mark Otto
12aeeaca0e Merge pull request #13768 from twbs/font_files_docs 
Simpler and updated docs copy for icon font file paths
 2014-06-09 21:35:05 -07:00
Mark Otto
d2061e8aeb relative 2014-06-09 21:26:57 -07:00
Mark Otto
24a9b34add typo 2014-06-09 21:08:24 -07:00
Mark Otto
b35840e48d simpler and updated docs copy for icon font file paths 2014-06-09 21:00:27 -07:00
Chris Rebert
2213a5b756 bump grunt-contrib-connect to ~0.8.0 2014-06-09 17:32:10 -07:00
Chris Rebert
b4ab047b81 update shrinkwrap 2014-06-09 17:26:49 -07:00
Chris Rebert
a6fac741ea README: move badges to separate line 
much badge, so wow
 2014-06-09 17:05:01 -07:00
Chris Rebert
c20c0d9dff Merge pull request #13766 from twbs/npm-badge 
Add npm version badge to README
 2014-06-09 17:02:39 -07:00
Chris Rebert
8b3d27e01c Add npm version badge to README 
Follow-up to #12857

[skip sauce] [skip validator]
 2014-06-09 17:01:55 -07:00
XhmikosR
48e2f92aab Fix favicon.ico after d763b0fe5b. 2014-06-09 11:13:24 +03:00
XhmikosR
41b92b967a Run grunt. 
[ci skip]
 2014-06-09 11:10:09 +03:00
XhmikosR
8cdc34f6e3 Update filesaver.js to v2014-05-27. 
[ci skip]
 2014-06-09 11:10:08 +03:00
XhmikosR
91bed93d55 Update Blob.js to v2014-05-31. 
[ci skip]
 2014-06-09 11:10:08 +03:00
Mark Otto
1309085d57 change up the padding on bs-docs-header container to alleviate #13682 2014-06-08 23:09:06 -07:00
Mark Otto
8d9ef8f0a1 Addresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients 2014-06-08 23:02:16 -07:00
Mark Otto
85cde774b9 remove max-width: 100%; from table and place it on .table 2014-06-08 16:54:05 -07:00
Mark Otto
aee18bcc4a Merge pull request #13707 from bcullman/bcullman-remove-table-max-width 
removing unnecessary max-width on tables
 2014-06-08 16:53:14 -07:00
Mark Otto
4e67dc8109 Merge pull request #13738 from thomaswelton/issue-13737-fix-ie11-rem-sizing 
Use px for font-size fixes #13737
 2014-06-08 16:38:17 -07:00
Mark Otto
76277f87b8 Merge pull request #13189 from twbs/apple-touch-icon 
New apple touch icon and favicon
 2014-06-08 16:18:09 -07:00
Jacob
fe74a8bb3e Merge pull request #13755 from twbs/fat-visual-test 
Adds isolated visual tests for javascript plugins (decoupled from docs)....
 2014-06-08 16:05:08 -07:00
XhmikosR
e1f9c25f8d Losslessly compress apple-touch-icon-precomposed.png. 2014-06-09 01:15:08 +03:00
Mark Otto
d763b0fe5b new icons 2014-06-09 01:15:08 +03:00
XhmikosR
29d00e0cd7 Move apple-touch-icon-precomposed.png and favicon.ico in docs root. 
This way, it works in all browsers.
 2014-06-09 01:14:44 +03:00
XhmikosR
79cbf5501e Use a 152x152 apple touch icon. 2014-06-09 01:14:44 +03:00
XhmikosR
9884a3d775 Re-create favicon.ico from the new SVG image. 2014-06-09 01:14:44 +03:00
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
fat
91103e6d1f Adds isolated visual tests for javascript plugins (decoupled from docs). This makes it 
faster and easier to test/develop js functionality not represented in unit tests, and gives us
a playground for interactions, etc.

It also makes it so developing javascript is now decoupled form jekyll, which should make everything
faster and less painful.

This commit also reverts my filter commit 9900771aa7
which broke scrollspy for dropdowns.
 2014-06-07 19:11:44 -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