diff options
| author | Mark Otto <[email protected]> | 2013-08-12 21:34:55 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-12 21:34:55 -0700 |
| commit | 80eb09cc1b1db0e7899039f67adf78f0b14ac9a5 (patch) | |
| tree | 7bbfd5e26396c20bd0fecfc5f6aa17eb0a51d019 /_includes | |
| parent | 8bb7def26cac4d3166fbf2cc98f16c4151794676 (diff) | |
| parent | 49576704ea6c24fbc4cb32f44c5986a1e7714634 (diff) | |
| download | bootstrap-80eb09cc1b1db0e7899039f67adf78f0b14ac9a5.tar.xz bootstrap-80eb09cc1b1db0e7899039f67adf78f0b14ac9a5.zip | |
Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts:
components.html
dist/css/bootstrap.min.css
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/social-buttons.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/_includes/social-buttons.html b/_includes/social-buttons.html index 11695ca1b..89a24123e 100644 --- a/_includes/social-buttons.html +++ b/_includes/social-buttons.html @@ -1,10 +1,10 @@ <div class="bs-social"> <ul class="bs-social-buttons"> <li> - <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20" title="Star on GitHub"></iframe> + <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=watch&count=true" width="100" height="20" title="Star on GitHub"></iframe> </li> <li> - <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102" height="20" title="Fork on GitHub"></iframe> + <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=fork&count=true" width="102" height="20" title="Fork on GitHub"></iframe> </li> <li class="follow-btn"> <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a> |