Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replaced chrome dark logo with channel product logo from settings drawer menu (uplift to 1.59.x) #20290

Merged
merged 1 commit into from
Sep 27, 2023
Merged

Replaced chrome dark logo with channel product logo from settings drawer menu (uplift to 1.59.x) #20290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions build/commands/lib/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,20 @@ Config.prototype.getBrandingPathProduct = function () {
return this.isOfficialBuild() ? "brave" : "brave-development"
}

Config.prototype.getBraveLogoIconName = function () {
let iconName = "brave-icon-debug-color.svg"
if (this.isBraveReleaseBuild()) {
if (this.channel === "beta") {
iconName = "brave-icon-beta-color.svg"
} else if (this.channel === "nightly") {
iconName = "brave-icon-nightly-color.svg"
} else {
iconName = "brave-icon-release-color.svg"
}
}
return iconName
}

Config.prototype.buildArgs = function () {
const version = this.braveVersion
let version_parts = version.split('+')[0]
Expand Down
6 changes: 6 additions & 0 deletions build/commands/lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,12 @@ const util = {
// Replace webui CSS to use our fonts.
fileMap.add([path.join(config.braveCoreDir, 'ui', 'webui', 'resources', 'css', 'text_defaults_md.css'),
path.join(config.srcDir, 'ui', 'webui', 'resources', 'css', 'text_defaults_md.css')])
// Replace chrome dark logo with channel specific brave logo.
fileMap.add([
path.join(config.braveCoreDir, 'node_modules', '@brave', 'leo', 'icons',
config.getBraveLogoIconName()),
path.join(config.srcDir, 'ui', 'webui', 'resources', 'images',
'chrome_logo_dark.svg')])

let explicitSourceFiles = new Set()
if (config.getTargetOS() === 'mac') {
Expand Down