Skip to content

Commit

Permalink
Renamed google-plus >> google
Browse files Browse the repository at this point in the history
  • Loading branch information
lipis committed Apr 20, 2015
1 parent a9541f0 commit b53226d
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Available classes
- `btn-flickr`
- `btn-foursquare`
- `btn-github`
- `btn-google-plus`
- `btn-google`
- `btn-instagram`
- `btn-linkedin`
- `btn-microsoft`
Expand Down Expand Up @@ -54,6 +54,6 @@ Examples

Pull Requests
-------------
If you are about to create a new **Pull Request** for adding a new button or
fixing something, don't update the minified `bootstrap-social.css` file. It
If you are about to create a new **Pull Request** for adding a new button or
fixing something, don't update the minified `bootstrap-social.css` file. It
will be generated automatically after a successful merge.
8 changes: 4 additions & 4 deletions bootstrap-social.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bootstrap-social.less
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
.btn-flickr { .btn-social(#ff0084); }
.btn-foursquare { .btn-social(#f94877); }
.btn-github { .btn-social(#444444); }
.btn-google-plus { .btn-social(#dd4b39); }
.btn-google { .btn-social(#dd4b39); }
.btn-instagram { .btn-social(#3f729b); }
.btn-linkedin { .btn-social(#007bb6); }
.btn-microsoft { .btn-social(#2672ec); }
Expand Down
2 changes: 1 addition & 1 deletion bootstrap-social.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ $bs-height-xs: (floor($font-size-small * 1.2) + $padding-small-vertical + 1);
.btn-flickr { @include btn-social(#ff0084); }
.btn-foursquare { @include btn-social(#f94877); }
.btn-github { @include btn-social(#444444); }
.btn-google-plus { @include btn-social(#dd4b39); }
.btn-google { @include btn-social(#dd4b39); }
.btn-instagram { @include btn-social(#3f729b); }
.btn-linkedin { @include btn-social(#007bb6); }
.btn-microsoft { @include btn-social(#2672ec); }
Expand Down
22 changes: 11 additions & 11 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h3>The Buttons</h3>
<a class="btn btn-block btn-social btn-github" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-github']);">
<i class="fa fa-github"></i> Sign in with GitHub
</a>
<a class="btn btn-block btn-social btn-google-plus" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-google-plus']);">
<a class="btn btn-block btn-social btn-google" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-google']);">
<i class="fa fa-google-plus"></i> Sign in with Google
</a>
<a class="btn btn-block btn-social btn-instagram" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-instagram']);">
Expand Down Expand Up @@ -137,7 +137,7 @@ <h3>The Buttons</h3>
<a class="btn btn-social-icon btn-flickr" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-flickr']);"><i class="fa fa-flickr"></i></a>
<a class="btn btn-social-icon btn-foursquare" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-foursquare']);"><i class="fa fa-foursquare"></i></a>
<a class="btn btn-social-icon btn-github" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-github']);"><i class="fa fa-github"></i></a>
<a class="btn btn-social-icon btn-google-plus" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-google-plus']);"><i class="fa fa-google-plus"></i></a>
<a class="btn btn-social-icon btn-google" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-google']);"><i class="fa fa-google-plus"></i></a>
<a class="btn btn-social-icon btn-instagram" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-instagram']);"><i class="fa fa-instagram"></i></a>
<a class="btn btn-social-icon btn-linkedin" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-linkedin']);"><i class="fa fa-linkedin"></i></a>
<a class="btn btn-social-icon btn-microsoft" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-microsoft']);"><i class="fa fa-windows"></i></a>
Expand All @@ -163,7 +163,7 @@ <h3>Available Classes</h3>
<li data-code="flickr" data-name="Flickr"><code>btn-flickr</code> <span class="social-hex">#2BA9E1</span></li>
<li data-code="foursquare" data-name="Foursquare"><code>btn-foursquare</code> <span class="social-hex">#f94877</span></li>
<li data-code="github" data-name="GitHub"><code>btn-github</code> <span class="social-hex">#444444</span></li>
<li data-code="google-plus" data-name="Google"><code>btn-google-plus</code> <span class="social-hex">#DD4B39</span></li>
<li data-code="google" data-name="Google"><code>btn-google</code> <span class="social-hex">#DD4B39</span></li>
<li data-code="instagram" data-name="Instagram"><code>btn-instagram</code> <span class="social-hex">#3F729B</span></li>
<li data-code="linkedin" data-name="LinkedIn"><code>btn-linkedin</code> <span class="social-hex">#007BB6</span></li>
<li data-code="microsoft" data-icon="windows" data-name="Microsoft"><code>btn-microsoft</code> <span class="social-hex">#2672EC</span></li>
Expand All @@ -181,28 +181,28 @@ <h3>Available Classes</h3>
<div class="col-sm-4">
<div class="social-sizes">
<h3>Different Sizes</h3>
<a class="btn btn-block btn-social btn-lg btn-google-plus" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-lg']);">
<a class="btn btn-block btn-social btn-lg btn-google" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-lg']);">
<i class="fa fa-google-plus"></i>
Sign in with Google
</a>
<a class="btn btn-block btn-social btn-google-plus" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-md']);">
<a class="btn btn-block btn-social btn-google" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-md']);">
<i class="fa fa-google-plus"></i>
Sign in with Google
</a>
<a class="btn btn-block btn-social btn-sm btn-google-plus" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-sm']);">
<a class="btn btn-block btn-social btn-sm btn-google" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-sm']);">
<i class="fa fa-google-plus"></i>
Sign in with Google
</a>
<a class="btn btn-block btn-social btn-xs btn-google-plus" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-xs']);">
<a class="btn btn-block btn-social btn-xs btn-google" onclick="_gaq.push(['_trackEvent', 'btn-social', 'click', 'btn-xs']);">
<i class="fa fa-google-plus"></i>
Sign in with Google
</a>
<hr>
<div class="text-center">
<a class="btn btn-social-icon btn-lg btn-google-plus" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-lg']);"><i class="fa fa-google-plus"></i></a>
<a class="btn btn-social-icon btn-google-plus" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-md']);"><i class="fa fa-google-plus"></i></a>
<a class="btn btn-social-icon btn-sm btn-google-plus" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-sm']);"><i class="fa fa-google-plus"></i></a>
<a class="btn btn-social-icon btn-xs btn-google-plus" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-xs']);"><i class="fa fa-google-plus"></i></a>
<a class="btn btn-social-icon btn-lg btn-google" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-lg']);"><i class="fa fa-google-plus"></i></a>
<a class="btn btn-social-icon btn-google" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-md']);"><i class="fa fa-google-plus"></i></a>
<a class="btn btn-social-icon btn-sm btn-google" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-sm']);"><i class="fa fa-google-plus"></i></a>
<a class="btn btn-social-icon btn-xs btn-google" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-xs']);"><i class="fa fa-google-plus"></i></a>
</div>
</div>
<hr>
Expand Down

0 comments on commit b53226d

Please sign in to comment.