Skip to content

Commit

Permalink
Rebrand
Browse files Browse the repository at this point in the history
  • Loading branch information
sabianroberts committed Nov 3, 2024
1 parent 1a25f97 commit 9d7583e
Show file tree
Hide file tree
Showing 20 changed files with 176 additions and 176 deletions.
2 changes: 1 addition & 1 deletion app/src/crash/styles/crash.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion app/src/lib/http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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})`
}

/**
Expand Down
2 changes: 1 addition & 1 deletion app/src/lib/progress/lfs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<string> {
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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main-process/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion app/static/win32/github.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion app/static/win32/github.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
68 changes: 34 additions & 34 deletions app/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand All @@ -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);
Expand Down Expand Up @@ -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};

/**
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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};

Expand Down Expand Up @@ -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
Expand All @@ -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%)};
Expand All @@ -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};
Expand Down Expand Up @@ -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 */
Expand All @@ -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
Expand Down
54 changes: 27 additions & 27 deletions app/styles/themes/_dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
// 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};
--text-secondary-color: #{$gray-400};
--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%)};
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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};

Expand Down Expand Up @@ -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
Expand All @@ -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%)};
Expand All @@ -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};
Expand All @@ -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};

Expand All @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions app/styles/ui/onboarding-tutorial/_right-panel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit 9d7583e

Please sign in to comment.