From 9f3e28824e8588cb286fc32f3850485f33476987 Mon Sep 17 00:00:00 2001 From: Eliot Partridge Date: Mon, 2 Sep 2019 15:05:00 -0500 Subject: [PATCH] Debrand part 2: electric boogaloo (#70) * Rebrand fully * Rebrand part 2: electric boogaloo * Debrand part 3: fixes --- README.md | 4 ++-- assets/images/logo-gray.png | 4 ++-- assets/images/logo-large.png | 4 ++-- assets/images/logo-small.png | 4 ++-- assets/images/logo.png | 4 ++-- gulpfile.js | 4 ++-- public/termsofservice.html | 2 +- src/ts/components/app/account/account.pug | 4 ++-- src/ts/components/app/home/home.pug | 2 +- src/ts/components/services/adminModel.ts | 2 +- src/ts/components/shared/install-button/install-button.pug | 2 +- src/ts/components/shared/menu-bar/menu-bar.pug | 4 ++-- src/ts/components/shared/play-box/play-box.pug | 6 +++--- src/ts/server/maps/mainMap.ts | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index bf24581..dfdb1ed 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Pony Town +# pixel.horse -A game of ponies building a town +A fork of Pony Town, a game of ponies building a town. ## Prerequisites diff --git a/assets/images/logo-gray.png b/assets/images/logo-gray.png index c5d19b2..8377142 100644 --- a/assets/images/logo-gray.png +++ b/assets/images/logo-gray.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2319c6e82af0998ec6c44e2442438a379912c0b8f3187f62b9c7da8024c8196 -size 366 +oid sha256:d695631ed6c30acc1e6090ca7f9881b42386ffa796d592ccd11a7307b14ba017 +size 4077 diff --git a/assets/images/logo-large.png b/assets/images/logo-large.png index 8f5b465..4ffb901 100644 --- a/assets/images/logo-large.png +++ b/assets/images/logo-large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e95fa2ca8fab7f3c3900b9ff3c898817449c90d59186c078a2ae9169c50177f -size 11347 +oid sha256:81dac5b333ab470bbc561730839122ab8e57459ed7323e836ac22c70ef5c41ee +size 6477 diff --git a/assets/images/logo-small.png b/assets/images/logo-small.png index 0a4f54e..2ad2b19 100644 --- a/assets/images/logo-small.png +++ b/assets/images/logo-small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b59bdabab1ab3a55ec9559dfc058a57399beb7f5ef8f5e80a3fab6e83d5bb4c -size 353 +oid sha256:4a6dc4366c24ddbb680bf3feceb34665fec6584f078ef07b285fb7e8df2634b2 +size 4021 diff --git a/assets/images/logo.png b/assets/images/logo.png index 308c433..f83584a 100644 --- a/assets/images/logo.png +++ b/assets/images/logo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4baa506db7a303f19fcf63baca345ec934f09a9380c96c589f2897dd294f663 -size 10764 +oid sha256:c6e516c29c173e2d6ec8e3c6a49dec35ae8ec0b1b4f042d0e94c074a3ec5b6d7 +size 5909 diff --git a/gulpfile.js b/gulpfile.js index ea1abe0..d8746aa 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -70,8 +70,8 @@ const manifest = cb => { short_name: config.title, start_url: '/', scope: '/', - theme_color: '#333333', - background_color: '#333333', + theme_color: '#5b6ee1', + background_color: '#5b6ee1', display: 'standalone', icons: [ { diff --git a/public/termsofservice.html b/public/termsofservice.html index ac79d33..b05f059 100644 --- a/public/termsofservice.html +++ b/public/termsofservice.html @@ -28,7 +28,7 @@

Please read these Terms of Service ("Terms", "Terms of Service") carefully before using the - https://pixe.horse/ website (the "Service") operated by us. + https://pixel.horse/ website (the "Service") operated by us.

Your access to and use of the Service is conditioned on your acceptance of and compliance with diff --git a/src/ts/components/app/account/account.pug b/src/ts/components/app/account/account.pug index 408eac8..3de9b6f 100644 --- a/src/ts/components/app/account/account.pug +++ b/src/ts/components/app/account/account.pug @@ -107,8 +107,8 @@ h1(focusTitle) Account settings .form-group.text-muted p. - You've successfully connected your Patreon account to Pony Town. - If you support Pony Town on Patreon your supporter info will show up here. + You've successfully connected your Patreon account to pixel.horse. + If you support pixel.horse on Patreon your supporter info will show up here. p. It should take no longer than 10 minutes to register your Patreon pledges. diff --git a/src/ts/components/app/home/home.pug b/src/ts/components/app/home/home.pug index 7dd7d1c..d4e2f83 100644 --- a/src/ts/components/app/home/home.pug +++ b/src/ts/components/app/home/home.pug @@ -1,6 +1,6 @@ div(*ngIf="!playing") .text-center.heading - img.pixelart.home-logo(revSrc="images/logo-large.png" alt="Pony Town") + img.pixelart.home-logo(revSrc="images/logo-large.png" alt="pixel.horse") .mx-auto.home-content page-loader diff --git a/src/ts/components/services/adminModel.ts b/src/ts/components/services/adminModel.ts index 48b01c9..98d58aa 100644 --- a/src/ts/components/services/adminModel.ts +++ b/src/ts/components/services/adminModel.ts @@ -569,7 +569,7 @@ export class AdminModel { const count = this.events.reduce((sum, e) => sum + (e.deleted ? 0 : 1), 0); const inred = this.events.reduce((sum, e) => sum + ((!e.deleted && e.count > 9) ? 1 : 0), 0); const flag = this.isLowDiskSpace || this.isLowMemory || this.isOldCertificate || this.isOldPatreon; - document.title = `${ponies} | ${count}${repeat('!', inred)}${flag ? ' 🚩' : ''}${!this.connected ? ' âš ' : ''} | Pony Town`; + document.title = `${ponies} | ${count}${repeat('!', inred)}${flag ? ' 🚩' : ''}${!this.connected ? ' âš ' : ''} | pixel.horse`; } private notify(title: string, body: string) { if (this.notifications && notification.permission === 'granted') { diff --git a/src/ts/components/shared/install-button/install-button.pug b/src/ts/components/shared/install-button/install-button.pug index bc82d06..6c499ab 100644 --- a/src/ts/components/shared/install-button/install-button.pug +++ b/src/ts/components/shared/install-button/install-button.pug @@ -1,6 +1,6 @@ .btn-group.d-flex(*ngIf="canInstall") button.btn.btn-lg.btn-outline-success.text-wrap.flex-grow-1((click)="install()") - | Add #[b Pony Town] to {{isMobile ? 'home screen' : 'desktop'}} + | Add #[b pixel.horse] to {{isMobile ? 'home screen' : 'desktop'}} button.btn.btn-lg.btn-outline-success.flex-grow-0( (click)="dismiss()" title="Dismiss" [attr.aria-label]="'Dismiss add to ' + (isMobile ? 'home screen' : 'desktop')") fa-icon([icon]="closeIcon") diff --git a/src/ts/components/shared/menu-bar/menu-bar.pug b/src/ts/components/shared/menu-bar/menu-bar.pug index 51eca9f..f56e733 100644 --- a/src/ts/components/shared/menu-bar/menu-bar.pug +++ b/src/ts/components/shared/menu-bar/menu-bar.pug @@ -1,8 +1,8 @@ nav.navbar.navbar-expand.justify-content-end(role="navigation") .d-none.d-md-block a.pixelart.logo(*ngIf="logo" routerLink="/" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }") - img.pixelart.logo-large(revSrc="images/logo-large.png" alt="Pony Town" width="287" height="65") - img.pixelart.logo-small(revSrc="images/logo-small.png" alt="Pony Town" width="37" height="43") + img.pixelart.logo-large(revSrc="images/logo-large.png" alt="pixel.horse" width="287" height="65") + img.pixelart.logo-small(revSrc="images/logo-small.png" alt="pixel.horse" width="37" height="43") .navbar-collapse.text-right .navbar-nav.ml-auto diff --git a/src/ts/components/shared/play-box/play-box.pug b/src/ts/components/shared/play-box/play-box.pug index 989d8f6..e37df04 100644 --- a/src/ts/components/shared/play-box/play-box.pug +++ b/src/ts/components/shared/play-box/play-box.pug @@ -18,8 +18,8 @@ .form-group(*ngIf="isAndroidBrowser") .alert.alert-warning(role="alert") - | Your browser is outdated and is not able to correctly run Pony Town. - | Please install different browser to be able to play the game. + | Your browser is outdated and is not able to correctly run pixel.horse. + | Please install a different browser to be able to play the game. .form-group(*ngIf="model.missingBirthdate && !birthdateSet && requestBirthdate") .alert.alert-warning.text-left(role="alert") @@ -86,7 +86,7 @@ .form-group(*ngIf="isBrowserOutdated") .alert.alert-warning(role="alert") button.close.float-right((click)="dismissOutdatedBrowser()" aria-label="Close" style="font-size: 20px;") × - | Your browser is outdated and is known to have issues running Pony Town. + | Your browser is outdated and is known to have issues running pixel.horse. | Make sure you have latest version installed. .form-group(*ngIf="invalidVersion && !offline") diff --git a/src/ts/server/maps/mainMap.ts b/src/ts/server/maps/mainMap.ts index 60fecd1..8aba626 100644 --- a/src/ts/server/maps/mainMap.ts +++ b/src/ts/server/maps/mainMap.ts @@ -2590,7 +2590,7 @@ export function createMainMap(world: World): ServerMap { add(entities.rock(98.63, 38.04)); add(entities.rock(117.22, 24.63)); - add(createSignWithText(70.5, 70.5, 'Pony Town', ' Pony Town\n[under construction]', entities.sign)); + add(createSignWithText(70.5, 70.5, 'pixel.horse', ' pixel.horse\n[under construction]', entities.sign)); addEntities(createToyStash(47.00, 55.00));