diff --git a/browser/resources/settings/brave_settings_menu/icons.html b/browser/resources/settings/brave_settings_menu/icons.html new file mode 100644 index 000000000000..2c4da4150bb2 --- /dev/null +++ b/browser/resources/settings/brave_settings_menu/icons.html @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/browser/resources/settings/settings_resources.grd b/browser/resources/settings/settings_resources.grd index f672dbe30f85..2d5ea93e7357 100644 --- a/browser/resources/settings/settings_resources.grd +++ b/browser/resources/settings/settings_resources.grd @@ -32,6 +32,7 @@ + diff --git a/package-lock.json b/package-lock.json index 95e57630a118..917da8d5251e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6279,7 +6279,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" diff --git a/patches/chrome-browser-resources-settings-settings_main-settings_main.html.patch b/patches/chrome-browser-resources-settings-settings_main-settings_main.html.patch new file mode 100644 index 000000000000..aa864727b957 --- /dev/null +++ b/patches/chrome-browser-resources-settings-settings_main-settings_main.html.patch @@ -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 @@ + + + diff --git a/patches/chrome-browser-resources-settings-settings_ui-settings_ui.html.patch b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.html.patch new file mode 100644 index 000000000000..0bef29a4e058 --- /dev/null +++ b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.html.patch @@ -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; + } + + +@@ -61,23 +65,17 @@ + role="banner" + show-menu> + +- +-
+- +-
+- +
++ ++ + { +- 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'); diff --git a/patches/chrome-browser-ui-webui-settings-about_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-about_handler.cc.patch new file mode 100644 index 000000000000..ec30ed84ab11 --- /dev/null +++ b/patches/chrome-browser-ui-webui-settings-about_handler.cc.patch @@ -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( diff --git a/patches/components-security_interstitials-core-common-resources-interstitial_core.css.patch b/patches/components-security_interstitials-core-common-resources-interstitial_core.css.patch new file mode 100644 index 000000000000..b506e21cd6fb --- /dev/null +++ b/patches/components-security_interstitials-core-common-resources-interstitial_core.css.patch @@ -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; diff --git a/patches/third_party-polymer-v1_0-components-chromium-paper-styles-color.html.patch b/patches/third_party-polymer-v1_0-components-chromium-paper-styles-color.html.patch new file mode 100644 index 000000000000..d649525c5c0d --- /dev/null +++ b/patches/third_party-polymer-v1_0-components-chromium-paper-styles-color.html.patch @@ -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;