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

Rebranded the welcome page #10

Merged
merged 11 commits into from
Mar 25, 2024
Merged

Rebranded the welcome page #10

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d6924c8
Made changes in the files for changing the default theme, but its ran…
MasterK0927 Mar 18, 2024
05968c6
Changed the brnading of Welcome Page
MasterK0927 Mar 24, 2024
3156547
Changes updated
MasterK0927 Mar 25, 2024
68ad035
typo in the color's value fb->ff->fb
MasterK0927 Mar 25, 2024
ba77366
was just an extra space causing trouble
MasterK0927 Mar 25, 2024
545c1ce
removed that extra space
MasterK0927 Mar 25, 2024
bbe76e7
added the extra space
MasterK0927 Mar 25, 2024
029cec6
removed the flags
MasterK0927 Mar 25, 2024
1e51b2d
may be the last fix
MasterK0927 Mar 25, 2024
d79e53b
Update util.js
MasterK0927 Mar 25, 2024
5de7672
updated util.js
MasterK0927 Mar 25, 2024
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
3 changes: 2 additions & 1 deletion build/commands/lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,7 @@ const util = {

let ninjaOpts = [
'-C', options.outputDir || config.outputDir, target,
'-j8',
'-k', num_compile_failure,
...config.extraNinjaOpts
]
Expand Down Expand Up @@ -1106,4 +1107,4 @@ const util = {
},
}

module.exports = util
MasterK0927 marked this conversation as resolved.
Show resolved Hide resolved
module.exports = util
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iss file mein koi changes hi nahi rehne chaiye

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolving

3 changes: 1 addition & 2 deletions chromium_src/ui/native_theme/native_theme.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
namespace ui {

SkColor NativeTheme::GetSystemButtonPressedColor(SkColor base_color) const {
const SkColor kBraveColorBrand = SkColorSetRGB(0xfb, 0x54, 0x2b);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove extra changes from this file

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done bhaiya

const SkColor kBraveColorBrand =SkColorSetRGB(0xff, 0x54, 0x2b);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this colour change for?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted to the default buttons color, and KbraveBrand color

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert kara hai toh ye changed nahi ana chaiye na?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mtlb bhaiya manually change kr diya hai, jo phele tha whi color mai

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

manually bhi revert hua hai toh ye change nahi ana chaiye

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay bhaiya looking into it

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed it bhaiya, it was the typo

bool is_dark = (GetPreferredColorScheme() == PreferredColorScheme::kDark);
return color_utils::GetResultingPaintColor(
SkColorSetA(kBraveColorBrand, is_dark ? 0x2b : 0x23), base_color);
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yaar ye extra changes bhi hata do please. files ka indentation kharab nahi karte agar wahan kuch changes nahi hai toh

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done bhaiya

} // namespace ui
Binary file modified components/brave_welcome_ui/assets/brave_logo_3d@2x.webp
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this file for?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its the logo that is being displayed on the welcome page.

Binary file not shown.
6 changes: 4 additions & 2 deletions components/brave_welcome_ui/components/help-improve/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ function HelpImprove () {
<S.MainBox>
<div className="view-header-box">
<div className="view-details">
<h1 className="view-title">{getLocale('braveWelcomeHelpImproveBraveTitle')}</h1>
<h1 className="view-title">
{getLocale('braveWelcomeHelpImproveBraveTitle')}
</h1>
</div>
</div>
<S.Grid>
Expand Down Expand Up @@ -104,7 +106,7 @@ function HelpImprove () {
</Button>
<S.FootNote>
{changeSettingsNote.beforeTag}
<a href="brave://settings/privacy" onClick={handleOpenSettingsPage}>
<a href="ping://settings/privacy" onClick={handleOpenSettingsPage}>
{changeSettingsNote.duringTag}
</a>
{changeSettingsNote.afterTag}
Expand Down
26 changes: 1 addition & 25 deletions components/brave_welcome_ui/components/images/lion_logo.svg
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this logo being used on the welcome page or the other one?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is used in components/brave_welcome_ui/components/images/index.ts

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where is this logo being used and where is brave_logo_3d@2x.webp being used?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brave_logo_3d@2x.webp is being used in the brave_welcome_ui page

lion_logo.svg its use is still unknown but its defined in the images under brave_welcome_ui

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions components/brave_welcome_ui/stories/locale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { provideStrings } from '../../../.storybook/locale'

provideStrings({
braveWelcomeTitle: 'Privacy. By Default.',
braveWelcomeDesc: 'Get Brave protection on every link you click. Just set Brave as default and browse. Privately.',
braveWelcomeDesc: 'Get Ping protection on every link you click. Just set Ping as default and browse. Privately.',
braveWelcomeImportSettingsTitle: 'Import Settings',
braveWelcomeImportSettingsDesc: 'Easily import bookmarks, extensions, even saved passwords from your old browser.',
braveWelcomeSelectProfileLabel: 'Select profile to import',
Expand All @@ -18,16 +18,16 @@ provideStrings({
braveWelcomeBackButtonLabel: 'Back',
braveWelcomeNextButtonLabel: 'Next',
braveWelcomeFinishButtonLabel: 'Finish',
braveWelcomeSetDefaultButtonLabel: 'Set Brave as default browser',
braveWelcomeSetDefaultButtonLabel: 'Set Ping as default browser',
braveWelcomeSelectAllButtonLabel: 'Select All',
braveWelcomeHelpImproveBraveTitle: 'Help make Brave better.',
braveWelcomeHelpImproveBraveTitle: 'Help make Ping better.',
braveWelcomeSendReportsLabel: 'Send diagnostic reports if you experience a crash or freeze. $1Learn more.$2',
braveWelcomeSendInsightsLabel: 'Share completely private and anonymous product insights about what features are being used by Brave\'s users. $1Learn more.$2',
braveWelcomeSendInsightsLabel: 'Share completely private and anonymous product insights about what features are being used by Ping\'s users. $1Learn more.$2',
braveWelcomeSetupCompleteLabel: 'Setup complete',
braveWelcomeChangeSettingsNote: ' Change these choices at any time in Brave at $1brave://settings/privacy$2.',
braveWelcomeChangeSettingsNote: ' Change these choices at any time in Ping at $1ping://settings/privacy$2.',
braveWelcomePrivacyPolicyNote: 'Read our full $1Privacy Policy$2',
braveWelcomeSelectThemeLabel: 'Choose your theme',
braveWelcomeSelectThemeNote: 'You can change this at any time in Brave settings.',
braveWelcomeSelectThemeNote: 'You can change this at any time in Ping settings.',
braveWelcomeSelectThemeSystemLabel: 'Match system setting',
braveWelcomeSelectThemeLightLabel: 'Light mode',
braveWelcomeSelectThemeDarkLabel: 'Dark mode'
Expand Down
12 changes: 6 additions & 6 deletions components/resources/brave_welcome_strings.grdp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</message>

<message name="IDS_BRAVE_WELCOME_DESC" desc="A subtitle for screen on the first step of welcome page">
Get Brave protection on every link you click. Just set Brave as default and browse. Privately.
Get Ping protection on every link you click. Just set Ping as default and browse. Privately.
</message>

<message name="IDS_BRAVE_WELCOME_IMPORT_SETTINGS_TITLE" desc="A title for screen to select browser">
Expand Down Expand Up @@ -49,31 +49,31 @@
</message>

<message name="IDS_BRAVE_WELCOME_SET_DEFAULT_BUTTON_LABEL" desc="A button that sets Brave browser as default">
Set Brave as default browser
Set Ping as default browser
</message>

<message name="IDS_BRAVE_WELCOME_SELECT_ALL_BUTTON_LABEL" desc="A button label to select all profiles">
Select All
</message>

<message name="IDS_BRAVE_WELCOME_HELP_IMPROVE_BRAVE_TITLE" desc="A title for screen that asks user to opt-in for analytics and reports">
Help make Brave better.
Help make Ping better.
</message>

<message name="IDS_BRAVE_WELCOME_SEND_REPORTS_LABEL" desc="A checkbox label for user to opt-in opt-out to send diagnostic reports">
Send diagnostic reports if you experience a crash or freeze. <ph name="LINK_BEFORE">$1</ph>Learn more.<ph name="LINK_AFTER">$2</ph>
</message>

<message name="IDS_BRAVE_WELCOME_SEND_INSIGHTS_LABEL" desc="A checkbox label for user to opt-in opt-out to share anonymous, product insights information">
Share completely private and anonymous product insights about what features are being used by Brave's users. <ph name="LINK_BEFORE">$1</ph>Learn more.<ph name="LINK_AFTER">$2</ph>
Share completely private and anonymous product insights about what features are being used by Ping's users. <ph name="LINK_BEFORE">$1</ph>Learn more.<ph name="LINK_AFTER">$2</ph>
</message>

<message name="IDS_BRAVE_WELCOME_SETUP_COMPLETE_LABEL" desc="A title for screen when user has completed all the steps">
Setup complete
</message>

<message name="IDS_BRAVE_WELCOME_CHANGE_SETTINGS_NOTE" desc="A footnote with a link to change settings.">
Change these choices at any time in Brave at <ph name="LINK_BEFORE1">$1</ph>brave://settings/privacy<ph name="LINK_AFTER2">$2</ph>.
Change these choices at any time in Ping at <ph name="LINK_BEFORE1">$1</ph>ping://settings/privacy<ph name="LINK_AFTER2">$2</ph>.
</message>

<message name="IDS_BRAVE_WELCOME_PRIVACY_POLICY_NOTE" desc="A footnote with a link to Brave's privacy polcy.">
Expand All @@ -85,7 +85,7 @@
</message>

<message name="IDS_BRAVE_WELCOME_SELECT_THEME_NOTE" desc="A note for user to change theme in settings">
You can change this at any time in Brave settings.
You can change this at any time in Ping settings.
</message>

<message name="IDS_BRAVE_WELCOME_SELECT_THEME_SYSTEM_LABEL" desc="A label to match system setting">
Expand Down