Skip to content

Commit

Permalink
Merge pull request #958 from acceptbitcoincash/no-opener
Browse files Browse the repository at this point in the history 
Lighthouse review indicated we should be more secure about how we op…
  • Loading branch information
@kenman345
kenman345 committed May 17, 2018
2 parents e1245e2 + 9bcb7ac commit 7da56b6
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 17 deletions.
1 change: 1 addition & 0 deletions _config.yml
View file
Expand Up @@ -12,6 +12,7 @@ repo: https://github.com/acceptbitcoincash/acceptbitcoincash
img: img/logo.png
google_analytics: UA-107218359-1
lang: en-US
SSLProvider: http://ocsp.digicert.com
twitter:
username: useBitcoinCash
sass:
Expand Down
4 changes: 2 additions & 2 deletions _includes/desktop-table.html
View file
Expand Up @@ -51,9 +51,9 @@ <h3><i class="big remove circle icon"></i></h3>
{%- if website.bch -%}
<div class="coin-wrap green-coin-wrap" data-tooltip="Bitcoin Cash accepted at {{ website.name }}" data-position="top center" data-inverted="">
<noscript>
<img src="/img/coin-bch.png" alt="Bitcoin Cash" height="40">
<img src="/img/coin-bch-sm.png" alt="Bitcoin Cash" height="40">
</noscript>
<img src="{{ page.img_placeholder }}" data-src="/img/coin-bch.png" alt="Bitcoin Cash" height="40">
<img src="{{ page.img_placeholder }}" data-src="/img/coin-bch-sm.png" alt="Bitcoin Cash" height="40">
</div>
{%- else -%}
{%- if website.twitter -%} <a data-tooltip="{{page.link_tweet|replace:'TWITTERHANDLE',website.twitter}}" data-position="left center" data-inverted="" class="ui twitter mini button" href="https://twitter.com/share?url={{site.twitter_url|cgi_escape}}&amp;text={{workonit_tweet|replace:'TWITTERHANDLE',website.twitter|cgi_escape}}&amp;hashtags={{page.hash|cgi_escape}}" target="_blank"><i class="twitter big icon"></i></a>{%- endif -%}
Expand Down
10 changes: 5 additions & 5 deletions _includes/footer.html
View file
Expand Up @@ -2,11 +2,11 @@
<p>Spot an issue, or want to add a site? <a class="submit-new" href="/add" target="_blank" data-tooltip="Fill out a quick form" data-position="top center" data-inverted="">Let us know</a> or <a href="https://github.com/acceptbitcoincash/acceptbitcoincash/blob/master/CONTRIBUTING.md" target="_blank" data-tooltip="Learn more about contributing" data-position="top center" data-inverted="">contribute</a> directly on <i class="github icon"></i><a href="{{ site.repo }}" target="_blank" data-tooltip="The source code for this site" data-position="top center" data-inverted="">GitHub</a>.</p>
<p>Made with <i class="red heart small icon"></i> by <a href="https://github.com/acceptbitcoincash" target="_blank" data-tooltip="Our organization on Github" data-position="top center" data-inverted=""><em>the</em> <b>Accept Bitcoin Cash</b> <em>initiative</em></a>. &nbsp; <a id="show-disclaimer" data-tooltip="Some important info to know" data-position="top center" data-inverted=""><i class="warning sign orange icon"></i>Caution!</a></p>
<p class="stats">
<a href="https://travis-ci.org/acceptbitcoincash/acceptbitcoincash" target="_blank"><img src="https://travis-ci.org/acceptbitcoincash/acceptbitcoincash.svg?branch=master" alt="Travis CI build status" /></a>
<a href="https://github.com/acceptbitcoincash/acceptbitcoincash/pulls" target="_blank"><img src="https://img.shields.io/github/issues-pr/acceptbitcoincash/acceptbitcoincash.svg" alt="Pending Pull Requests" /></a>
<a href="https://github.com/acceptbitcoincash/acceptbitcoincash/issues?q=is%3Aissue+is%3Aclosed" target="_blank"><img src="https://img.shields.io/github/issues-closed/acceptbitcoincash/acceptbitcoincash.svg" alt="Issues Closed" /></a>
<a href="https://github.com/acceptbitcoincash/acceptbitcoincash/blob/master/LICENSE" target="_blank"><img src="https://img.shields.io/badge/license-mit-blue.svg?style=flat" alt="MIT License" /></a>
<!-- a href="https://twitter.com/useBitcoinCash" target="_blank"><img src="https://img.shields.io/badge/Twitter-@useBitcoinCash-blue.svg" alt="@UseBitcoinCash on Twitter" /></a -->
<a href="https://travis-ci.org/acceptbitcoincash/acceptbitcoincash" target="_blank"><img src="{{ page.img_placeholder }}" data-src="https://travis-ci.org/acceptbitcoincash/acceptbitcoincash.svg?branch=master" alt="Travis CI build status" /></a>
<a href="https://github.com/acceptbitcoincash/acceptbitcoincash/pulls" target="_blank"><img src="{{ page.img_placeholder }}" data-src="https://img.shields.io/github/issues-pr/acceptbitcoincash/acceptbitcoincash.svg" alt="Pending Pull Requests" /></a>
<a href="https://github.com/acceptbitcoincash/acceptbitcoincash/issues?q=is%3Aissue+is%3Aclosed" target="_blank"><img src="{{ page.img_placeholder }}" data-src="https://img.shields.io/github/issues-closed/acceptbitcoincash/acceptbitcoincash.svg" alt="Issues Closed" /></a>
<a href="https://github.com/acceptbitcoincash/acceptbitcoincash/blob/master/LICENSE" target="_blank"><img src="{{ page.img_placeholder }}" data-src="https://img.shields.io/badge/license-mit-blue.svg?style=flat" alt="MIT License" /></a>
<!-- a href="https://twitter.com/useBitcoinCash" target="_blank"><img src="{{ page.img_placeholder }}" data-src="https://img.shields.io/badge/Twitter-@useBitcoinCash-blue.svg" alt="@UseBitcoinCash on Twitter" /></a -->
</p>
<p class="version"><em>Last modified</em> <b>{{ site.time }}</b></p>
</div>
2 changes: 1 addition & 1 deletion _includes/header.html
View file
Expand Up @@ -57,7 +57,7 @@ <h1>the <span class="logoseg-1">Accept</span><br><span class="logoseg-2">Bitcoin
<div class="z-switch--slider"></div>
</div>
Only show {{ page.list_of }}s accepting Bitcoin Cash{% if page.id == 'donation-listings' %} donations{% endif %}
<!-- img class="search-logo" src="/img/coin-bch.png" alt="Bitcoin Cash" -->
<!-- img class="search-logo" src="/img/coin-bch-sm.png" alt="Bitcoin Cash" -->
</label>
<!-- span id="top-btn-top"><i class="chevron circle up icon"></i> Top</span -->
</div>
Expand Down
4 changes: 2 additions & 2 deletions _includes/mobile-table.html
View file
Expand Up @@ -43,9 +43,9 @@ <h3><i class="big remove circle icon"></i></h3>
{%- if website.bch -%}
<div class="mobile-logo coin-wrap green-coin-wrap">
<noscript>
<img src="/img/coin-bch.png" alt="Bitcoin Cash" height="40">
<img src="/img/coin-bch-sm.png" alt="Bitcoin Cash" height="40">
</noscript>
<img src="{{ page.img_placeholder }}" data-src="/img/coin-bch.png" alt="Bitcoin Cash" height="40">
<img src="{{ page.img_placeholder }}" data-src="/img/coin-bch-sm.png" alt="Bitcoin Cash" height="40">
</div>
{%- endif -%}
{%- if website.btc -%}
Expand Down
2 changes: 1 addition & 1 deletion _includes/modals/image-assets.html
View file
Expand Up @@ -6,7 +6,7 @@
</div>

