From 9d7583e4ea4d6c3b829b8132f4176e69a8640586 Mon Sep 17 00:00:00 2001 From: Sabian Roberts <31491602+sabianroberts@users.noreply.github.com> Date: Sun, 3 Nov 2024 23:49:27 +0000 Subject: [PATCH] Rebrand --- app/src/crash/styles/crash.scss | 2 +- app/src/lib/http.ts | 2 +- app/src/lib/progress/lfs.ts | 2 +- app/src/main-process/main.ts | 2 +- app/static/win32/github.bat | 2 +- app/static/win32/github.sh | 2 +- app/styles/_variables.scss | 68 ++++++++--------- app/styles/themes/_dark.scss | 54 +++++++------- .../ui/onboarding-tutorial/_right-panel.scss | 4 +- ...-merge-master-into-stale-branch-really.txt | 74 +++++++++---------- ...e-colors-into-offline-mode-y-u-no-work.txt | 14 ++-- ...nder-wsl-into-offline-mode-y-u-no-work.txt | 2 +- ...rototype-into-offline-mode-y-u-no-work.txt | 4 +- ...p-polish-into-offline-mode-y-u-no-work.txt | 2 +- ...end-help-into-offline-mode-y-u-no-work.txt | 2 +- ...-classes-into-offline-mode-y-u-no-work.txt | 10 +-- ...-changes-into-offline-mode-y-u-no-work.txt | 2 +- ...-merge-master-into-stale-branch-really.txt | 74 +++++++++---------- .../unit/find-forked-remotes-to-prune-test.ts | 24 +++--- app/test/unit/path-test.ts | 6 +- 20 files changed, 176 insertions(+), 176 deletions(-) diff --git a/app/src/crash/styles/crash.scss b/app/src/crash/styles/crash.scss index 0a27447160b..93ff6af9d65 100644 --- a/app/src/crash/styles/crash.scss +++ b/app/src/crash/styles/crash.scss @@ -22,7 +22,7 @@ pre.error { word-wrap: break-word; white-space: pre-wrap; font-family: var(--font-family-monospace); - background: rgba($blue-100, 0.3); + background: rgba($purple-100, 0.3); color: $gray-900; padding: var(--spacing); border-radius: var(--border-radius); diff --git a/app/src/lib/http.ts b/app/src/lib/http.ts index f0d5ac1a409..d18831fde6b 100644 --- a/app/src/lib/http.ts +++ b/app/src/lib/http.ts @@ -155,7 +155,7 @@ export function request( /** Get the user agent to use for all requests. */ export function getUserAgent() { const platform = __DARWIN__ ? 'Macintosh' : 'Windows' - return `GitHubDesktop/${appProxy.getVersion()} (${platform})` + return `PhoenixLink/${appProxy.getVersion()} (${platform})` } /** diff --git a/app/src/lib/progress/lfs.ts b/app/src/lib/progress/lfs.ts index 03062d464e0..2a012656ffb 100644 --- a/app/src/lib/progress/lfs.ts +++ b/app/src/lib/progress/lfs.ts @@ -5,7 +5,7 @@ import { open } from 'fs/promises' /** Create the Git LFS progress reporting file and return the path. */ export async function createLFSProgressFile(): Promise { - const path = await getTempFilePath('GitHubDesktop-lfs-progress') + const path = await getTempFilePath('PhoenixLink-lfs-progress') // getTempFilePath will take care of creating the directory, we only need // to make sure the file exists as well. We use `wx` to throw if the file diff --git a/app/src/main-process/main.ts b/app/src/main-process/main.ts index 070663f9961..f828c26c77d 100644 --- a/app/src/main-process/main.ts +++ b/app/src/main-process/main.ts @@ -117,7 +117,7 @@ if (__DARWIN__) { // On Windows, in order to get notifications properly working for dev builds, // we'll want to set the right App User Model ID from production builds. if (__WIN32__ && __DEV__) { - app.setAppUserModelId('com.squirrel.GitHubDesktop.GitHubDesktop') + app.setAppUserModelId('com.squirrel.PhoenixLink.PhoenixLink') } app.on('window-all-closed', () => { diff --git a/app/static/win32/github.bat b/app/static/win32/github.bat index 29da4e0213f..d5df379012c 100644 --- a/app/static/win32/github.bat +++ b/app/static/win32/github.bat @@ -2,6 +2,6 @@ setlocal set ELECTRON_RUN_AS_NODE=1 -call "%~dp0..\..\..\GitHubDesktop.exe" "%~dp0..\cli.js" %* +call "%~dp0..\..\..\PhoenixLink.exe" "%~dp0..\cli.js" %* endlocal diff --git a/app/static/win32/github.sh b/app/static/win32/github.sh index bfdc2da9a27..09f8d5bd381 100644 --- a/app/static/win32/github.sh +++ b/app/static/win32/github.sh @@ -1,7 +1,7 @@ #!/bin/sh CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")" -ELECTRON="$CONTENTS/GitHubDesktop.exe" +ELECTRON="$CONTENTS/PhoenixLink.exe" if grep -q Microsoft /proc/version; then if [ -x /bin/wslpath ]; then diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss index 495b88deb1e..32617f1399c 100644 --- a/app/styles/_variables.scss +++ b/app/styles/_variables.scss @@ -15,7 +15,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); --color-new: #{$green-600}; --color-deleted: #{$red-600}; --color-modified: #{darken($yellow-700, 10%)}; - --color-renamed: #{$blue}; + --color-renamed: #{$purple}; --color-conflicted: #{$orange-600}; --text-color: #{$gray-900}; @@ -25,15 +25,15 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); --button-height: 25px; - --button-background: #{$blue}; + --button-background: #{$purple}; --button-border-radius: 6px; - --button-hover-background: #{lighten($blue, 5%)}; + --button-hover-background: #{lighten($purple, 5%)}; --button-text-color: #{$white}; - --button-focus-border-color: #{$blue-100}; + --button-focus-border-color: #{$purple-100}; - --link-button-color: #{lighten($blue, 5%)}; - --link-button-hover-color: #{$blue-600}; - --link-button-selected-hover-color: #{$blue-200}; + --link-button-color: #{lighten($purple, 5%)}; + --link-button-hover-color: #{$purple-600}; + --link-button-selected-hover-color: #{$purple-200}; --secondary-button-background: #{$gray-100}; --secondary-button-border-color: var(--box-border-contrast-color); @@ -63,7 +63,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); // // Font, line-height, and color for body text, headings, and more. $emoji_fallback_fonts: 'Apple Color Emoji', 'Segoe UI', 'Segoe UI Emoji', 'Segoe UI Symbol'; - --font-family-sans-serif: system-ui, sans-serif, #{$emoji_fallback_fonts}; + --font-family-sans-serif: Bahnschrift, system-ui, sans-serif, #{$emoji_fallback_fonts}; --font-family-monospace: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace, #{$emoji_fallback_fonts}; /** @@ -127,7 +127,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); // darkened version of gray-400 to get 3:1 contrast ratio against --box-alt-background-color --box-border-contrast-color: #{darken($gray-400, 5%)}; - --box-border-accent-color: #{$blue}; + --box-border-accent-color: #{$purple}; /** * Background color for selected boxes without keyboard focus @@ -163,7 +163,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); /** * Background color for selected boxes with active keyboard focus */ - --box-selected-active-background-color: #{$blue}; + --box-selected-active-background-color: #{$purple}; /** * Border styles for selected boxes with active keyboard focus @@ -210,8 +210,8 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); /** * Author input (co-authors) */ - --co-author-tag-background-color: #{$blue-000}; - --co-author-tag-border-color: #{$blue-200}; + --co-author-tag-background-color: #{$purple-000}; + --co-author-tag-border-color: #{$purple-200}; /** * Commit warning badge icon @@ -306,7 +306,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); --toolbar-badge-active-background-color: #{$gray-200}; --tab-bar-height: 29px; - --tab-bar-active-color: #{$blue}; + --tab-bar-active-color: #{$purple}; --tab-bar-background-color: #{$white}; --tab-bar-hover-background-color: #{$gray-100}; @@ -358,25 +358,25 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); --toast-notification-color: #{$gray-000}; --toast-notification-background-color: #{rgba($gray-900, 0.6)}; - --tip-box-background-color: #{rgba($blue-500, 0.06)}; - --tip-box-border-color: #{$blue-200}; + --tip-box-background-color: #{rgba($purple-500, 0.06)}; + --tip-box-border-color: #{$purple-200}; /** The highlight color used for focus rings and focus box shadows */ - --focus-color: #{$blue}; - --diff-linenumber-focus-color: #{$blue-600}; + --focus-color: #{$purple}; + --diff-linenumber-focus-color: #{$purple-600}; /** * Variables for form elements */ --text-field-height: 25px; - --text-field-focus-shadow-color: #{rgba($blue, 0.25)}; + --text-field-focus-shadow-color: #{rgba($purple, 0.25)}; /** * Blankslate actions, see `BlankslateAction` component. */ - --primary-suggested-action-background: #{$blue-000}; - --primary-suggested-action-border-color: #{$blue-200}; - --suggested-action-icon-color: #{$blue-400}; + --primary-suggested-action-background: #{$purple-000}; + --primary-suggested-action-border-color: #{$purple-200}; + --suggested-action-icon-color: #{$purple-400}; /** * Diff view @@ -392,9 +392,9 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); --diff-line-number-color: #{$gray-700}; --diff-line-number-column-width: 50px; - --diff-selected-background-color: #{$blue-400}; - --diff-selected-border-color: #{$blue-600}; - --diff-selected-gutter-color: #{$blue-600}; + --diff-selected-background-color: #{$purple-400}; + --diff-selected-border-color: #{$purple-600}; + --diff-selected-gutter-color: #{$purple-600}; --diff-selected-text-color: var(--background-color); --diff-add-background-color: #{darken($green-000, 2%)}; @@ -411,15 +411,15 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); --diff-delete-inner-background-color: #fdb8c0; --diff-delete-text-color: var(--diff-text-color); - --diff-hunk-background-color: #{$blue-000}; - --diff-hunk-border-color: #{$blue-200}; - --diff-hunk-gutter-color: #{darken($blue-200, 5%)}; - --diff-hunk-gutter-background-color: #{$blue-100}; + --diff-hunk-background-color: #{$purple-000}; + --diff-hunk-border-color: #{$purple-200}; + --diff-hunk-gutter-color: #{darken($purple-200, 5%)}; + --diff-hunk-gutter-background-color: #{$purple-100}; --diff-hunk-text-color: #{$gray-600}; - --diff-hover-background-color: #{$blue-300}; - --diff-hover-border-color: #{$blue-400}; - --diff-hover-gutter-color: #{$blue-400}; + --diff-hover-background-color: #{$purple-300}; + --diff-hover-border-color: #{$purple-400}; + --diff-hover-gutter-color: #{$purple-400}; --diff-hover-text-color: var(--background-color); --diff-add-hover-background-color: #{$green-300}; @@ -474,7 +474,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); /** Dialog */ --dialog-warning-color: #{$yellow-800}; - --dialog-information-color: #{$blue-400}; + --dialog-information-color: #{$purple-400}; --dialog-error-color: #{$red}; /** File warning */ @@ -488,8 +488,8 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); --tooltip-shadow-color: #{rgba($gray-900, 0.65)}; /** Inline paths and code */ - --path-segment-background: #{$blue-000}; - --path-segment-background-focus: #{darken($blue-000, 5%)}; + --path-segment-background: #{$purple-000}; + --path-segment-background-focus: #{darken($purple-000, 5%)}; --path-segment-padding: var(--spacing-third); // http://easings.net/#easeOutBack diff --git a/app/styles/themes/_dark.scss b/app/styles/themes/_dark.scss index 55bedc8ac5b..701622d7a07 100644 --- a/app/styles/themes/_dark.scss +++ b/app/styles/themes/_dark.scss @@ -11,13 +11,13 @@ // https://www.electronjs.org/docs/api/native-theme#nativethemethemesource // This blue passes WCAG 2 guidelines with $gray-100 fg and $gray-900 bg. -$link-color: #2e8fff; +$link-color: #bf00ff; body.theme-dark { --color-new: #{$green}; --color-deleted: #{$red}; --color-modified: #{$yellow-700}; - --color-renamed: #{$blue}; + --color-renamed: #{$purple}; --color-conflicted: #{$orange}; --text-color: #{$gray-100}; @@ -25,10 +25,10 @@ body.theme-dark { --text-secondary-color-muted: #{darken($gray-500, 10%)}; --background-color: #{$gray-900}; - --button-background: #{$blue}; - --button-hover-background: #{lighten($blue, 5%)}; + --button-background: #{$purple}; + --button-hover-background: #{lighten($purple, 5%)}; --button-text-color: #{$white}; - --button-focus-border-color: #{$blue-600}; + --button-focus-border-color: #{$purple-600}; --link-button-color: #{$link-color}; --link-button-hover-color: #{lighten($link-color, 3%)}; @@ -97,7 +97,7 @@ body.theme-dark { // slightly lighter of gray-500 to get 3:1 contrast ratio against // --box-alt-background-color --box-border-contrast-color: #{lighten($gray-500, 3%)}; - --box-border-accent-color: #{$blue}; + --box-border-accent-color: #{$purple}; /** * Background color for selected boxes without keyboard focus @@ -133,7 +133,7 @@ body.theme-dark { /** * Background color for selected boxes with active keyboard focus */ - --box-selected-active-background-color: #{$blue}; + --box-selected-active-background-color: #{$purple}; /** * Text color for selected boxes with active keyboard focus @@ -171,8 +171,8 @@ body.theme-dark { /** * Author input (co-authors) */ - --co-author-tag-background-color: #{$blue-800}; - --co-author-tag-border-color: #{$blue-700}; + --co-author-tag-background-color: #{$purple-800}; + --co-author-tag-border-color: #{$purple-700}; /** * Commit warning badge icon @@ -238,7 +238,7 @@ body.theme-dark { --toolbar-badge-background-color: #{$gray-700}; --toolbar-badge-active-background-color: #{$gray-700}; - --tab-bar-active-color: #{$blue}; + --tab-bar-active-color: #{$purple}; --tab-bar-background-color: var(--box-background-color); --tab-bar-hover-background-color: #{$gray-800}; @@ -268,20 +268,20 @@ body.theme-dark { --toast-notification-background-color: #{rgba(black, 0.8)}; /** The highlight color used for focus rings and focus box shadows */ - --focus-color: #{$blue}; - --diff-linenumber-focus-color: #{$blue-200}; + --focus-color: #{$purple}; + --diff-linenumber-focus-color: #{$purple-200}; /** * Variables for form elements */ - --text-field-focus-shadow-color: #{rgba($blue, 0.25)}; + --text-field-focus-shadow-color: #{rgba($purple, 0.25)}; /** * Blankslate actions, see `BlankslateAction` component. */ - --primary-suggested-action-background: #{$blue-900}; - --primary-suggested-action-border-color: #{$blue-700}; - --suggested-action-icon-color: #{$blue-400}; + --primary-suggested-action-background: #{$purple-900}; + --primary-suggested-action-border-color: #{$purple-700}; + --suggested-action-icon-color: #{$purple-400}; /** * Diff view @@ -295,9 +295,9 @@ body.theme-dark { --diff-line-number-color: var(--text-secondary-color); --diff-line-number-column-width: 50px; - --diff-selected-background-color: #{$blue-700}; - --diff-selected-border-color: #{$blue-600}; - --diff-selected-gutter-color: #{$blue-600}; + --diff-selected-background-color: #{$purple-700}; + --diff-selected-border-color: #{$purple-600}; + --diff-selected-gutter-color: #{$purple-600}; --diff-selected-text-color: var(--text-color); --diff-add-background-color: #{darken($green-900, 3%)}; @@ -320,9 +320,9 @@ body.theme-dark { --diff-hunk-gutter-background-color: #{darken($gray-900, 6%)}; --diff-hunk-text-color: var(--text-secondary-color); - --diff-hover-background-color: #{$blue-500}; - --diff-hover-border-color: #{$blue-400}; - --diff-hover-gutter-color: #{$blue-400}; + --diff-hover-background-color: #{$purple-500}; + --diff-hover-border-color: #{$purple-400}; + --diff-hover-gutter-color: #{$purple-400}; --diff-hover-text-color: var(--diff-text-color); --diff-add-hover-background-color: #{$green-900}; @@ -341,16 +341,16 @@ body.theme-dark { // Syntax highlighting text colors --syntax-variable-color: #{$purple-300}; - --syntax-alt-variable-color: #{$blue-300}; + --syntax-alt-variable-color: #{$purple-300}; --syntax-keyword-color: #{$red-300}; - --syntax-atom-color: #{$blue-300}; + --syntax-atom-color: #{$purple-300}; --syntax-string-color: #{$orange-300}; --syntax-qualifier-color: #{$purple-300}; --syntax-type-color: #{$red-300}; --syntax-comment-color: #{$gray-400}; --syntax-tag-color: #{$green-400}; --syntax-attribute-color: #{$purple-300}; - --syntax-link-color: #{$blue-300}; + --syntax-link-color: #{$purple-300}; --syntax-header-color: #{$red-300}; --syntax-quote-color: #{$green-400}; @@ -373,7 +373,7 @@ body.theme-dark { /** Dialog */ --dialog-warning-color: #{$yellow-600}; - --dialog-information-color: #{$blue-400}; + --dialog-information-color: #{$purple-400}; --dialog-error-color: #{$red-600}; /** File warning */ @@ -410,7 +410,7 @@ body.theme-dark { --pr-commented-icon-color: #8b949e; --pr-commented-icon-background-color: #{$gray-700}; - --call-to-action-bubble-background-color: #{$blue}; + --call-to-action-bubble-background-color: #{$purple}; --call-to-action-bubble-color: #{$white}; --title-tool-tip-background-color: rgb(56, 58, 62); diff --git a/app/styles/ui/onboarding-tutorial/_right-panel.scss b/app/styles/ui/onboarding-tutorial/_right-panel.scss index dadf5e87393..62b9565c192 100644 --- a/app/styles/ui/onboarding-tutorial/_right-panel.scss +++ b/app/styles/ui/onboarding-tutorial/_right-panel.scss @@ -70,8 +70,8 @@ } .blue-circle { @extend %circle; - background-color: $blue; - border-color: $blue; + background-color: $purple; + border-color: $purple; color: var(--badge-icon-color); } .empty-circle { diff --git a/app/test/fixtures/merge-parser/desktop/failed-merge-master-into-stale-branch-really.txt b/app/test/fixtures/merge-parser/desktop/failed-merge-master-into-stale-branch-really.txt index 891d23d1bbb..3bfa03723d2 100644 --- a/app/test/fixtures/merge-parser/desktop/failed-merge-master-into-stale-branch-really.txt +++ b/app/test/fixtures/merge-parser/desktop/failed-merge-master-into-stale-branch-really.txt @@ -3129,7 +3129,7 @@ merged /** Create the Git LFS progress reporting file and return the path. */ export async function createLFSProgressFile(): Promise { - const path = await getTempFilePath('GitHubDesktop-lfs-progress') + const path = await getTempFilePath('PhoenixLink-lfs-progress') - return new Promise((resolve, reject) => { - Fs.writeFile(path, '', err => { - if (err) { @@ -16078,10 +16078,10 @@ merged --button-height: 25px; @@ -26,6 +31,7 @@ - --button-focus-border-color: $blue-600; + --button-focus-border-color: $purple-600; - --link-button-color: $blue; -+ --link-button-hover-color: $blue-600; + --link-button-color: $purple; ++ --link-button-hover-color: $purple-600; --secondary-button-background: $gray-000; --secondary-button-hover-background: $white; @@ -16127,8 +16127,8 @@ merged + /** + * Author input (co-authors) + */ -+ --co-author-tag-background-color: $blue-000; -+ --co-author-tag-border-color: $blue-200; ++ --co-author-tag-background-color: $purple-000; ++ --co-author-tag-border-color: $purple-200; + + /** * The height of the title bar area on Win32 platforms @@ -16169,7 +16169,7 @@ merged + --toolbar-badge-active-background-color: $gray-200; + --tab-bar-height: 29px; - --tab-bar-active-color: $blue; + --tab-bar-active-color: $purple; --tab-bar-background-color: $white; + /** Count bubble colors when used inside of a tab bar item */ @@ -16204,7 +16204,7 @@ merged + --toast-notification-background-color: rgba($gray-900, 0.6); + /** The highlight color used for focus rings and focus box shadows */ - --focus-color: $blue; + --focus-color: $purple; @@ -233,6 +298,7 @@ --diff-text-color: $gray-900; @@ -16255,12 +16255,12 @@ merged --dialog-error-color: $red; /** Inline paths and code */ - --path-segment-background: $blue-000; + --path-segment-background: $purple-000; --path-segment-padding: var(--spacing-third); + /** Diverging notification banner colors */ -+ --notification-banner-background: $blue-000; -+ --notification-banner-border-color: $blue-200; ++ --notification-banner-background: $purple-000; ++ --notification-banner-border-color: $purple-200; + --notification-ref-background: rgba(255, 255, 255, 0.75); + // http://easings.net/#easeOutBack @@ -16349,20 +16349,20 @@ added in remote + --color-new: $green; + --color-deleted: $red; + --color-modified: $yellow-700; -+ --color-renamed: $blue; ++ --color-renamed: $purple; + --color-conflicted: $orange; + + --text-color: $gray-300; + --text-secondary-color: $gray-400; + --background-color: $gray-900; + -+ --button-background: $blue; -+ --button-hover-background: lighten($blue, 5%); ++ --button-background: $purple; ++ --button-hover-background: lighten($purple, 5%); + --button-text-color: $white; -+ --button-focus-border-color: $blue-600; ++ --button-focus-border-color: $purple-600; + -+ --link-button-color: lighten($blue-400, 3%); -+ --link-button-hover-color: $blue-400; ++ --link-button-color: lighten($purple-400, 3%); ++ --link-button-hover-color: $purple-400; + + --secondary-button-background: $gray-800; + --secondary-button-hover-background: var(--secondary-button-background); @@ -16406,7 +16406,7 @@ added in remote + * Border color for boxes. + */ + --box-border-color: #141414; -+ --box-border-accent-color: $blue; ++ --box-border-accent-color: $purple; + + /** + * Background color for selected boxes without keyboard focus @@ -16441,7 +16441,7 @@ added in remote + /** + * Background color for selected boxes with active keyboard focus + */ -+ --box-selected-active-background-color: $blue; ++ --box-selected-active-background-color: $purple; + + /** + * Text color for selected boxes with active keyboard focus @@ -16463,8 +16463,8 @@ added in remote + /** + * Author input (co-authors) + */ -+ --co-author-tag-background-color: $blue-800; -+ --co-author-tag-border-color: $blue-700; ++ --co-author-tag-background-color: $purple-800; ++ --co-author-tag-border-color: $purple-700; + + --base-border: 1px solid var(--box-border-color); + @@ -16518,7 +16518,7 @@ added in remote + --toolbar-badge-background-color: $gray-700; + --toolbar-badge-active-background-color: $gray-700; + -+ --tab-bar-active-color: $blue; ++ --tab-bar-active-color: $purple; + --tab-bar-background-color: var(--box-background-color); + + /** Count bubble colors when used inside of a tab bar item */ @@ -16546,12 +16546,12 @@ added in remote + --toast-notification-background-color: rgba(black, 0.8); + + /** The highlight color used for focus rings and focus box shadows */ -+ --focus-color: $blue; ++ --focus-color: $purple; + + /** + * Variables for form elements + */ -+ --text-field-focus-shadow-color: rgba($blue, 0.25); ++ --text-field-focus-shadow-color: rgba($purple, 0.25); + + /** + * Diff view @@ -16565,9 +16565,9 @@ added in remote + --diff-line-number-color: var(--text-secondary-color); + --diff-line-number-column-width: 50px; + -+ --diff-selected-background-color: $blue-700; -+ --diff-selected-border-color: $blue-600; -+ --diff-selected-gutter-color: $blue-600; ++ --diff-selected-background-color: $purple-700; ++ --diff-selected-border-color: $purple-600; ++ --diff-selected-gutter-color: $purple-600; + --diff-selected-text-color: var(--text-color); + + --diff-add-background-color: darken($green-900, 10%); @@ -16590,9 +16590,9 @@ added in remote + --diff-hunk-gutter-background-color: darken($gray-900, 6%); + --diff-hunk-text-color: var(--text-secondary-color); + -+ --diff-hover-background-color: $blue-500; -+ --diff-hover-border-color: $blue-400; -+ --diff-hover-gutter-color: $blue-400; ++ --diff-hover-background-color: $purple-500; ++ --diff-hover-border-color: $purple-400; ++ --diff-hover-gutter-color: $purple-400; + --diff-hover-text-color: var(--diff-text-color); + + --diff-add-hover-background-color: $green-900; @@ -16607,16 +16607,16 @@ added in remote + + // Syntax highlighting text colors + --syntax-variable-color: $purple-300; -+ --syntax-alt-variable-color: $blue-300; ++ --syntax-alt-variable-color: $purple-300; + --syntax-keyword-color: $red-300; -+ --syntax-atom-color: $blue-300; ++ --syntax-atom-color: $purple-300; + --syntax-string-color: $orange-300; + --syntax-qualifier-color: $purple-300; + --syntax-type-color: $red-300; + --syntax-comment-color: $gray-400; + --syntax-tag-color: $green-400; + --syntax-attribute-color: $purple-300; -+ --syntax-link-color: $blue-300; ++ --syntax-link-color: $purple-300; + + // Colors for form errors + --error-color: $red; @@ -17543,11 +17543,11 @@ merged } &.with-co-authors .co-authors-toggle { -- color: $blue-400; +- color: $purple-400; + color: var(--link-button-color); &:hover { -- color: $blue-600; +- color: $purple-600; + color: var(--link-button-hover-color); } } @@ -22493,7 +22493,7 @@ removed in remote -} - -function getWindowsIdentifierName() { -- return 'GitHubDesktop' +- return 'PhoenixLink' -} - -function getBundleSizes() { @@ -22657,7 +22657,7 @@ added in remote +} + +export function getWindowsIdentifierName() { -+ return 'GitHubDesktop' ++ return 'PhoenixLink' +} + +export function getBundleSizes() { diff --git a/app/test/fixtures/merge-parser/desktop/merge-dark-handle-colors-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-dark-handle-colors-into-offline-mode-y-u-no-work.txt index 7d4c9c89db0..72b8eecadd9 100644 --- a/app/test/fixtures/merge-parser/desktop/merge-dark-handle-colors-into-offline-mode-y-u-no-work.txt +++ b/app/test/fixtures/merge-parser/desktop/merge-dark-handle-colors-into-offline-mode-y-u-no-work.txt @@ -3,16 +3,16 @@ changed in both our 100644 6c89a529c5a8dbfefb127f171468af9ae5651141 app/styles/_variables.scss their 100644 d6df99e979ae35224a6767759f74dee365b15eba app/styles/_variables.scss @@ -378,6 +378,10 @@ - --path-segment-background: $blue-000; + --path-segment-background: $purple-000; --path-segment-padding: var(--spacing-third); + /** Co-author colors **/ -+ --handle-background: $blue-000; -+ --handle-border-color: $blue-200; ++ --handle-background: $purple-000; ++ --handle-border-color: $purple-200; + /** Diverging notification banner colors */ - --notification-banner-background: $blue-000; - --notification-banner-border-color: $blue-200; + --notification-banner-background: $purple-000; + --notification-banner-border-color: $purple-200; changed in both base 100644 43d39d75f19c242c1630b9ab243f18fcc733c7e5 app/styles/themes/_dark.scss our 100644 663d5cb65e7a6b69154193384801a8c63234744f app/styles/themes/_dark.scss @@ -22,8 +22,8 @@ changed in both --path-segment-background: $gray-700; + /** Co-author colors **/ -+ --handle-background: rgba($blue-700, .75); -+ --handle-border-color: rgba($blue-600, .75); ++ --handle-background: rgba($purple-700, .75); ++ --handle-border-color: rgba($purple-600, .75); + .blankslate-image { filter: #{'invert()'} grayscale(1) brightness(8) contrast(0.6); diff --git a/app/test/fixtures/merge-parser/desktop/merge-make-cli-work-under-wsl-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-make-cli-work-under-wsl-into-offline-mode-y-u-no-work.txt index 1b0fd7ea3d5..a045be0d129 100644 --- a/app/test/fixtures/merge-parser/desktop/merge-make-cli-work-under-wsl-into-offline-mode-y-u-no-work.txt +++ b/app/test/fixtures/merge-parser/desktop/merge-make-cli-work-under-wsl-into-offline-mode-y-u-no-work.txt @@ -36,7 +36,7 @@ merged @@ -2,7 +2,26 @@ CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")" - ELECTRON="$CONTENTS/GitHubDesktop.exe" + ELECTRON="$CONTENTS/PhoenixLink.exe" -CLI="$CONTENTS/Resources/app/cli.js" + +if grep -q Microsoft /proc/version; then diff --git a/app/test/fixtures/merge-parser/desktop/merge-p-p-p-prototype-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-p-p-p-prototype-into-offline-mode-y-u-no-work.txt index 7c213b9668c..f61a653a054 100644 --- a/app/test/fixtures/merge-parser/desktop/merge-p-p-p-prototype-into-offline-mode-y-u-no-work.txt +++ b/app/test/fixtures/merge-parser/desktop/merge-p-p-p-prototype-into-offline-mode-y-u-no-work.txt @@ -160,8 +160,8 @@ changed in both their 100644 2e3ff0d12a5fee7774e509740931b44d519556ce app/styles/_variables.scss @@ -381,7 +381,11 @@ /** Diverging notification banner colors */ - --notification-banner-background: $blue-000; - --notification-banner-border-color: $blue-200; + --notification-banner-background: $purple-000; + --notification-banner-border-color: $purple-200; +<<<<<<< .our --notification-ref-background: rgba(255, 255, 255, 0.75); +======= diff --git a/app/test/fixtures/merge-parser/desktop/merge-popup-polish-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-popup-polish-into-offline-mode-y-u-no-work.txt index 3dd45f49d1b..5b7c6134994 100644 --- a/app/test/fixtures/merge-parser/desktop/merge-popup-polish-into-offline-mode-y-u-no-work.txt +++ b/app/test/fixtures/merge-parser/desktop/merge-popup-polish-into-offline-mode-y-u-no-work.txt @@ -22,7 +22,7 @@ changed in both + // in variables. It also makes it easier to read and understand what + // color is being used. Note that these variables should _never_ be + // used outside of this scope. -+ $blue: #4ca6eb; ++ $purple: #4ca6eb; + $orange: #c9510c; + $yellow: #d0b44c; + $red: #bf2b00; diff --git a/app/test/fixtures/merge-parser/desktop/merge-sms-send-help-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-sms-send-help-into-offline-mode-y-u-no-work.txt index b0c1916e65a..48cd8605516 100644 --- a/app/test/fixtures/merge-parser/desktop/merge-sms-send-help-into-offline-mode-y-u-no-work.txt +++ b/app/test/fixtures/merge-parser/desktop/merge-sms-send-help-into-offline-mode-y-u-no-work.txt @@ -133,7 +133,7 @@ changed in both + // color is being used. Note that these variables should _never_ be + // used outside of this scope. + $darkBlue: #005CC5; -+ $blue: #0366d6; ++ $purple: #0366d6; + $yellow: #ffd33d; + $darkYellow: #745d00; + $lightYellow: #fff5b1; diff --git a/app/test/fixtures/merge-parser/desktop/merge-spike-primer-utility-classes-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-spike-primer-utility-classes-into-offline-mode-y-u-no-work.txt index a0d2ae2266f..a67672706f3 100644 --- a/app/test/fixtures/merge-parser/desktop/merge-spike-primer-utility-classes-into-offline-mode-y-u-no-work.txt +++ b/app/test/fixtures/merge-parser/desktop/merge-spike-primer-utility-classes-into-offline-mode-y-u-no-work.txt @@ -362,7 +362,7 @@ changed in both our 100644 6c89a529c5a8dbfefb127f171468af9ae5651141 app/styles/_variables.scss their 100644 25bf8afb64f2143ab89c337ab59bea34596eb1f2 app/styles/_variables.scss @@ -18,8 +18,26 @@ - --color-renamed: $blue; + --color-renamed: $purple; --color-conflicted: $orange; +<<<<<<< .our @@ -375,7 +375,7 @@ changed in both + // in variables. It also makes it easier to read and understand what + // color is being used. Note that these variables should _never_ be + // used outside of this scope. -+ $blue: #4ca6eb; ++ $purple: #4ca6eb; + $darkGray: #5f717f; + $orange: #c9510c; + $gray: #C6CACC; @@ -389,8 +389,8 @@ changed in both --button-height: 25px; @@ -33,11 +51,17 @@ - --link-button-color: $blue; - --link-button-hover-color: $blue-600; + --link-button-color: $purple; + --link-button-hover-color: $purple-600; +<<<<<<< .our --secondary-button-background: $gray-000; @@ -415,7 +415,7 @@ changed in both +======= + --box-border-color: $lightGray; +>>>>>>> .their - --box-border-accent-color: $blue; + --box-border-accent-color: $purple; /** changed in both diff --git a/app/test/fixtures/merge-parser/desktop/merge-submodule-diff-on-top-of-diff-changes-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-submodule-diff-on-top-of-diff-changes-into-offline-mode-y-u-no-work.txt index ea66036dec6..df61fcc7192 100644 --- a/app/test/fixtures/merge-parser/desktop/merge-submodule-diff-on-top-of-diff-changes-into-offline-mode-y-u-no-work.txt +++ b/app/test/fixtures/merge-parser/desktop/merge-submodule-diff-on-top-of-diff-changes-into-offline-mode-y-u-no-work.txt @@ -1081,7 +1081,7 @@ changed in both our 100644 6c89a529c5a8dbfefb127f171468af9ae5651141 app/styles/_variables.scss their 100644 a11f9adbcecf5e114799353a54e7a7339e18128b app/styles/_variables.scss @@ -333,6 +333,7 @@ - --diff-hover-gutter-color: $blue-400; + --diff-hover-gutter-color: $purple-400; --diff-hover-text-color: var(--background-color); +<<<<<<< .our diff --git a/app/test/fixtures/merge-parser/failed-merge-master-into-stale-branch-really.txt b/app/test/fixtures/merge-parser/failed-merge-master-into-stale-branch-really.txt index 891d23d1bbb..3bfa03723d2 100644 --- a/app/test/fixtures/merge-parser/failed-merge-master-into-stale-branch-really.txt +++ b/app/test/fixtures/merge-parser/failed-merge-master-into-stale-branch-really.txt @@ -3129,7 +3129,7 @@ merged /** Create the Git LFS progress reporting file and return the path. */ export async function createLFSProgressFile(): Promise { - const path = await getTempFilePath('GitHubDesktop-lfs-progress') + const path = await getTempFilePath('PhoenixLink-lfs-progress') - return new Promise((resolve, reject) => { - Fs.writeFile(path, '', err => { - if (err) { @@ -16078,10 +16078,10 @@ merged --button-height: 25px; @@ -26,6 +31,7 @@ - --button-focus-border-color: $blue-600; + --button-focus-border-color: $purple-600; - --link-button-color: $blue; -+ --link-button-hover-color: $blue-600; + --link-button-color: $purple; ++ --link-button-hover-color: $purple-600; --secondary-button-background: $gray-000; --secondary-button-hover-background: $white; @@ -16127,8 +16127,8 @@ merged + /** + * Author input (co-authors) + */ -+ --co-author-tag-background-color: $blue-000; -+ --co-author-tag-border-color: $blue-200; ++ --co-author-tag-background-color: $purple-000; ++ --co-author-tag-border-color: $purple-200; + + /** * The height of the title bar area on Win32 platforms @@ -16169,7 +16169,7 @@ merged + --toolbar-badge-active-background-color: $gray-200; + --tab-bar-height: 29px; - --tab-bar-active-color: $blue; + --tab-bar-active-color: $purple; --tab-bar-background-color: $white; + /** Count bubble colors when used inside of a tab bar item */ @@ -16204,7 +16204,7 @@ merged + --toast-notification-background-color: rgba($gray-900, 0.6); + /** The highlight color used for focus rings and focus box shadows */ - --focus-color: $blue; + --focus-color: $purple; @@ -233,6 +298,7 @@ --diff-text-color: $gray-900; @@ -16255,12 +16255,12 @@ merged --dialog-error-color: $red; /** Inline paths and code */ - --path-segment-background: $blue-000; + --path-segment-background: $purple-000; --path-segment-padding: var(--spacing-third); + /** Diverging notification banner colors */ -+ --notification-banner-background: $blue-000; -+ --notification-banner-border-color: $blue-200; ++ --notification-banner-background: $purple-000; ++ --notification-banner-border-color: $purple-200; + --notification-ref-background: rgba(255, 255, 255, 0.75); + // http://easings.net/#easeOutBack @@ -16349,20 +16349,20 @@ added in remote + --color-new: $green; + --color-deleted: $red; + --color-modified: $yellow-700; -+ --color-renamed: $blue; ++ --color-renamed: $purple; + --color-conflicted: $orange; + + --text-color: $gray-300; + --text-secondary-color: $gray-400; + --background-color: $gray-900; + -+ --button-background: $blue; -+ --button-hover-background: lighten($blue, 5%); ++ --button-background: $purple; ++ --button-hover-background: lighten($purple, 5%); + --button-text-color: $white; -+ --button-focus-border-color: $blue-600; ++ --button-focus-border-color: $purple-600; + -+ --link-button-color: lighten($blue-400, 3%); -+ --link-button-hover-color: $blue-400; ++ --link-button-color: lighten($purple-400, 3%); ++ --link-button-hover-color: $purple-400; + + --secondary-button-background: $gray-800; + --secondary-button-hover-background: var(--secondary-button-background); @@ -16406,7 +16406,7 @@ added in remote + * Border color for boxes. + */ + --box-border-color: #141414; -+ --box-border-accent-color: $blue; ++ --box-border-accent-color: $purple; + + /** + * Background color for selected boxes without keyboard focus @@ -16441,7 +16441,7 @@ added in remote + /** + * Background color for selected boxes with active keyboard focus + */ -+ --box-selected-active-background-color: $blue; ++ --box-selected-active-background-color: $purple; + + /** + * Text color for selected boxes with active keyboard focus @@ -16463,8 +16463,8 @@ added in remote + /** + * Author input (co-authors) + */ -+ --co-author-tag-background-color: $blue-800; -+ --co-author-tag-border-color: $blue-700; ++ --co-author-tag-background-color: $purple-800; ++ --co-author-tag-border-color: $purple-700; + + --base-border: 1px solid var(--box-border-color); + @@ -16518,7 +16518,7 @@ added in remote + --toolbar-badge-background-color: $gray-700; + --toolbar-badge-active-background-color: $gray-700; + -+ --tab-bar-active-color: $blue; ++ --tab-bar-active-color: $purple; + --tab-bar-background-color: var(--box-background-color); + + /** Count bubble colors when used inside of a tab bar item */ @@ -16546,12 +16546,12 @@ added in remote + --toast-notification-background-color: rgba(black, 0.8); + + /** The highlight color used for focus rings and focus box shadows */ -+ --focus-color: $blue; ++ --focus-color: $purple; + + /** + * Variables for form elements + */ -+ --text-field-focus-shadow-color: rgba($blue, 0.25); ++ --text-field-focus-shadow-color: rgba($purple, 0.25); + + /** + * Diff view @@ -16565,9 +16565,9 @@ added in remote + --diff-line-number-color: var(--text-secondary-color); + --diff-line-number-column-width: 50px; + -+ --diff-selected-background-color: $blue-700; -+ --diff-selected-border-color: $blue-600; -+ --diff-selected-gutter-color: $blue-600; ++ --diff-selected-background-color: $purple-700; ++ --diff-selected-border-color: $purple-600; ++ --diff-selected-gutter-color: $purple-600; + --diff-selected-text-color: var(--text-color); + + --diff-add-background-color: darken($green-900, 10%); @@ -16590,9 +16590,9 @@ added in remote + --diff-hunk-gutter-background-color: darken($gray-900, 6%); + --diff-hunk-text-color: var(--text-secondary-color); + -+ --diff-hover-background-color: $blue-500; -+ --diff-hover-border-color: $blue-400; -+ --diff-hover-gutter-color: $blue-400; ++ --diff-hover-background-color: $purple-500; ++ --diff-hover-border-color: $purple-400; ++ --diff-hover-gutter-color: $purple-400; + --diff-hover-text-color: var(--diff-text-color); + + --diff-add-hover-background-color: $green-900; @@ -16607,16 +16607,16 @@ added in remote + + // Syntax highlighting text colors + --syntax-variable-color: $purple-300; -+ --syntax-alt-variable-color: $blue-300; ++ --syntax-alt-variable-color: $purple-300; + --syntax-keyword-color: $red-300; -+ --syntax-atom-color: $blue-300; ++ --syntax-atom-color: $purple-300; + --syntax-string-color: $orange-300; + --syntax-qualifier-color: $purple-300; + --syntax-type-color: $red-300; + --syntax-comment-color: $gray-400; + --syntax-tag-color: $green-400; + --syntax-attribute-color: $purple-300; -+ --syntax-link-color: $blue-300; ++ --syntax-link-color: $purple-300; + + // Colors for form errors + --error-color: $red; @@ -17543,11 +17543,11 @@ merged } &.with-co-authors .co-authors-toggle { -- color: $blue-400; +- color: $purple-400; + color: var(--link-button-color); &:hover { -- color: $blue-600; +- color: $purple-600; + color: var(--link-button-hover-color); } } @@ -22493,7 +22493,7 @@ removed in remote -} - -function getWindowsIdentifierName() { -- return 'GitHubDesktop' +- return 'PhoenixLink' -} - -function getBundleSizes() { @@ -22657,7 +22657,7 @@ added in remote +} + +export function getWindowsIdentifierName() { -+ return 'GitHubDesktop' ++ return 'PhoenixLink' +} + +export function getBundleSizes() { diff --git a/app/test/unit/find-forked-remotes-to-prune-test.ts b/app/test/unit/find-forked-remotes-to-prune-test.ts index 875bff6688f..3d24d18ac8b 100644 --- a/app/test/unit/find-forked-remotes-to-prune-test.ts +++ b/app/test/unit/find-forked-remotes-to-prune-test.ts @@ -50,9 +50,9 @@ describe('findForkedRemotesToPrune', () => { const TestUserName = 'sergiou87' const OriginRemote = 'origin' - const NonGitHubDesktopRemote = 'non-github-desktop-remote' - const GitHubDesktopRemoteWithLocalBranch = 'github-desktop-niik' - const GitHubDesktopRemoteWithPullRequest = `github-desktop-${TestUserName}` + const NonPhoenixLinkRemote = 'non-github-desktop-remote' + const PhoenixLinkRemoteWithLocalBranch = 'github-desktop-niik' + const PhoenixLinkRemoteWithPullRequest = `github-desktop-${TestUserName}` const remotes = [ { @@ -60,15 +60,15 @@ describe('findForkedRemotesToPrune', () => { url: 'https://github.com/desktop/desktop.git', }, { - name: NonGitHubDesktopRemote, + name: NonPhoenixLinkRemote, url: 'https://github.com/fakeuser/desktop.git', }, { - name: GitHubDesktopRemoteWithLocalBranch, + name: PhoenixLinkRemoteWithLocalBranch, url: 'https://github.com/niik/desktop.git', }, { - name: GitHubDesktopRemoteWithPullRequest, + name: PhoenixLinkRemoteWithPullRequest, url: `https://github.com/${TestUserName}/desktop.git`, }, ] @@ -83,21 +83,21 @@ describe('findForkedRemotesToPrune', () => { const names = getNamesFromRemotes(remotesToPrune) expect(names).not.toBeEmpty() expect(names).not.toContain(OriginRemote) - expect(names).not.toContain(NonGitHubDesktopRemote) + expect(names).not.toContain(NonPhoenixLinkRemote) }) it('never prunes remotes with local branches', () => { const allBranches = [ createSampleBranch( 'app-store-refactor', - `${GitHubDesktopRemoteWithLocalBranch}/app-store-refactor` + `${PhoenixLinkRemoteWithLocalBranch}/app-store-refactor` ), ] const remotesToPrune = findForkedRemotesToPrune(remotes, [], allBranches) expect(getNamesFromRemotes(remotesToPrune)).not.toContain( - GitHubDesktopRemoteWithLocalBranch + PhoenixLinkRemoteWithLocalBranch ) }) @@ -113,7 +113,7 @@ describe('findForkedRemotesToPrune', () => { const remotesToPrune = findForkedRemotesToPrune(remotes, openPRs, []) expect(getNamesFromRemotes(remotesToPrune)).not.toContain( - GitHubDesktopRemoteWithPullRequest + PhoenixLinkRemoteWithPullRequest ) }) @@ -121,7 +121,7 @@ describe('findForkedRemotesToPrune', () => { const remotesToPrune = findForkedRemotesToPrune(remotes, [], []) const remoteNames = getNamesFromRemotes(remotesToPrune) - expect(remoteNames).toContain(GitHubDesktopRemoteWithPullRequest) - expect(remoteNames).toContain(GitHubDesktopRemoteWithLocalBranch) + expect(remoteNames).toContain(PhoenixLinkRemoteWithPullRequest) + expect(remoteNames).toContain(PhoenixLinkRemoteWithLocalBranch) }) }) diff --git a/app/test/unit/path-test.ts b/app/test/unit/path-test.ts index 43cc574f6cf..70393eed6e6 100644 --- a/app/test/unit/path-test.ts +++ b/app/test/unit/path-test.ts @@ -10,14 +10,14 @@ describe('path', () => { if (__WIN32__) { it('normalizes path separators on Windows', () => { const dirName = - 'C:/Users/shiftkey\\AppData\\Local\\GitHubDesktop\\app-1.0.4\\resources\\app' + 'C:/Users/shiftkey\\AppData\\Local\\PhoenixLink\\app-1.0.4\\resources\\app' const uri = encodePathAsUrl(dirName, 'folder/file.html') expect(uri.startsWith('file:///C:/Users/shiftkey/AppData/Local/')) }) it('encodes spaces and hashes', () => { const dirName = - 'C:/Users/The Kong #2\\AppData\\Local\\GitHubDesktop\\app-1.0.4\\resources\\app' + 'C:/Users/The Kong #2\\AppData\\Local\\PhoenixLink\\app-1.0.4\\resources\\app' const uri = encodePathAsUrl(dirName, 'index.html') expect(uri.startsWith('file:///C:/Users/The%20Kong%20%232/')) }) @@ -26,7 +26,7 @@ describe('path', () => { if (__DARWIN__ || __LINUX__) { it('encodes spaces and hashes', () => { const dirName = - '/Users/The Kong #2\\AppData\\Local\\GitHubDesktop\\app-1.0.4\\resources\\app' + '/Users/The Kong #2\\AppData\\Local\\PhoenixLink\\app-1.0.4\\resources\\app' const uri = encodePathAsUrl(dirName, 'index.html') expect(uri.startsWith('file:////Users/The%20Kong%20%232/')) })