Skip to content

Commit

Permalink
Merge pull request #1 from LPauzies/lpauzies/new_brand
Browse files Browse the repository at this point in the history
New brand for a new life
  • Loading branch information
LPauzies authored Mar 7, 2022
2 parents a5db267 + 19afadc commit e5c854b
Show file tree
Hide file tree
Showing 6 changed files with 6,759 additions and 41 deletions.
20 changes: 10 additions & 10 deletions common/html/popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
<div class="info-section">
<h2 class="header">__MSG_m42__</h2>
<a class="js-tab"
data-href="https://chrome.google.com/webstore/detail/twitch-now/nlmbdmpjmlijibeockamioakdpmhjnpk/support">__MSG_m39__</a>
data-href="https://chrome.google.com/webstore/detail/twitch-companion/nlmbdmpjmlijibeockamioakdpmhjnpk/support">__MSG_m39__</a>
</div>

<div class="info-section">
<h2 class="header">__MSG_m59__</h2>

<div>
<a class="js-tab" data-href="https://github.com/Ndragomirov/twitch-now#translation-guide">__MSG_m60__</a>
<a class="js-tab" data-href="https://github.com/Ndragomirov/twitch-companion#translation-guide">__MSG_m60__</a>
</div>

</div>
Expand All @@ -85,10 +85,10 @@ <h2 class="header">__MSG_m77__</h2>

<div>
<a class="js-tab"
data-href="https://chrome.google.com/webstore/detail/twitch-now/nlmbdmpjmlijibeockamioakdpmhjnpk">__MSG_m78__</a>
<a class="js-tab" data-href="https://addons.opera.com/extensions/details/twitch-now/">__MSG_m79__</a>
data-href="https://chrome.google.com/webstore/detail/twitch-companion/nlmbdmpjmlijibeockamioakdpmhjnpk">__MSG_m78__</a>
<a class="js-tab" data-href="https://addons.opera.com/extensions/details/twitch-companion/">__MSG_m79__</a>
<a class="js-tab"
data-href="https://addons.mozilla.org/firefox/addon/twitch-now/">__MSG_m80__</a>
data-href="https://addons.mozilla.org/firefox/addon/twitch-companion/">__MSG_m80__</a>
</div>
</div>

Expand All @@ -107,29 +107,29 @@ <h2 class="header">__MSG_m24__</h2>

<div class="share">
<div data-placement="top" title="__MSG_m29__" class="js-tab social tip"
data-href="http://twitter.com/intent/tweet?text=Twitch%20Now%20is%20an%20awesome%20Chrome%20extension%20that%20alerts%20you%20when%20followed%20channels%20are%20online%20https://chrome.google.com/webstore/detail/twitch-now/nlmbdmpjmlijibeockamioakdpmhjnpk"
data-href="http://twitter.com/intent/tweet?text=Twitch%20Now%20is%20an%20awesome%20Chrome%20extension%20that%20alerts%20you%20when%20followed%20channels%20are%20online%20https://chrome.google.com/webstore/detail/twitch-companion/nlmbdmpjmlijibeockamioakdpmhjnpk"
>
<i class="icon-twitter-squared"></i>
</div>
<div data-placement="top" title="__MSG_m30__" class="js-tab social tip"
data-href="https://www.facebook.com/sharer/sharer.php?u=https://chrome.google.com/webstore/detail/twitch-now/nlmbdmpjmlijibeockamioakdpmhjnpk"
data-href="https://www.facebook.com/sharer/sharer.php?u=https://chrome.google.com/webstore/detail/twitch-companion/nlmbdmpjmlijibeockamioakdpmhjnpk"
>
<i class="icon-facebook-squared"></i>
</div>
<div data-placement="top" title="__MSG_m31__" class="js-tab social tip"
data-href="https://plus.google.com/share?url=https://chrome.google.com/webstore/detail/twitch-now/nlmbdmpjmlijibeockamioakdpmhjnpk"
data-href="https://plus.google.com/share?url=https://chrome.google.com/webstore/detail/twitch-companion/nlmbdmpjmlijibeockamioakdpmhjnpk"
>
<i class="icon-gplus-squared"></i>
</div>

<div data-placement="top" title="__MSG_m32__" class="js-tab social tip"
data-href="http://vk.com/share.php?url=https://chrome.google.com/webstore/detail/twitch-now/nlmbdmpjmlijibeockamioakdpmhjnpk"
data-href="http://vk.com/share.php?url=https://chrome.google.com/webstore/detail/twitch-companion/nlmbdmpjmlijibeockamioakdpmhjnpk"
>
<i class="icon-vkontakte"></i>
</div>

<div data-placement="top" title="__MSG_m58__" class="js-tab social tip"
data-href="https://github.com/Ndragomirov/twitch-now">
data-href="https://github.com/Ndragomirov/twitch-companion">
<i class="icon-github-squared"></i>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion common/lib/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,7 @@
getStreamURL: function (type) {
type = type || settings.get("openStreamIn").get("value");
if (type == "html5") {
return "http://player.twitch.tv/?channel=" + this.get("channel").name + "&html5" + "&parent=twitch-now";
return "http://player.twitch.tv/?channel=" + this.get("channel").name + "&html5" + "&parent=twitch-companion";
}
var links = {
theatrelayout: "/ID?mode=theatre",
Expand Down
8 changes: 4 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,23 +158,23 @@ gulp.task('compress:chrome', function () {
var v = JSON.parse(fs.readFileSync("package.json")).version;

return gulp.src('build/chrome/**')
.pipe(zip('twitch-now-chrome-' + v + '.zip'))
.pipe(zip('twitch-companion-chrome-' + v + '.zip'))
.pipe(gulp.dest('dist/'));
})

gulp.task('compress:opera', function () {
var v = JSON.parse(fs.readFileSync("package.json")).version;

return gulp.src('build/opera/**')
.pipe(zip('twitch-now-opera-' + v + '.zip'))
.pipe(zip('twitch-companion-opera-' + v + '.zip'))
.pipe(gulp.dest('dist/'));
})

gulp.task('compress:firefox', function () {
var v = JSON.parse(fs.readFileSync("package.json")).version;

return gulp.src('build/firefox/**')
.pipe(zip('twitch-now-firefox-' + v + '.zip'))
.pipe(zip('twitch-companion-firefox-' + v + '.zip'))
.pipe(gulp.dest('dist/'));
})

Expand All @@ -193,7 +193,7 @@ gulp.task('handlebars', function () {
gulp.task('contributors', function (cb) {
request({
method: "GET",
url: "https://api.github.com/repos/ndragomirov/twitch-now/contributors",
url: "https://api.github.com/repos/ndragomirov/twitch-companion/contributors",
headers: {
"User-Agent": "whatever"
}
Expand Down
Loading

0 comments on commit e5c854b

Please sign in to comment.