From 6bad93d03caad4761d47e721b3c3450800ddaec0 Mon Sep 17 00:00:00 2001 From: trickypr Date: Thu, 17 Nov 2022 14:31:08 +1100 Subject: [PATCH 01/14] =?UTF-8?q?=F0=9F=92=84=20Make=20a=20lot=20of=20the?= =?UTF-8?q?=20border=20radius=20more=20consistent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../themes/addons/dark/manifest-json.patch | 20 ++++---- .../themes/addons/light/manifest-json.patch | 20 ++++---- .../themes/addons/pulse/dark/manifest.json | 35 +++++++++++-- .../themes/addons/pulse/light/manifest.json | 36 ++++++++++++-- src/browser/themes/pulse/addons/shared.css | 49 +++---------------- src/browser/themes/pulse/sidebar_tabs.css | 6 +-- 6 files changed, 94 insertions(+), 72 deletions(-) diff --git a/src/browser/themes/addons/dark/manifest-json.patch b/src/browser/themes/addons/dark/manifest-json.patch index 4e557295..8e549db2 100644 --- a/src/browser/themes/addons/dark/manifest-json.patch +++ b/src/browser/themes/addons/dark/manifest-json.patch @@ -1,13 +1,13 @@ diff --git a/browser/themes/addons/dark/manifest.json b/browser/themes/addons/dark/manifest.json -index e14118aa10ac81c35ad4e70217503332b4cba397..eedaad10acebf90030f0deb8a5db1fead05c60e3 100644 +index 3ab1378a042996445ec77c8cad46b0fc44604d70..24cb568177ad3b68ad31785595073287bc06173c 100644 --- a/browser/themes/addons/dark/manifest.json +++ b/browser/themes/addons/dark/manifest.json -@@ -17,7 +17,7 @@ - "theme": { - "colors": { - "tab_background_text": "#fbfbfe", -- "tab_selected": "rgb(66,65,77)", -+ "tab_selected": "rgb(43,42,51)", - "tab_text": "rgb(251,251,254)", - "icons": "rgb(251,251,254)", - "frame": "#1c1b22", +@@ -7,7 +7,7 @@ + } + }, + +- "name": "Dark", ++ "name": "Mozilla Dark", + "description": "A theme with a dark color scheme.", + "author": "Mozilla", + "version": "1.2", diff --git a/src/browser/themes/addons/light/manifest-json.patch b/src/browser/themes/addons/light/manifest-json.patch index 850e62a7..684c687b 100644 --- a/src/browser/themes/addons/light/manifest-json.patch +++ b/src/browser/themes/addons/light/manifest-json.patch @@ -1,13 +1,13 @@ diff --git a/browser/themes/addons/light/manifest.json b/browser/themes/addons/light/manifest.json -index a73604690b1b71c99ee0289ea7c4326a84408331..53461caacef48737b3c10eeb355159c2833a0fb1 100644 +index b8eb9649a8a5292f83c34aa1d3cc867fbf456798..e8c6756f2858783cce86f94793b14071b0924cb7 100644 --- a/browser/themes/addons/light/manifest.json +++ b/browser/themes/addons/light/manifest.json -@@ -17,7 +17,7 @@ - "theme": { - "colors": { - "tab_background_text": "rgb(21,20,26)", -- "tab_selected": "#fff", -+ "tab_selected": "#f9f9fb", - "tab_text": "rgb(21,20,26)", - "icons": "rgb(91,91,102)", - "frame": "#f0f0f4", +@@ -7,7 +7,7 @@ + } + }, + +- "name": "Light", ++ "name": "Mozilla Light", + "description": "A theme with a light color scheme.", + "author": "Mozilla", + "version": "1.2", diff --git a/src/browser/themes/addons/pulse/dark/manifest.json b/src/browser/themes/addons/pulse/dark/manifest.json index 6a54e6ff..8e8fd817 100644 --- a/src/browser/themes/addons/pulse/dark/manifest.json +++ b/src/browser/themes/addons/pulse/dark/manifest.json @@ -8,7 +8,7 @@ }, "name": "Pulse Dark", - "description": "A clean, minimalist, dark theme", + "description": "Pulse's dark theme", "author": "Fushra", "version": "1.2", @@ -59,11 +59,24 @@ "tab_icon_overlay_fill": "rgb(251,251,254)" }, "properties": { + "arrowpanel_border_radius": "16px", + "arrowpanel_menuitem_border_radius": "8px", + "panel_hover": "color-mix(in srgb, currentColor 9%, transparent)", "panel_active": "color-mix(in srgb, currentColor 14%, transparent)", "panel_active_darker": "color-mix(in srgb, currentColor 25%, transparent)", "toolbar_field_icon_opacity": "1", - "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)" + + "tab_rounding_size": "16px", + "tab_rounding_size_neg": "-16px", + "tab_block_margin": "0", + "tab_border_radius": "0", + "tab_padding_inline": "0", + + "gradient": "linear-gradient(var(--gradient-orientation), hsla(212, 97%, 54%, 1) 0%, hsla(295, 70%, 58%, 1) 100%)", + "zap_gradient": "var(--gradient)", + + "toolbar_button_border_radius": "8px" } }, @@ -90,11 +103,27 @@ "tab_icon_overlay_fill": "--tab-icon-overlay-fill" }, "properties": { + "arrowpanel_border_radius": "--arrowpanel-border-radius", + "arrowpanel_menuitem_border_radius": "--arrowpanel-menuitem-border-radius", + "panel_hover": "--panel-item-hover-bgcolor", "panel_active": "--arrowpanel-dimmed-further", "panel_active_darker": "--panel-item-active-bgcolor", "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity", - "zap_gradient": "--panel-separator-zap-gradient" + + "tab_rounding_size": "--tab-rounding-size", + "tab_rounding_size_neg": "--tab-rounding-size-neg", + // The padding around each tab. In proton, this is what makes them float + "tab_block_margin": "--tab-block-margin", + // The border radius of the tab + "tab_border_radius": "--tab-border-radius", + // Padding to the left and right of the tab. **Pulse Browser custom** + "tab_padding_inline": "--tab-padding-inline", + + "gradient": "--gradient", + "zap_gradient": "--panel-separator-zap-gradient", + + "toolbar_button_border_radius": "--toolbarbutton-border-radius" } } } diff --git a/src/browser/themes/addons/pulse/light/manifest.json b/src/browser/themes/addons/pulse/light/manifest.json index f7c83a80..0c45aaf5 100644 --- a/src/browser/themes/addons/pulse/light/manifest.json +++ b/src/browser/themes/addons/pulse/light/manifest.json @@ -8,7 +8,7 @@ }, "name": "Pulse Light", - "description": "A clean, minimalist, light theme", + "description": "Pulse's light theme", "author": "Fushra", "version": "1.2", @@ -59,12 +59,25 @@ "sidebar_border": "transparent" }, "properties": { + "arrowpanel_border_radius": "16px", + "arrowpanel_menuitem_border_radius": "8px", + "panel_hover": "color-mix(in srgb, currentColor 12%, transparent)", "panel_active": "color-mix(in srgb, currentColor 20%, transparent)", "panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)", "toolbar_field_icon_opacity": "0.72", "input_border_color": "color-mix(in srgb, currentColor 41%, transparent)", - "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)" + + "tab_rounding_size": "16px", + "tab_rounding_size_neg": "-16px", + "tab_block_margin": "0", + "tab_border_radius": "0", + "tab_padding_inline": "0", + + "gradient": "linear-gradient(var(--gradient-orientation), hsla(212, 97%, 54%, 1) 0%, hsla(295, 70%, 58%, 1) 100%)", + "zap_gradient": "var(--gradient)", + + "toolbar_button_border_radius": "8px" } }, @@ -92,12 +105,27 @@ "tab_icon_overlay_fill": "--tab-icon-overlay-fill" }, "properties": { + "arrowpanel_border_radius": "--arrowpanel-border-radius", + "arrowpanel_menuitem_border_radius": "--arrowpanel-menuitem-border-radius", + "panel_hover": "--panel-item-hover-bgcolor", "panel_active": "--arrowpanel-dimmed-further", "panel_active_darker": "--panel-item-active-bgcolor", "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity", - "input_border_color": "--input-border-color", - "zap_gradient": "--panel-separator-zap-gradient" + + "tab_rounding_size": "--tab-rounding-size", + "tab_rounding_size_neg": "--tab-rounding-size-neg", + // The padding around each tab. In proton, this is what makes them float + "tab_block_margin": "--tab-block-margin", + // The border radius of the tab + "tab_border_radius": "--tab-border-radius", + // Padding to the left and right of the tab. **Pulse Browser custom** + "tab_padding_inline": "--tab-padding-inline", + + "gradient": "--gradient", + "zap_gradient": "--panel-separator-zap-gradient", + + "toolbar_button_border_radius": "--toolbarbutton-border-radius" } } } diff --git a/src/browser/themes/pulse/addons/shared.css b/src/browser/themes/pulse/addons/shared.css index ac843daa..ec8b188d 100644 --- a/src/browser/themes/pulse/addons/shared.css +++ b/src/browser/themes/pulse/addons/shared.css @@ -6,34 +6,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. /* Pulse specific variables */ :root { - --tab-rounding-size: 8px; - --tab-rounding-size-neg: -8px; - - /* Colors */ --gradient-orientation: 90deg; - --gradient: linear-gradient( - var(--gradient-orientation), - hsla(212, 97%, 54%, 1) 0%, - hsla(295, 70%, 58%, 1) 100% - ); - - /* Tabs */ - --tab-block-margin: 0 !important; /* The padding around each tab. In proton, this is what makes them float */ - --tab-border-radius: 0 !important; /* The border radius of the tab */ - --tab-padding-inline: 0 !important; /* Padding to the left and right of the tab. **Focus Browser custom** */ - - --toolbarbutton-border-radius: 4px; - - /* Toolbar area */ - --toolbar-field-border-color: transparent !important; /* The border color of the search input */ - - /* App Menu styling */ - --panel-separator-zap-gradient: var( - --gradient - ) !important; /* The gradient used for the app menu separator */ - - /* Panel variables */ - --panel-footer-item-border-radius: 8px; /* The border radius of the panel footer items */ /* Bookmark panel */ --bookmark-panel-image-border-radius: 8px; /* The border radius of the bookmark panel image */ @@ -50,7 +23,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. --menulist-border-radius: 8px; /* The border radius of the menulist */ /* Dialog variables */ - --dialog-border-radius: 8px; /* The border radius of the dialog */ + --dialog-border-radius: 16px; /* The border radius of the dialog */ /* Make the tabs a touch wider */ --tab-min-height: 38px; @@ -87,14 +60,9 @@ tab.tabbrowser-tab:nth-child(1) { /* Expand the overflow margin to contain the tab curves https://searchfox.org/mozilla-central/diff/b269ed31009c9a01be532c9afc0a836e0ad86ed6/browser/themes/shared/tabs.css#103 */ - overflow-clip-margin: 8px !important; + overflow-clip-margin: var(--tab-rounding-size) !important; } -/* #tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab > .tab-stack > .tab-background[multiselected="true"]:-moz-lwtheme, #tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab > .tab-stack > .tab-background[selected="true"]:-moz-lwtheme { - -moz-context-properties: fill; - fill: var(--lwt-selected-tab-background-color); -} */ - .tab-background[selected='true']::before, .tab-background[selected='true']::after { content: ''; @@ -172,12 +140,6 @@ tab.tabbrowser-tab:nth-child(1) { border-style: none; } -/* Panel footer styles */ -.panel-footer > button { - /* The border radius of the panel footer items */ - border-radius: var(--panel-footer-item-border-radius); -} - /* ========================================================================== */ /* Bookmark styles */ @@ -216,7 +178,11 @@ menulist:host(:not([native])) { } .dialogBox { - border-radius: var(--dialog-border-radius); + border-radius: var(--dialog-border-radius) !important; +} + +.panel-footer > button { + border-radius: var(--arrowpanel-menuitem-border-radius); } /** @@ -231,7 +197,6 @@ menulist:host(:not([native])) { * * If you have any issues with this style, please open a ticket at https://github.com/NiklasGollenstede/unload-tabs */ - tab[pending], #alltabs-popup menuitem[pending] { opacity: 0.6 !important; diff --git a/src/browser/themes/pulse/sidebar_tabs.css b/src/browser/themes/pulse/sidebar_tabs.css index b57e4965..92b8ae3c 100644 --- a/src/browser/themes/pulse/sidebar_tabs.css +++ b/src/browser/themes/pulse/sidebar_tabs.css @@ -18,7 +18,7 @@ background-color: -moz-Dialog; overflow: hidden; - max-width: calc(var(--tab-min-height) + var(--tab-block-margin) * 2); + max-width: calc(var(--tab-min-height) + 2px + var(--tab-block-margin) * 2); /* Makes the sidebar slide out from below */ position: relative; @@ -53,8 +53,8 @@ border-radius: var(--tab-border-radius); margin: var(--tab-block-margin); - width: var(--tab-min-height); - height: var(--tab-min-height); + width: calc(var(--tab-min-height) + 2px); + height: calc(var(--tab-min-height) + 2px); display: flex; justify-content: center; align-items: center; From 3c42462b8ff397cbb3868c543dedf1e604e2e290 Mon Sep 17 00:00:00 2001 From: trickypr Date: Thu, 17 Nov 2022 16:12:33 +1100 Subject: [PATCH 02/14] =?UTF-8?q?=F0=9F=91=B7=20Don't=20publish=20releases?= =?UTF-8?q?=20on=20non-alpha=20branches?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 87161542..81411966 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -350,6 +350,8 @@ jobs: name: Release needs: [build-data, linux, source, mac, windows] runs-on: ubuntu-latest + if: ${{ github.ref == 'refs/heads/alpha' }} + steps: - uses: actions/download-artifact@v2 @@ -397,6 +399,7 @@ jobs: name: Build flatpak repos needs: [build-data, release] runs-on: ubuntu-latest + if: ${{ github.ref == 'refs/heads/alpha' }} steps: - uses: actions/checkout@v3 From df56503bf942c1b458e4dba7ed60528f16af9ac6 Mon Sep 17 00:00:00 2001 From: trickypr Date: Fri, 18 Nov 2022 20:41:57 +1100 Subject: [PATCH 03/14] =?UTF-8?q?=F0=9F=92=84=20Branded=20colors=20for=20t?= =?UTF-8?q?he=20dark=20theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 +- .../themes/addons/pulse/dark/manifest.json | 146 +++++++++++++----- 2 files changed, 109 insertions(+), 40 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index d800add1..f11b2011 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,7 +5,8 @@ "moz.configure": "python", "app.mozbuild": "python", "Makefile.in": "makefile", - "mozconfig": "shellscript" + "mozconfig": "shellscript", + "src/browser/themes/**.json": "jsonc" }, "files.watcherExclude": { "**/.git/objects/**": true, diff --git a/src/browser/themes/addons/pulse/dark/manifest.json b/src/browser/themes/addons/pulse/dark/manifest.json index 8e8fd817..c8e8bc07 100644 --- a/src/browser/themes/addons/pulse/dark/manifest.json +++ b/src/browser/themes/addons/pulse/dark/manifest.json @@ -16,47 +16,85 @@ "theme": { "colors": { - "tab_background_text": "#fbfbfe", - "tab_selected": "rgb(43,42,51)", - "tab_text": "rgb(251,251,254)", - "icons": "rgb(251,251,254)", - "frame": "#1c1b22", - "popup": "rgb(66,65,77)", - "popup_text": "rgb(251,251,254)", - "popup_border": "rgb(82,82,94)", + "tab_background_text": "#BFBCC2", // Grey 300 + "tab_selected": "#1A171C", // Grey 900 + "tab_text": "#F2F1F4", // Grey 100 + + "icons": "#F2F1F4", // Grey 100 + "frame": "#26222A", // Grey 850 + "popup": "#26222A", // Grey 850 + "popup_text": "#F2F1F4", // Grey 100 + "popup_border": "transparent", "popup_highlight": "rgb(43,42,51)", "tab_line": "transparent", - "toolbar": "rgb(43,42,51)", + + "toolbar": "#1A171C", // Grey 900 "toolbar_top_separator": "transparent", - "toolbar_bottom_separator": "hsl(240, 5%, 5%)", - "toolbar_field": "rgb(28,27,34)", + "toolbar_bottom_separator": "#1A171C", // Grey 900 + "toolbar_field": "#26222A", // Grey 850 "toolbar_field_border": "transparent", - "toolbar_field_text": "rgb(251,251,254)", - "toolbar_field_focus": "rgb(66,65,77)", - "toolbar_text": "rgb(251, 251, 254)", - "ntp_background": "rgb(43, 42, 51)", - "ntp_card_background": "rgb(66,65,77)", - "ntp_text": "rgb(251, 251, 254)", - "sidebar_text": "rgb(249, 249, 250)", + "toolbar_field_text": "#F2F1F4", // Grey 100 + "toolbar_field_focus": "#332F37", // Grey 800 + "toolbar_text": "#BFBCC2", // Grey 300 + + "ntp_background": "#26222A", // Grey 850 + "ntp_card_background": "#332F37", // Grey 800 + "ntp_text": "#F2F1F4", // Grey 100 + + "sidebar_text": "#F2F1F4", // Grey 100 "sidebar_border": "transparent", - "button": "rgb(43,42,51)", - "button_hover": "rgb(82,82,94)", - "button_active": "rgb(91,91,102)", - "button_primary": "rgb(0, 221, 255)", - "button_primary_hover": "rgb(128, 235, 255)", - "button_primary_active": "rgb(170, 242, 255)", - "button_primary_color": "rgb(43, 42, 51)", - "error_text_color": "rgb(255, 154, 162)", - "input_background": "#42414D", - "input_color": "rgb(251,251,254)", - "input_border": "#8f8f9d", - "input_border_error": "rgb(255, 132, 138)", - "zoom_controls": "rgb(74,74,85)", - "autocomplete_popup_separator": "rgb(82,82,94)", - "appmenu_update_icon_color": "#54FFBD", - "appmenu_info_icon_color": "#80EBFF", - "tab_icon_overlay_stroke": "rgb(66,65,77)", - "tab_icon_overlay_fill": "rgb(251,251,254)" + + "button": "#332F37", // Grey 800 + "button_hover": "#4D4950", // Grey 700 + "button_active": "#656369", // Grey 600 + "button_primary": "#8240BF33", // Primary 500, 20% + "button_primary_hover": "#8240BF4D", // Primary 500, 30% + "button_primary_active": "#8240BF65", // Primary 500, 40% + "button_primary_color": "#DAB6FB", // Primary 200 + + "error_text_color": "rgb(255, 154, 162)", // TODO: We need red / error colors + + "input_background": "#332F37", // Grey 800 + "input_color": "#F2F1F4", // Grey 100 + "input_border": "transparent", + "input_border_error": "rgb(255, 132, 138)", // TODO: We need red / error colors + + "autocomplete_popup_separator": "#4D4950", // Grey 700 + "appmenu_update_icon_color": "#54FFBD", // TODO + "appmenu_info_icon_color": "#80EBFF", // TODO + "tab_icon_overlay_stroke": "rgb(66,65,77)", // TODO: What even are these? + "tab_icon_overlay_fill": "rgb(251,251,254)", // TODO: What even are these? + + "pulse_grey_900": "#1A171C", + "pulse_grey_850": "#26222A", + "pulse_grey_800": "#332F37", + "pulse_grey_700": "#4D4950", + "pulse_grey_600": "#656369", + "pulse_grey_500": "#807D82", + "pulse_grey_400": "#A19EA3", + "pulse_grey_300": "#BFBCC2", + "pulse_grey_200": "#D9D6DC", + "pulse_grey_100": "#F2F1F4", + + "pulse_primary_900": "#1B0033", + "pulse_primary_800": "#34085E", + "pulse_primary_700": "#4E1386", + "pulse_primary_600": "#6829A3", + "pulse_primary_500": "#8240BF", + "pulse_primary_400": "#A363DE", + "pulse_primary_300": "#A363DE", + "pulse_primary_200": "#DAB6FB", + "pulse_primary_100": "#F3E6FF", + + "pulse_secondary_900": "#350439", + "pulse_secondary_800": "#500B56", + "pulse_secondary_700": "#791282", + "pulse_secondary_600": "#A429AE", + "pulse_secondary_500": "#C732D3", + "pulse_secondary_400": "#E54AE8", + "pulse_secondary_300": "#FC79FF", + "pulse_secondary_200": "#FD9EFF", + "pulse_secondary_100": "#F9D8FC" }, "properties": { "arrowpanel_border_radius": "16px", @@ -73,7 +111,7 @@ "tab_border_radius": "0", "tab_padding_inline": "0", - "gradient": "linear-gradient(var(--gradient-orientation), hsla(212, 97%, 54%, 1) 0%, hsla(295, 70%, 58%, 1) 100%)", + "gradient": "linear-gradient(var(--gradient-orientation), var(--pulse-primary-500) 0%, var(--pulse-secondary-500) 100%)", "zap_gradient": "var(--gradient)", "toolbar_button_border_radius": "8px" @@ -96,11 +134,41 @@ "input_border": "--input-border-color", "input_border_error": "--input-error-border-color", "autocomplete_popup_separator": "--autocomplete-popup-separator-color", - "zoom_controls": "--zoom-controls-bgcolor", "appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor", "appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor", "tab_icon_overlay_stroke": "--tab-icon-overlay-stroke", - "tab_icon_overlay_fill": "--tab-icon-overlay-fill" + "tab_icon_overlay_fill": "--tab-icon-overlay-fill", + + "pulse_grey_900": "--pulse-grey-900", + "pulse_grey_850": "--pulse-grey-850", + "pulse_grey_800": "--pulse-grey-800", + "pulse_grey_700": "--pulse-grey-700", + "pulse_grey_600": "--pulse-grey-600", + "pulse_grey_500": "--pulse-grey-500", + "pulse_grey_400": "--pulse-grey-400", + "pulse_grey_300": "--pulse-grey-300", + "pulse_grey_200": "--pulse-grey-200", + "pulse_grey_100": "--pulse-grey-100", + + "pulse_primary_900": "--pulse-primary-900", + "pulse_primary_800": "--pulse-primary-800", + "pulse_primary_700": "--pulse-primary-700", + "pulse_primary_600": "--pulse-primary-600", + "pulse_primary_500": "--pulse-primary-500", + "pulse_primary_400": "--pulse-primary-400", + "pulse_primary_300": "--pulse-primary-300", + "pulse_primary_200": "--pulse-primary-200", + "pulse_primary_100": "--pulse-primary-100", + + "pulse_secondary_900": "--pulse-secondary-900", + "pulse_secondary_800": "--pulse-secondary-800", + "pulse_secondary_700": "--pulse-secondary-700", + "pulse_secondary_600": "--pulse-secondary-600", + "pulse_secondary_500": "--pulse-secondary-500", + "pulse_secondary_400": "--pulse-secondary-400", + "pulse_secondary_300": "--pulse-secondary-300", + "pulse_secondary_200": "--pulse-secondary-200", + "pulse_secondary_100": "--pulse-secondary-100" }, "properties": { "arrowpanel_border_radius": "--arrowpanel-border-radius", From 72fadf20e175cde54e91c6cd57698cb70df3ae01 Mon Sep 17 00:00:00 2001 From: trickypr Date: Fri, 18 Nov 2022 22:07:09 +1100 Subject: [PATCH 04/14] =?UTF-8?q?=F0=9F=9A=A7=20Content=20pages=20follow?= =?UTF-8?q?=20lightweight=20theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/content/contentTheme-js.patch | 56 +++++++++ src/browser/components/BrowserGlue-jsm.patch | 22 +++- .../themes/ThemeVariableMap-sys-mjs.patch | 13 +- .../themes/addons/pulse/dark/manifest.json | 116 +++++++++--------- 4 files changed, 145 insertions(+), 62 deletions(-) create mode 100644 src/browser/base/content/contentTheme-js.patch diff --git a/src/browser/base/content/contentTheme-js.patch b/src/browser/base/content/contentTheme-js.patch new file mode 100644 index 00000000..4d817739 --- /dev/null +++ b/src/browser/base/content/contentTheme-js.patch @@ -0,0 +1,56 @@ +diff --git a/browser/base/content/contentTheme.js b/browser/base/content/contentTheme.js +index d634a17c2633dc2ead40082c71622fe1b7a491a2..2d122f05cc5ce74e43d73a218ad5636deabc7296 100644 +--- a/browser/base/content/contentTheme.js ++++ b/browser/base/content/contentTheme.js +@@ -135,6 +135,51 @@ + lwtProperty: "sidebar_highlight_text", + }, + ], ++ ++ // Pulse: Force content styles to use the current css theme! ++ // Remember to add your keys to browser/themes/ThemeVariableMap.sys.mjs ++ [ ++ "--in-content-primary-button-background", ++ { ++ lwtProperty: "button_primary", ++ } ++ ], ++ [ ++ "--in-content-primary-button-background-hover", ++ { ++ lwtProperty: "button_primary_hover", ++ } ++ ], ++ [ ++ "--in-content-primary-button-background-active", ++ { ++ lwtProperty: "button_primary_active", ++ } ++ ], ++ [ ++ "--in-content-primary-button-text-color", ++ { ++ lwtProperty: "button_primary_color", ++ } ++ ], ++ [ ++ "--in-content-primary-button-text-color-hover", ++ { ++ lwtProperty: "button_primary_color", ++ } ++ ], ++ [ ++ "--newtab-primary-action-background", ++ { ++ lwtProperty: "button_primary", ++ } ++ ], ++ [ ++ "--newtab-primary-element-text-color", ++ { ++ lwtProperty: "button_primary_color", ++ } ++ ] + ]; + + /** diff --git a/src/browser/components/BrowserGlue-jsm.patch b/src/browser/components/BrowserGlue-jsm.patch index 8ef65748..4b4dca22 100644 --- a/src/browser/components/BrowserGlue-jsm.patch +++ b/src/browser/components/BrowserGlue-jsm.patch @@ -1,8 +1,24 @@ diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm -index cee46e6341f98441df743f4f5abccc380a67f74b..1102e374a8a93f2ae6142ff0bffaea71fdceb59c 100644 +index 43fbae6024d491379965937246c4900179d924eb..cbf5c219feeab92a3ecfcc991c605394ef29b8de 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm -@@ -4343,6 +4343,24 @@ BrowserGlue.prototype = { +@@ -562,13 +562,8 @@ let JSWINDOWACTORS = { + includeChrome: true, + allFrames: true, + matches: [ +- "about:home", +- "about:newtab", +- "about:welcome", +- "chrome://browser/content/syncedtabs/sidebar.xhtml", +- "chrome://browser/content/places/historySidebar.xhtml", +- "chrome://browser/content/places/bookmarksSidebar.xhtml", +- "about:firefoxview", ++ "about:*", ++ "chrome://*" + ], + }, + +@@ -4361,6 +4356,24 @@ BrowserGlue.prototype = { }, async _maybeShowDefaultBrowserPrompt() { @@ -27,7 +43,7 @@ index cee46e6341f98441df743f4f5abccc380a67f74b..1102e374a8a93f2ae6142ff0bffaea71 // Highest priority is the upgrade dialog, which can include a "primary // browser" request and is limited in various ways, e.g., major upgrades. const dialogVersion = 106; -@@ -4809,6 +4827,17 @@ BrowserGlue.prototype = { +@@ -4827,6 +4840,17 @@ BrowserGlue.prototype = { "nsIObserver", "nsISupportsWeakReference", ]), diff --git a/src/browser/themes/ThemeVariableMap-sys-mjs.patch b/src/browser/themes/ThemeVariableMap-sys-mjs.patch index 940a8be5..d367eb13 100644 --- a/src/browser/themes/ThemeVariableMap-sys-mjs.patch +++ b/src/browser/themes/ThemeVariableMap-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/themes/ThemeVariableMap.sys.mjs b/browser/themes/ThemeVariableMap.sys.mjs -index f2fd99193ddd0c24b7ad3ec953216973b162aaed..2d07c599152d8b0329f84a6cb626a1a40fdd241d 100644 +index f2fd99193ddd0c24b7ad3ec953216973b162aaed..1810528d3b1d7b5cd2fb3f45548c8377a2f5f165 100644 --- a/browser/themes/ThemeVariableMap.sys.mjs +++ b/browser/themes/ThemeVariableMap.sys.mjs @@ -126,7 +126,9 @@ export const ThemeVariableMap = [ @@ -13,3 +13,14 @@ index f2fd99193ddd0c24b7ad3ec953216973b162aaed..2d07c599152d8b0329f84a6cb626a1a4 processColor(rgbaChannels, element) { if (!rgbaChannels) { element.removeAttribute("lwt-sidebar"); +@@ -187,4 +189,10 @@ export const ThemeContentPropertyList = [ + "sidebar_highlight_text", + "sidebar_text", + "zap_gradient", ++ ++ // Pulse ++ "button_primary", ++ "button_primary_hover", ++ "button_primary_active", ++ "button_primary_color", + ]; diff --git a/src/browser/themes/addons/pulse/dark/manifest.json b/src/browser/themes/addons/pulse/dark/manifest.json index c8e8bc07..05194f1a 100644 --- a/src/browser/themes/addons/pulse/dark/manifest.json +++ b/src/browser/themes/addons/pulse/dark/manifest.json @@ -16,85 +16,85 @@ "theme": { "colors": { - "tab_background_text": "#BFBCC2", // Grey 300 - "tab_selected": "#1A171C", // Grey 900 - "tab_text": "#F2F1F4", // Grey 100 - - "icons": "#F2F1F4", // Grey 100 - "frame": "#26222A", // Grey 850 - "popup": "#26222A", // Grey 850 - "popup_text": "#F2F1F4", // Grey 100 + "tab_background_text": "rgb(191, 188, 194)", // Grey 300 + "tab_selected": "rgb(26, 23, 28)", // Grey 900 + "tab_text": "rgb(242, 241, 244)", // Grey 100 + + "icons": "rgb(242, 241, 244)", // Grey 100 + "frame": "rgb(38, 34, 42)", // Grey 850 + "popup": "rgb(38, 34, 42)", // Grey 850 + "popup_text": "rgb(242, 241, 244)", // Grey 100 "popup_border": "transparent", "popup_highlight": "rgb(43,42,51)", "tab_line": "transparent", - "toolbar": "#1A171C", // Grey 900 + "toolbar": "rgb(26, 23, 28)", // Grey 900 "toolbar_top_separator": "transparent", - "toolbar_bottom_separator": "#1A171C", // Grey 900 - "toolbar_field": "#26222A", // Grey 850 + "toolbar_bottom_separator": "rgb(26, 23, 28)", // Grey 900 + "toolbar_field": "rgb(38, 34, 42)", // Grey 850 "toolbar_field_border": "transparent", - "toolbar_field_text": "#F2F1F4", // Grey 100 - "toolbar_field_focus": "#332F37", // Grey 800 - "toolbar_text": "#BFBCC2", // Grey 300 + "toolbar_field_text": "rgb(242, 241, 244)", // Grey 100 + "toolbar_field_focus": "rgb(51, 47, 55)", // Grey 800 + "toolbar_text": "rgb(191, 188, 194)", // Grey 300 - "ntp_background": "#26222A", // Grey 850 - "ntp_card_background": "#332F37", // Grey 800 - "ntp_text": "#F2F1F4", // Grey 100 + "ntp_background": "rgb(38, 34, 42)", // Grey 850 + "ntp_card_background": "rgb(51, 47, 55)", // Grey 800 + "ntp_text": "rgb(242, 241, 244)", // Grey 100 - "sidebar_text": "#F2F1F4", // Grey 100 + "sidebar_text": "rgb(242, 241, 244)", // Grey 100 "sidebar_border": "transparent", - "button": "#332F37", // Grey 800 - "button_hover": "#4D4950", // Grey 700 - "button_active": "#656369", // Grey 600 - "button_primary": "#8240BF33", // Primary 500, 20% - "button_primary_hover": "#8240BF4D", // Primary 500, 30% - "button_primary_active": "#8240BF65", // Primary 500, 40% - "button_primary_color": "#DAB6FB", // Primary 200 + "button": "rgb(51, 47, 55)", // Grey 800 + "button_hover": "rgb(77, 73, 80)", // Grey 700 + "button_active": "rgb(101, 99, 105)", // Grey 600 + "button_primary": "rgba(130, 64, 181, 0.20)", // Primary 500, 20% + "button_primary_hover": "rgb(130, 64, 191, 0.30)", // Primary 500, 30% + "button_primary_active": "rgb(130, 64, 191, 0.40)", // Primary 500, 40% + "button_primary_color": "rgb(218, 182, 251)", // Primary 200 "error_text_color": "rgb(255, 154, 162)", // TODO: We need red / error colors - "input_background": "#332F37", // Grey 800 - "input_color": "#F2F1F4", // Grey 100 + "input_background": "rgb(51, 47, 55)", // Grey 800 + "input_color": "rgb(242, 241, 244)", // Grey 100 "input_border": "transparent", "input_border_error": "rgb(255, 132, 138)", // TODO: We need red / error colors - "autocomplete_popup_separator": "#4D4950", // Grey 700 + "autocomplete_popup_separator": "rgb(77, 73, 80)", // Grey 700 "appmenu_update_icon_color": "#54FFBD", // TODO "appmenu_info_icon_color": "#80EBFF", // TODO "tab_icon_overlay_stroke": "rgb(66,65,77)", // TODO: What even are these? "tab_icon_overlay_fill": "rgb(251,251,254)", // TODO: What even are these? - "pulse_grey_900": "#1A171C", - "pulse_grey_850": "#26222A", - "pulse_grey_800": "#332F37", - "pulse_grey_700": "#4D4950", - "pulse_grey_600": "#656369", - "pulse_grey_500": "#807D82", - "pulse_grey_400": "#A19EA3", - "pulse_grey_300": "#BFBCC2", - "pulse_grey_200": "#D9D6DC", - "pulse_grey_100": "#F2F1F4", - - "pulse_primary_900": "#1B0033", - "pulse_primary_800": "#34085E", - "pulse_primary_700": "#4E1386", - "pulse_primary_600": "#6829A3", - "pulse_primary_500": "#8240BF", - "pulse_primary_400": "#A363DE", - "pulse_primary_300": "#A363DE", - "pulse_primary_200": "#DAB6FB", - "pulse_primary_100": "#F3E6FF", - - "pulse_secondary_900": "#350439", - "pulse_secondary_800": "#500B56", - "pulse_secondary_700": "#791282", - "pulse_secondary_600": "#A429AE", - "pulse_secondary_500": "#C732D3", - "pulse_secondary_400": "#E54AE8", - "pulse_secondary_300": "#FC79FF", - "pulse_secondary_200": "#FD9EFF", - "pulse_secondary_100": "#F9D8FC" + "pulse_grey_900": "rgb(26, 23, 28)", + "pulse_grey_850": "rgb(38, 34, 42)", + "pulse_grey_800": "rgb(51, 47, 55)", + "pulse_grey_700": "rgb(77, 73, 80)", + "pulse_grey_600": "rgb(101, 99, 105)", + "pulse_grey_500": "rgb(128, 125, 130)", + "pulse_grey_400": "rgb(161, 158, 163)", + "pulse_grey_300": "rgb(191, 188, 194)", + "pulse_grey_200": "rgb(217, 214, 220)", + "pulse_grey_100": "rgb(242, 241, 244)", + + "pulse_primary_900": "rgb(27, 0, 51)", + "pulse_primary_800": "rgb(52, 8, 94)", + "pulse_primary_700": "rgb(78, 19, 134)", + "pulse_primary_600": "rgb(104, 41, 163)", + "pulse_primary_500": "rgb(130, 64, 191)", + "pulse_primary_400": "rgb(163, 99, 222)", + "pulse_primary_300": "rgb(163, 99, 222)", + "pulse_primary_200": "rgb(218, 182, 251)", + "pulse_primary_100": "rgb(243, 230, 255)", + + "pulse_secondary_900": "rgb(53, 4, 57)", + "pulse_secondary_800": "rgb(80, 11, 86)", + "pulse_secondary_700": "rgb(121, 18, 130)", + "pulse_secondary_600": "rgb(164, 41, 174)", + "pulse_secondary_500": "rgb(199, 50, 211)", + "pulse_secondary_400": "rgb(229, 74, 232)", + "pulse_secondary_300": "rgb(252, 121, 255)", + "pulse_secondary_200": "rgb(253, 158, 255)", + "pulse_secondary_100": "rgb(249, 216, 252)" }, "properties": { "arrowpanel_border_radius": "16px", From 428d1eebe27a37b23a3c09195f1ceff12ace95ef Mon Sep 17 00:00:00 2001 From: trickypr Date: Sat, 19 Nov 2022 19:29:07 +1100 Subject: [PATCH 05/14] =?UTF-8?q?=F0=9F=92=84=20Force=20colors=20for=20`ab?= =?UTF-8?q?out:`=20pages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/content/aboutRobots-xhtml.patch | 12 ++++ .../base/content/contentTheme-js.patch | 60 ++++++++++++++++++- .../content/aboutLogins-html.patch | 12 ++++ .../aboutLoginsImportReport-html.patch | 12 ++++ .../content/aboutPolicies-html.patch | 12 ++++ .../preferences/preferences-xhtml.patch | 12 ++++ .../content/protections-html.patch | 12 ++++ .../content/aboutSessionRestore-xhtml.patch | 12 ++++ .../content/aboutUnloads-html.patch | 12 ++++ .../client/aboutdebugging/index-html.patch | 12 ++++ .../aboutprofiling/index-xhtml.patch | 12 ++++ .../client/performance-new/index-xhtml.patch | 12 ++++ .../client/themes/aboutprofiling-css.patch | 15 +++++ .../protocol/about/nsAboutCache-cpp.patch | 12 ++++ .../content/aboutconfig-html.patch | 12 ++++ .../content/aboutMemory-xhtml.patch | 12 ++++ .../content/aboutProcesses-html.patch | 12 ++++ .../certviewer/content/certviewer-html.patch | 13 ++++ .../about-studies/about-studies-html.patch | 18 ++++++ src/toolkit/content/aboutAbout-html.patch | 13 ++++ src/toolkit/content/aboutGlean-html.patch | 12 ++++ .../content/aboutNetworking-html.patch | 12 ++++ src/toolkit/content/aboutProfiles-xhtml.patch | 12 ++++ .../content/aboutRights-unbranded-xhtml.patch | 12 ++++ src/toolkit/content/aboutRights-xhtml.patch | 12 ++++ src/toolkit/content/aboutSupport-xhtml.patch | 12 ++++ .../content/aboutTelemetry-xhtml.patch | 12 ++++ .../content/aboutUrlClassifier-xhtml.patch | 12 ++++ .../aboutwebrtc/aboutWebrtc-html.patch | 12 ++++ src/toolkit/content/buildconfig-html.patch | 20 +++++++ src/toolkit/content/license-html.patch | 19 ++++++ src/toolkit/content/plugins-css.patch | 13 ++++ src/toolkit/content/plugins-html.patch | 12 ++++ .../crashreporter/content/crashes-html.patch | 12 ++++ .../extensions/content/aboutaddons-html.patch | 13 ++++ .../shared/in-content/common-shared-css.patch | 22 +++++++ 36 files changed, 515 insertions(+), 3 deletions(-) create mode 100644 src/browser/base/content/aboutRobots-xhtml.patch create mode 100644 src/browser/components/aboutlogins/content/aboutLogins-html.patch create mode 100644 src/browser/components/aboutlogins/content/aboutLoginsImportReport-html.patch create mode 100644 src/browser/components/enterprisepolicies/content/aboutPolicies-html.patch create mode 100644 src/browser/components/preferences/preferences-xhtml.patch create mode 100644 src/browser/components/protections/content/protections-html.patch create mode 100644 src/browser/components/sessionstore/content/aboutSessionRestore-xhtml.patch create mode 100644 src/browser/components/tabunloader/content/aboutUnloads-html.patch create mode 100644 src/devtools/client/aboutdebugging/index-html.patch create mode 100644 src/devtools/client/performance-new/aboutprofiling/index-xhtml.patch create mode 100644 src/devtools/client/performance-new/index-xhtml.patch create mode 100644 src/devtools/client/themes/aboutprofiling-css.patch create mode 100644 src/netwerk/protocol/about/nsAboutCache-cpp.patch create mode 100644 src/toolkit/components/aboutconfig/content/aboutconfig-html.patch create mode 100644 src/toolkit/components/aboutmemory/content/aboutMemory-xhtml.patch create mode 100644 src/toolkit/components/aboutprocesses/content/aboutProcesses-html.patch create mode 100644 src/toolkit/components/certviewer/content/certviewer-html.patch create mode 100644 src/toolkit/components/normandy/content/about-studies/about-studies-html.patch create mode 100644 src/toolkit/content/aboutAbout-html.patch create mode 100644 src/toolkit/content/aboutGlean-html.patch create mode 100644 src/toolkit/content/aboutNetworking-html.patch create mode 100644 src/toolkit/content/aboutProfiles-xhtml.patch create mode 100644 src/toolkit/content/aboutRights-unbranded-xhtml.patch create mode 100644 src/toolkit/content/aboutRights-xhtml.patch create mode 100644 src/toolkit/content/aboutSupport-xhtml.patch create mode 100644 src/toolkit/content/aboutTelemetry-xhtml.patch create mode 100644 src/toolkit/content/aboutUrlClassifier-xhtml.patch create mode 100644 src/toolkit/content/aboutwebrtc/aboutWebrtc-html.patch create mode 100644 src/toolkit/content/buildconfig-html.patch create mode 100644 src/toolkit/content/license-html.patch create mode 100644 src/toolkit/content/plugins-css.patch create mode 100644 src/toolkit/content/plugins-html.patch create mode 100644 src/toolkit/crashreporter/content/crashes-html.patch create mode 100644 src/toolkit/mozapps/extensions/content/aboutaddons-html.patch create mode 100644 src/toolkit/themes/shared/in-content/common-shared-css.patch diff --git a/src/browser/base/content/aboutRobots-xhtml.patch b/src/browser/base/content/aboutRobots-xhtml.patch new file mode 100644 index 00000000..466c1549 --- /dev/null +++ b/src/browser/base/content/aboutRobots-xhtml.patch @@ -0,0 +1,12 @@ +diff --git a/browser/base/content/aboutRobots.xhtml b/browser/base/content/aboutRobots.xhtml +index 767b31067d6d82c1ddfdbf633ececc459c6480ae..21d09dfb758477930096b6c1b070642464a09e69 100644 +--- a/browser/base/content/aboutRobots.xhtml ++++ b/browser/base/content/aboutRobots.xhtml +@@ -14,6 +14,7 @@ + + + ++ + + + diff --git a/src/browser/base/content/contentTheme-js.patch b/src/browser/base/content/contentTheme-js.patch index 4d817739..e67df583 100644 --- a/src/browser/base/content/contentTheme-js.patch +++ b/src/browser/base/content/contentTheme-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/contentTheme.js b/browser/base/content/contentTheme.js -index d634a17c2633dc2ead40082c71622fe1b7a491a2..2d122f05cc5ce74e43d73a218ad5636deabc7296 100644 +index d634a17c2633dc2ead40082c71622fe1b7a491a2..042c8120729f6c35ad0b49b91443a88ec6ed4fe8 100644 --- a/browser/base/content/contentTheme.js +++ b/browser/base/content/contentTheme.js -@@ -135,6 +135,51 @@ +@@ -135,6 +135,105 @@ lwtProperty: "sidebar_highlight_text", }, ], @@ -16,24 +16,52 @@ index d634a17c2633dc2ead40082c71622fe1b7a491a2..2d122f05cc5ce74e43d73a218ad5636d + } + ], + [ ++ "--primary-button-background-color", ++ { ++ lwtProperty: "button_primary", ++ } ++ ], ++ ++ [ + "--in-content-primary-button-background-hover", + { + lwtProperty: "button_primary_hover", + } + ], + [ ++ "--primary-button-hover-background-color", ++ { ++ lwtProperty: "button_primary_hover", ++ } ++ ], ++ ++ [ + "--in-content-primary-button-background-active", + { + lwtProperty: "button_primary_active", + } + ], + [ ++ "--primary-button-active-background-color", ++ { ++ lwtProperty: "button_primary_active", ++ } ++ ], ++ ++ [ + "--in-content-primary-button-text-color", + { + lwtProperty: "button_primary_color", + } + ], + [ ++ "--primary-button-color", ++ { ++ lwtProperty: "button_primary_color", ++ } ++ ], ++ ++ [ + "--in-content-primary-button-text-color-hover", + { + lwtProperty: "button_primary_color", @@ -50,7 +78,33 @@ index d634a17c2633dc2ead40082c71622fe1b7a491a2..2d122f05cc5ce74e43d73a218ad5636d + { + lwtProperty: "button_primary_color", + } -+ ] ++ ], ++ ++ [ ++ "--in-content-page-background", ++ { ++ lwtProperty: "ntp_background", ++ } ++ ], ++ [ ++ "--bg-color", ++ { ++ lwtProperty: "ntp_background", ++ } ++ ], ++ ++ [ ++ "--card-background-color", ++ { ++ lwtProperty: "ntp_card_background", ++ } ++ ], ++ [ ++ "--in-content-box-background", ++ { ++ lwtProperty: "ntp_card_background", ++ } ++ ], ]; /** diff --git a/src/browser/components/aboutlogins/content/aboutLogins-html.patch b/src/browser/components/aboutlogins/content/aboutLogins-html.patch new file mode 100644 index 00000000..ba78ed2b --- /dev/null +++ b/src/browser/components/aboutlogins/content/aboutLogins-html.patch @@ -0,0 +1,12 @@ +diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html +index d53bc804177d414928dae9a2cb8e42a0a0dae9ac..b5190e9d556ab8b40840214fac15eed17a5fae25 100644 +--- a/browser/components/aboutlogins/content/aboutLogins.html ++++ b/browser/components/aboutlogins/content/aboutLogins.html +@@ -31,6 +31,7 @@ + + + ++ + + +
diff --git a/src/browser/components/aboutlogins/content/aboutLoginsImportReport-html.patch b/src/browser/components/aboutlogins/content/aboutLoginsImportReport-html.patch new file mode 100644 index 00000000..e5ef2c9a --- /dev/null +++ b/src/browser/components/aboutlogins/content/aboutLoginsImportReport-html.patch @@ -0,0 +1,12 @@ +diff --git a/browser/components/aboutlogins/content/aboutLoginsImportReport.html b/browser/components/aboutlogins/content/aboutLoginsImportReport.html +index c8a768c7d867464771b2a37e3fb7361e17370a59..2d770c8ad36febd9fc02dadca4ba88caa31c77db 100644 +--- a/browser/components/aboutlogins/content/aboutLoginsImportReport.html ++++ b/browser/components/aboutlogins/content/aboutLoginsImportReport.html +@@ -19,6 +19,7 @@ + + + ++ + + +
diff --git a/src/browser/components/enterprisepolicies/content/aboutPolicies-html.patch b/src/browser/components/enterprisepolicies/content/aboutPolicies-html.patch new file mode 100644 index 00000000..28da5367 --- /dev/null +++ b/src/browser/components/enterprisepolicies/content/aboutPolicies-html.patch @@ -0,0 +1,12 @@ +diff --git a/browser/components/enterprisepolicies/content/aboutPolicies.html b/browser/components/enterprisepolicies/content/aboutPolicies.html +index 83ae157605f1009588b1d6c87e5eff26a2e5d594..d470b3ab00d87bb43e088290693b7d74d4c354ef 100644 +--- a/browser/components/enterprisepolicies/content/aboutPolicies.html ++++ b/browser/components/enterprisepolicies/content/aboutPolicies.html +@@ -18,6 +18,7 @@ + + + ++ + + +
diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch new file mode 100644 index 00000000..788b6451 --- /dev/null +++ b/src/browser/components/preferences/preferences-xhtml.patch @@ -0,0 +1,12 @@ +diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml +index 9921e0307b4af54bbb6fa4d85e1a5d1d0fbf07a7..2c5db086f1320d2e334ed2c1988f515dc5cace3c 100644 +--- a/browser/components/preferences/preferences.xhtml ++++ b/browser/components/preferences/preferences.xhtml +@@ -63,6 +63,7 @@ + + + +