-
Notifications
You must be signed in to change notification settings - Fork 894
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
Stashing so I can check out another issue
- Loading branch information
Showing
2 changed files
with
90 additions
and
0 deletions.
There are no files selected for viewing
42 changes: 42 additions & 0 deletions
42
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,42 @@ | ||
| diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.html b/chrome/browser/resources/settings/settings_ui/settings_ui.html | ||
| index 88d91ba73e146bdefdb2c51b84f49ea4be934aad..f491000d6d9c72101b65e5e02a80a28fa2cfec0f 100644 | ||
| --- a/chrome/browser/resources/settings/settings_ui/settings_ui.html | ||
| +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.html | ||
| @@ -61,24 +61,20 @@ | ||
| 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"> | ||
| + <div id="container" class="no-outline" style="text-align: center;"> | ||
| + <settings-menu | ||
| + style="display: inline-block; vertical-align: top; text-align: left;" | ||
| + 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}}" | ||
| + style="display: inline-block; text-align: left;" | ||
| toolbar-spinner-active="{{toolbarSpinnerActive_}}" | ||
| page-visibility="[[pageVisibility_]]" | ||
| show-android-apps="[[showAndroidApps_]]" |
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'); |