-
Notifications
You must be signed in to change notification settings - Fork 891
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
First steps towards solving brave/brave-browser#958
Making good progress :) - `Settings` header added over primary items (and restyled `Advanced` to match) - Padding and margin appear to match spec - Specified different font; page needs to be wired to properly include it - Sidebar has white background + borders with radius - Colors: - active items use `brandBrave` orange and bold the text - header incidently is now orange also - inactive items use `subtleInteracting` - `About Brave` text uses `subtle` - Product version (ex: 0.55.2) shown under `About Brave` along with a default icon - `Extensions` moved up under `Settings` - `Appearance` moved to last item before `Advanced`
- Loading branch information
Showing
10 changed files
with
366 additions
and
4 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
15 changes: 15 additions & 0 deletions
15
patches/chrome-browser-resources-settings-settings_main-settings_main.html.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/chrome/browser/resources/settings/settings_main/settings_main.html b/chrome/browser/resources/settings/settings_main/settings_main.html | ||
| index 87bd32f2d53f3a7d5c0f1576e268a574d54aa1e9..6313f1eaf84b3767f423286587d489e80df63477 100644 | ||
| --- a/chrome/browser/resources/settings/settings_main/settings_main.html | ||
| +++ b/chrome/browser/resources/settings/settings_main/settings_main.html | ||
| @@ -18,6 +18,10 @@ | ||
| <dom-module id="settings-main"> | ||
| <template> | ||
| <style include="cr-hidden-style"> | ||
| + :host { | ||
| + display: inline-block; | ||
| + } | ||
| + | ||
| #overscroll { | ||
| margin-top: 64px; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
patches/chrome-browser-resources-settings-settings_ui-settings_ui.html.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.html b/chrome/browser/resources/settings/settings_ui/settings_ui.html | ||
| index 88d91ba73e146bdefdb2c51b84f49ea4be934aad..2cac764ba9a2687c365ecaa52fe3deb16f5ff397 100644 | ||
| --- a/chrome/browser/resources/settings/settings_ui/settings_ui.html | ||
| +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.html | ||
| @@ -48,6 +48,10 @@ | ||
| flex: 1; | ||
| overflow: overlay; | ||
| position: relative; | ||
| + text-align: center; | ||
| + } | ||
| + #container > * { | ||
| + text-align: left; | ||
| } | ||
| </style> | ||
| <settings-prefs id="prefs" prefs="{{prefs}}"></settings-prefs> | ||
| @@ -61,23 +65,17 @@ | ||
| role="banner" | ||
| show-menu> | ||
| </cr-toolbar> | ||
| - <cr-drawer id="drawer" on-close="onMenuClosed_" | ||
| - heading="$i18n{settings}" align="$i18n{textdirection}"> | ||
| - <div class="drawer-content"> | ||
| - <template is="dom-if" id="drawerTemplate"> | ||
| - <settings-menu page-visibility="[[pageVisibility_]]" | ||
| - show-android-apps="[[showAndroidApps_]]" | ||
| - show-crostini="[[showCrostini_]]" | ||
| - show-multidevice="[[showMultidevice_]]" | ||
| - have-play-store-app="[[havePlayStoreApp_]]" | ||
| - autofill-home-enabled="[[autofillHomeEnabled_]]" | ||
| - on-iron-activate="onIronActivate_" | ||
| - advanced-opened="{{advancedOpened_}}"> | ||
| - </settings-menu> | ||
| - </template> | ||
| - </div> | ||
| - </cr-drawer> | ||
| <div id="container" class="no-outline"> | ||
| + <settings-menu | ||
| + page-visibility="[[pageVisibility_]]" | ||
| + show-android-apps="[[showAndroidApps_]]" | ||
| + show-crostini="[[showCrostini_]]" | ||
| + show-multidevice="[[showMultidevice_]]" | ||
| + have-play-store-app="[[havePlayStoreApp_]]" | ||
| + autofill-home-enabled="[[autofillHomeEnabled_]]" | ||
| + on-iron-activate="onIronActivate_" | ||
| + advanced-opened="{{advancedOpened_}}"> | ||
| + </settings-menu> | ||
| <settings-main id="main" prefs="{{prefs}}" | ||
| toolbar-spinner-active="{{toolbarSpinnerActive_}}" | ||
| page-visibility="[[pageVisibility_]]" |
48 changes: 48 additions & 0 deletions
48
patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.js b/chrome/browser/resources/settings/settings_ui/settings_ui.js | ||
| index 37ebe94a48728893daf84613aab94be6ddf89df7..2318718b653cad4db62664044611aeef3ed956e1 100644 | ||
| --- a/chrome/browser/resources/settings/settings_ui/settings_ui.js | ||
| +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.js | ||
| @@ -92,13 +92,13 @@ Polymer({ | ||
| */ | ||
| ready: function() { | ||
| // Lazy-create the drawer the first time it is opened or swiped into view. | ||
| - listenOnce(this.$.drawer, 'open-changed', () => { | ||
| - this.$.drawerTemplate.if = true; | ||
| - }); | ||
| + // listenOnce(this.$.drawer, 'open-changed', () => { | ||
| + // this.$.drawerTemplate.if = true; | ||
| + // }); | ||
|
|
||
| - window.addEventListener('popstate', e => { | ||
| - this.$.drawer.closeDrawer(); | ||
| - }); | ||
| + // window.addEventListener('popstate', e => { | ||
| + // this.$.drawer.closeDrawer(); | ||
| + // }); | ||
|
|
||
| CrPolicyStrings = { | ||
| controlledSettingExtension: | ||
| @@ -273,16 +273,17 @@ Polymer({ | ||
| * @private | ||
| */ | ||
| onIronActivate_: function(event) { | ||
| - if (event.detail.item.id != 'advancedSubmenu') | ||
| - this.$.drawer.closeDrawer(); | ||
| + // if (event.detail.item.id != 'advancedSubmenu') | ||
| + // this.$.drawer.closeDrawer(); | ||
| }, | ||
|
|
||
| /** @private */ | ||
| - onMenuButtonTap_: function() { | ||
| - this.$.drawer.toggle(); | ||
| - }, | ||
| + // onMenuButtonTap_: function() { | ||
| + // console.log('BSC]] LOL TOGGLING') | ||
| + // this.$.drawer.toggle(); | ||
| + // }, | ||
|
|
||
| - /** @private */ | ||
| + // /** @private */ | ||
| onMenuClosed_: function() { | ||
| // Add tab index so that the container can be focused. | ||
| this.$.container.setAttribute('tabindex', '-1'); |
21 changes: 21 additions & 0 deletions
21
patches/chrome-browser-ui-webui-settings-about_handler.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc | ||
| index 06c2c95e34e6140e9e82667fcb093b8f2e0d3809..013428d9d24aa91d2bfb9c08c3af28d90659b6b6 100644 | ||
| --- a/chrome/browser/ui/webui/settings/about_handler.cc | ||
| +++ b/chrome/browser/ui/webui/settings/about_handler.cc | ||
| @@ -288,6 +288,16 @@ AboutHandler* AboutHandler::Create(content::WebUIDataSource* html_source, | ||
| ? IDS_VERSION_UI_64BIT | ||
| : IDS_VERSION_UI_32BIT))); | ||
|
|
||
| + std::string brave_product_version = version_info::GetVersionNumber(); | ||
| + size_t chromium_index = brave_product_version.find("Chromium:"); | ||
| + if (chromium_index != std::string::npos) { | ||
| + brave_product_version = std::string("v").append( | ||
| + brave_product_version.substr(0, chromium_index) | ||
| + ); | ||
| + } | ||
| + html_source->AddString("braveProductVersion", | ||
| + base::UTF8ToUTF16(brave_product_version)); | ||
| + | ||
| html_source->AddString( | ||
| "aboutProductCopyright", | ||
| base::i18n::MessageFormatter::FormatWithNumberedArgs( |
15 changes: 15 additions & 0 deletions
15
patches/components-security_interstitials-core-common-resources-interstitial_core.css.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/components/security_interstitials/core/common/resources/interstitial_core.css b/components/security_interstitials/core/common/resources/interstitial_core.css | ||
| index ef124ab28e29040114cb6a3c9fdba73555269d69..cfe4003ebbb87ccb10f05cb613015671794b7478 100644 | ||
| --- a/components/security_interstitials/core/common/resources/interstitial_core.css | ||
| +++ b/components/security_interstitials/core/common/resources/interstitial_core.css | ||
| @@ -7,8 +7,8 @@ a { | ||
| } | ||
|
|
||
| body { | ||
| - --google-blue-600: #1A73E8; | ||
| - --google-blue-700: #1967D2; | ||
| + --google-blue-600: #C72E03; | ||
| + --google-blue-700: #992802; | ||
| background-color: #fff; | ||
| color: rgb(100, 100, 100); | ||
| word-wrap: break-word; |
19 changes: 19 additions & 0 deletions
19
patches/third_party-polymer-v1_0-components-chromium-paper-styles-color.html.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| diff --git a/third_party/polymer/v1_0/components-chromium/paper-styles/color.html b/third_party/polymer/v1_0/components-chromium/paper-styles/color.html | ||
| index 67eae3e27e81a5df894d497e40e94e6db1ff61bd..077a0ae2b733cb225a2c38726dd3d88e102071fe 100644 | ||
| --- a/third_party/polymer/v1_0/components-chromium/paper-styles/color.html | ||
| +++ b/third_party/polymer/v1_0/components-chromium/paper-styles/color.html | ||
| @@ -21,10 +21,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN | ||
| --google-red-500: #db4437; | ||
| --google-red-700: #c53929; | ||
|
|
||
| - --google-blue-100: #c6dafc; | ||
| - --google-blue-300: #7baaf7; | ||
| - --google-blue-500: #4285f4; | ||
| - --google-blue-700: #3367d6; | ||
| + --google-blue-100: #FCD4CD; | ||
| + --google-blue-300: #F88469; | ||
| + --google-blue-500: #F43405; | ||
| + --google-blue-700: #FB542B; | ||
|
|
||
| --google-green-100: #b7e1cd; | ||
| --google-green-300: #57bb8a; |