<div class="asset-intro">
<p>Here you'll find some suggested images that you can use, or feel free to create your own, as <em>Bitcoin Cash is decentralized</em>. We would only encourage you to primarily use the standard logo, which is designated by its 'cash bill sides' and upwards facing <i class="btc icon"></i><i class="arrow right icon"></i> <img class="p-logo" src="/img/coin-bch.png" alt="Bitcoin Cash"> Orange is the preferred color of use.</p>
<p>Here you'll find some suggested images that you can use, or feel free to create your own, as <em>Bitcoin Cash is decentralized</em>. We would only encourage you to primarily use the standard logo, which is designated by its 'cash bill sides' and upwards facing <i class="btc icon"></i><i class="arrow right icon"></i> <img class="p-logo" src="{{ page.encoded_img_placeholder }}" data-src="/img/coin-bch-sm.png" alt="Bitcoin Cash"> Orange is the preferred color of use.</p>
<p>Below is a collection of images that you may use. Many different high quality formats are provided. The images below were sourced from the artwork collections also found on this website.</p>
</div>

Expand Down
4 changes: 2 additions & 2 deletions _includes/segment/table-row-title.html
View file
Expand Up @@ -23,7 +23,7 @@
<img src="{{ img_path }}" class="icon" alt="{{ website.name }}" height="32" width="32">
</noscript>
<img src="{{ page.img_placeholder }}" data-src="{{ img_path }}" class="icon" alt="{{ website.name }}" height="32" width="32">
<a href="{{ website.url }}" class="name" target="_blank">{{ website.name }}</a>
<a href="{{ website.url }}" class="name" target="_blank" rel="noopener">{{ website.name }}</a>
{%- include exception.html website=website -%}
{%- if website.lang and site.data.languages[website.lang] -%}
{%- assign progress_tweet = site.data.languages[website.lang].progress_tweet -%}
Expand All @@ -34,7 +34,7 @@
{%- endif -%}
{%- if website.status -%}
{%- if include.type == 'mobile' -%}
<a href="{{ website.status }}" target="_blank">
<a href="{{ website.status }}" target="_blank" rel="noopener">
<i class="external url link large icon"></i>
</a>
{%- endif -%}
Expand Down
12 changes: 10 additions & 2 deletions _includes/segment/twitter.html
View file
@@ -1,6 +1,14 @@
<div class="ui center aligned segment twitter-panel">
<a class="twitter-timeline" data-dnt="true" data-theme="light" data-width="705" href="https://twitter.com/search?q=usebitcoin.cash" data-widget-id="939960678953218048">Tweets about usebitcoin.cash</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
<script>
var fired = false;
window.addEventListener("scroll", function(){
if ((document.documentElement.scrollTop != 0 && fired === false) || (document.body.scrollTop != 0 && fired === false)) {
!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";js.async = 1;fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
fired = true;
}
}, true);
</script>
<br><br>
<a href="https://twitter.com/useBitcoinCash?ref_src=twsrc%5Etfw" class="twitter-follow-button" data-size="large" data-dnt="true" data-show-count="false">Follow @useBitcoinCash</a><script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
<a href="https://twitter.com/useBitcoinCash?ref_src=twsrc%5Etfw" class="twitter-follow-button" data-size="large" data-dnt="true" data-show-count="false">Follow @useBitcoinCash</a>
</div>
8 changes: 6 additions & 2 deletions _layouts/default.html
View file
Expand Up @@ -14,7 +14,11 @@
<meta name="theme-color" content="#F7941D">

