-
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.
- fixed render issues with current icons - did some light css but looped in pete and found it might be diminishing return so stopped - made the top banner a gradient - rebased against master 2019 Jan 10
- Loading branch information
Showing
8 changed files
with
198 additions
and
97 deletions.
There are no files selected for viewing
26 changes: 13 additions & 13 deletions
26
browser/resources/settings/brave_settings_menu/icons.html
Large diffs are not rendered by default.
Oops, something went wrong.
27 changes: 27 additions & 0 deletions
27
patches/chrome-browser-resources-settings-settings_icons_css.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,27 @@ | ||
| diff --git a/chrome/browser/resources/settings/settings_icons_css.html b/chrome/browser/resources/settings/settings_icons_css.html | ||
| index 7a4e72d47e8e79a89aacd2f84fa47575d122e0a8..5a4c8832a7b91499f19b4d08468639f1dc453383 100644 | ||
| --- a/chrome/browser/resources/settings/settings_icons_css.html | ||
| +++ b/chrome/browser/resources/settings/settings_icons_css.html | ||
| @@ -4,14 +4,14 @@ | ||
| <dom-module id="settings-icons"> | ||
| <template> | ||
| <style> | ||
| -<if expr="chromeos"> | ||
| - paper-icon-button-light.icon-add-circle { | ||
| - background-image: url(./images/settings_icon_add_circle.svg); | ||
| - } | ||
| - paper-icon-button-light.icon-add-wifi { | ||
| - background-image: url(./images/settings_icon_add_wifi.svg); | ||
| - } | ||
| -</if> | ||
| + <if expr="chromeos"> | ||
| + paper-icon-button-light.icon-add-circle { | ||
| + background-image: url(./images/settings_icon_add_circle.svg); | ||
| + } | ||
| + paper-icon-button-light.icon-add-wifi { | ||
| + background-image: url(./images/settings_icon_add_wifi.svg); | ||
| + } | ||
| + </if> | ||
| </style> | ||
| </template> | ||
| </dom-module> |
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
21 changes: 15 additions & 6 deletions
21
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
35 changes: 16 additions & 19 deletions
35
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 |
|---|---|---|
| @@ -1,48 +1,45 @@ | ||
| 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 | ||
| index 8bd9c1091bb95d266fb35bea5a69e90f73f10f7a..14aa6c528d4e0bc1bb1ac17e1f1e546aa595953f 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({ | ||
| @@ -85,13 +85,13 @@ Polymer({ | ||
| */ | ||
| ready: function() { | ||
| // Lazy-create the drawer the first time it is opened or swiped into view. | ||
| - listenOnce(this.$.drawer, 'open-changed', () => { | ||
| - listenOnce(this.$.drawer, 'cr-drawer-opening', () => { | ||
| - this.$.drawerTemplate.if = true; | ||
| - }); | ||
| + // listenOnce(this.$.drawer, 'open-changed', () => { | ||
| + // listenOnce(this.$.drawer, 'cr-drawer-opening', () => { | ||
| + // this.$.drawerTemplate.if = true; | ||
| + // }); | ||
|
|
||
| - window.addEventListener('popstate', e => { | ||
| - this.$.drawer.closeDrawer(); | ||
| - this.$.drawer.cancel(); | ||
| - }); | ||
| + // window.addEventListener('popstate', e => { | ||
| + // this.$.drawer.closeDrawer(); | ||
| + // this.$.drawer.cancel(); | ||
| + // }); | ||
|
|
||
| CrPolicyStrings = { | ||
| controlledSettingExtension: | ||
| @@ -273,16 +273,17 @@ Polymer({ | ||
| @@ -262,14 +262,14 @@ Polymer({ | ||
| * Called when a section is selected. | ||
| * @private | ||
| */ | ||
| onIronActivate_: function(event) { | ||
| - if (event.detail.item.id != 'advancedSubmenu') | ||
| - this.$.drawer.closeDrawer(); | ||
| + // if (event.detail.item.id != 'advancedSubmenu') | ||
| + // this.$.drawer.closeDrawer(); | ||
| }, | ||
| - onIronActivate_: function() { | ||
| - this.$.drawer.close(); | ||
| - }, | ||
| + // onIronActivate_: function() { | ||
| + // this.$.drawer.close(); | ||
| + // }, | ||
|
|
||
| /** @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'); | ||
| /** | ||
| * When this is called, The drawer animation is finished, and the dialog no |
Oops, something went wrong.