Skip to content

update to social icons. went away from sharrre library because libra… #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rudy-sasquatchstudio wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update to social icons. went away from sharrre library because libra… #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f876ac
update to social icons. went away from sharrre library because libra…
rudy-sasquatchstudio Mar 5, 2017
9b25d01
don’t need this file anymore
rudy-sasquatchstudio Mar 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions partials/shop-product.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,27 @@
{% endif %}

{% if theme.socialToggle %}
<div class="social social-links">
<div id="sharrre" data-title="sharrre">
<div class="facebook"></div>
<div class="twitter"></div>
<!-- <div class="googleplus"></div> -->
<div class="pinterest"></div>
<div class="social social-links">
<button class="facebook button small share s_facebook">
<i class="fi-social-facebook"></i> &nbsp;
<span class='badge counter c_facebook'>&nbsp;</span>
</button>

<button class="twitter button small share s_twitter">
<i class="fi-social-twitter"></i>
</button>

<button class="google button small share s_plus">
<i class="fi-social-google-plus"></i> &nbsp;
<span class='badge counter c_plus'>&nbsp;</span>
</button>

<button class="pinterest button small share s_pinterest">
<i class="fi-social-pinterest"></i> &nbsp;
<span class='badge counter c_pinterest'>&nbsp;</span>
</button>

</div>
</div>
{% endif %}
</div>
</div>
Expand Down Expand Up @@ -91,9 +104,9 @@ <h3>Product Options</h3>
{{ partial('shop-product-options') }}
{{ partial('shop-product-extras') }}





{% if product.enabled %}
{% if not product.isOutOfStock() %}
Expand Down Expand Up @@ -140,7 +153,7 @@ <h3>Bulk Pricing</h3>
{% endfor %}
</table>
</div>

</li>
{% endif %}
{% if product.productAttributes.count %}
Expand Down
11 changes: 7 additions & 4 deletions resources/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ footer p {font-size: 12px;}
flex-wrap: wrap;
list-style: none;
margin-top: 20px;

}
.product-bulk h3, .product-attributes h3 {
margin-bottom: 10px;
Expand Down Expand Up @@ -757,8 +757,8 @@ strong {
display: inline-block;
}

.social-links span {
padding: 5px;
.button i {
font-size: 16px;
}

.social-links .icon-facebook {
Expand All @@ -770,7 +770,6 @@ strong {
.social-links .icon-twitter {
background: url("../images/social.png") 32px 0;
}
.social .sharrre {display: inline-block;}
.product-info .social {
margin: 0 -20px -20px;
padding: 20px;
Expand All @@ -796,6 +795,10 @@ strong {
background: #55acee;
}

.button.pinterest {
background: #ce2127;
}

.button.google {
background: #d50f25;
text-transform: uppercase; border:none;
Expand Down
Binary file modified resources/images/social.png
100644 → 100755
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 8 additions & 53 deletions resources/javascript/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,59 +22,14 @@
$.fn.foundationClearing ? $doc.foundationClearing() : null;

$.fn.placeholder ? $('input, textarea').placeholder() : null;

var base = $('base').attr('href');
var share_url = base + 'sharrre/';

$('#sharrre .twitter').sharrre({
template: '<button class="twitter button small"><i class="fi-social-twitter medium"></i> &nbsp; {total}</button>',
share: {
twitter: true
},
enableHover: false,
enableTracking: true,
click: function(api, options) {
api.simulateClick();
api.openPopup('twitter');
}
});
$('#sharrre .facebook').sharrre({
template: '<button class="facebook button small"><span aria-hidden="true"><i class="fi-social-facebook medium"></i> &nbsp; {total}</span></button>',
share: {
facebook: true
},
enableHover: false,
enableTracking: true,
click: function(api, options) {
api.simulateClick();
api.openPopup('facebook');
}
});
$('#sharrre .googleplus').sharrre({
template: '<button class="googleplus button small"><span aria-hidden="true"><i class="fi-social-google-plus medium"></i> &nbsp; {total}</span></button>',
share: {
googlePlus: true
},
enableHover: false,
enableTracking: true,
click: function(api, options) {
api.simulateClick();
api.openPopup('googlePlus');
},
urlCurl: share_url
});
$('#sharrre .pinterest').sharrre({
template: '<button class="pinterest button small"><span aria-hidden="true"><i class="fi-social-pinterest medium"></i> &nbsp; {total}</span></button>',
share: {
pinterest: true
},
enableHover: false,
enableTracking: true,
click: function(api, options) {
api.simulateClick();
api.openPopup('pinterest');
},
urlCurl: share_url

$('.share').ShareLink();

$('.counter').ShareCounter({
url: $(location).attr('href'),
class_prefix: 'c_',
display_counter_from: 0,
increment: true
});

});
Expand Down
Loading