{% include google-analytics.html %}

{% if site.GH_ENV == 'gh_pages' %}
<link rel="preconnect" href="http://ocsp.digicert.com" crossorigin>
{% elsif site.SSLPRovider %}
<link rel="preconnect" href="{{ site.SSLProvider }}" crossorigin>
{% endif %}
<link rel="preconnect" href="https://fonts.googleapis.com/" crossorigin>
<link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>
<link rel="preconnect" href="https://cdnjs.cloudflare.com" crossorigin>
Expand All @@ -27,7 +31,7 @@
<link rel="preconnect" href="https://syndication.twitter.com" crossorigin>
<link rel="preconnect" href="https://pbs.twimg.com" crossorigin>
<link rel="preconnect" href="https://abs.twimg.com" crossorigin>
<link rel="prefetch" href="/img/coin-bch.png">
<link rel="prefetch" href="/img/coin-bch-sm.png">
<link rel="prefetch" href="/img/pcb-subtle-green.png">
<link rel="prefetch" href="/img/placeholder.png">
<link rel="preload" href="https://fonts.googleapis.com/css?family=Ubuntu:300,300i,400,400i,500,500i,700" as="style">
Expand Down
Binary file added img/coin-bch-sm.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions js/app.js
View file
Expand Up @@ -108,6 +108,7 @@ $(document).ready(function () {

$('#assets').on('click', function () {
$('.ui.modal.assets').modal('show');
$('img.p-logo').trigger('unveil');
$('img.image').trigger('unveil');
});

Expand Down

0 comments on commit 7da56b6

Please sign in to comment.