domi
/
foxgirl-common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

porting old foxgirl stuff

master
Dominika Liberda 2021-10-12 00:51:43 +02:00
parent 6defdd7054
commit cbac36ec59
19 changed files with 648 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

554
patches/css.patch Normal file
View File

@ -0,0 +1,554 @@
diff --git a/browser/components/newtab/content-src/styles/_icons.scss b/browser/components/newtab/content-src/styles/_icons.scss
--- a/browser/components/newtab/content-src/styles/_icons.scss
+++ b/browser/components/newtab/content-src/styles/_icons.scss
@@ -31,11 +31,11 @@
// icon images
&.icon-bookmark-added {
- background-image: url('chrome://browser/skin/bookmark.svg');
+ background-image: url('chrome://browser/skin/starred48.png');
}
&.icon-bookmark-hollow {
- background-image: url('chrome://browser/skin/bookmark-hollow.svg');
+ background-image: url('chrome://browser/skin/unstarred48.png');
}
&.icon-clear-input {
diff --git a/browser/components/newtab/css/activity-stream-linux.css b/browser/components/newtab/css/activity-stream-linux.css
--- a/browser/components/newtab/css/activity-stream-linux.css
+++ b/browser/components/newtab/css/activity-stream-linux.css
@@ -102,10 +102,10 @@ body[lwt-newtab-brighttext] {
fill: var(--newtab-text-primary-color);
}
.icon.icon-bookmark-added {
- background-image: url("chrome://browser/skin/bookmark.svg");
+ background-image: url("chrome://browser/skin/starred48.png");
}
.icon.icon-bookmark-hollow {
- background-image: url("chrome://browser/skin/bookmark-hollow.svg");
+ background-image: url("chrome://browser/skin/unstarred48.png");
}
.icon.icon-clear-input {
background-image: url("chrome://activity-stream/content/data/content/assets/glyph-cancel-16.svg");
@@ -3742,7 +3742,7 @@ main.has-snippet {
margin-inline-end: 6px;
}
.story-footer .status-message .story-badge-icon.icon-bookmark-removed {
- background-image: url("chrome://activity-stream/content/data/content/assets/icon-removed-bookmark.svg");
+ background-image: url("chrome://activity-stream/content/data/content/assets/icon-removed-starred48.png");
}
.story-footer .status-message .story-context-label {
color: var(--newtab-text-secondary-color);
diff --git a/browser/components/places/content/bookmarkProperties.js b/browser/components/places/content/bookmarkProperties.js
--- a/browser/components/places/content/bookmarkProperties.js
+++ b/browser/components/places/content/bookmarkProperties.js
@@ -267,7 +267,7 @@ var BookmarkPropertiesPanel = {
},
_getIconUrl() {
- let url = "chrome://browser/skin/bookmark-hollow.svg";
+ let url = "chrome://browser/skin/unstarred48.png";
if (this._action === ACTION_EDIT && this._itemType === BOOKMARK_ITEM) {
url = window.arguments[0]?.node?.icon;
diff --git a/browser/components/protections/content/protections.css b/browser/components/protections/content/protections.css
--- a/browser/components/protections/content/protections.css
+++ b/browser/components/protections/content/protections.css
@@ -265,7 +265,7 @@ a.hidden,
height: var(--exit-icon-size);
top: var(--exit-icon-position);
inset-inline-end: var(--exit-icon-position);
- background-image: url(chrome://global/skin/icons/close.svg);
+ background-image: url(chrome://browser/skin/tab-close.png);
background-size: calc(var(--exit-icon-size) - 2px);
background-color: transparent;
background-position: center;
diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
--- a/browser/components/urlbar/UrlbarInput.jsm
+++ b/browser/components/urlbar/UrlbarInput.jsm
@@ -1914,13 +1914,21 @@ class UrlbarInput {
"--urlbar-container-height",
px(getBoundsWithoutFlushing(this.textbox.parentNode).height)
);
+ //this.textbox.style.setProperty(
+ // "--urlbar-height",
+ // px(getBoundsWithoutFlushing(this.textbox).height)
+ //);
+ //this.textbox.style.setProperty(
+ // "--urlbar-toolbar-height",
+ // px(getBoundsWithoutFlushing(this._toolbar).height)
+ //);
this.textbox.style.setProperty(
"--urlbar-height",
- px(getBoundsWithoutFlushing(this.textbox).height)
+ 20
);
this.textbox.style.setProperty(
"--urlbar-toolbar-height",
- px(getBoundsWithoutFlushing(this._toolbar).height)
+ 26
);
this.setAttribute("breakout", "true");
diff --git a/browser/components/urlbar/UrlbarUtils.jsm b/browser/components/urlbar/UrlbarUtils.jsm
--- a/browser/components/urlbar/UrlbarUtils.jsm
+++ b/browser/components/urlbar/UrlbarUtils.jsm
@@ -230,7 +230,7 @@ var UrlbarUtils = {
{
source: UrlbarUtils.RESULT_SOURCE.BOOKMARKS,
restrict: UrlbarTokenizer.RESTRICT.BOOKMARK,
- icon: "chrome://browser/skin/bookmark.svg",
+ icon: "chrome://browser/skin/starred48.png",
pref: "shortcuts.bookmarks",
},
{
diff --git a/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js b/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js
--- a/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js
+++ b/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js
@@ -42,7 +42,7 @@ const RESULT_DATA_BY_TYPE = {
function getSourceIcon(source) {
switch (source) {
case UrlbarUtils.RESULT_SOURCE.BOOKMARKS:
- return "chrome://browser/skin/bookmark.svg";
+ return "chrome://browser/skin/starred48.png";
case UrlbarUtils.RESULT_SOURCE.HISTORY:
return "chrome://browser/skin/history.svg";
case UrlbarUtils.RESULT_SOURCE.TABS:
diff --git a/browser/components/urlbar/tests/browser/browser_searchMode_localOneOffs_actionText.js b/browser/components/urlbar/tests/browser/browser_searchMode_localOneOffs_actionText.js
--- a/browser/components/urlbar/tests/browser/browser_searchMode_localOneOffs_actionText.js
+++ b/browser/components/urlbar/tests/browser/browser_searchMode_localOneOffs_actionText.js
@@ -111,7 +111,7 @@ add_task(async function localOneOff() {
);
Assert.equal(
result.image,
- "chrome://browser/skin/bookmark.svg",
+ "chrome://browser/skin/starred48.png",
"Check the heuristic icon"
);
@@ -252,7 +252,7 @@ add_task(async function localOneOff_with
);
Assert.equal(
result.image,
- "chrome://browser/skin/bookmark.svg",
+ "chrome://browser/skin/starred48.png",
"Check the heuristic icon"
);
diff --git a/browser/themes/shared/browser.inc.css b/browser/themes/shared/browser.inc.css
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -57,10 +56,6 @@
--urlbar-box-text-color: inherit;
--urlbar-min-height: 32px;
--urlbar-icon-fill-opacity: 0.9;
- --urlbar-icon-padding: 6px; /* (32px - 2px border - 2px padding - 16px icon) / 2 */
- /* This should be used for icons and chiclets inside the input field. It makes
- the gap around them more uniform when they are close to the field edges */
- --urlbar-icon-border-radius: calc(var(--toolbarbutton-border-radius) - 1px);
--urlbar-popup-url-color: -moz-nativehyperlinktext;
--lwt-additional-images: none;
@@ -490,7 +485,7 @@ menupopup::part(drop-indicator) {
margin: 3px;
border: none;
border-radius: 2px;
- background-image: url(chrome://global/skin/icons/close.svg);
+ background-image: url(chrome://browser/skin/tab-close.png);
background-color: transparent;
background-repeat: no-repeat;
background-position: center;
@@ -617,7 +612,7 @@ menupopup::part(drop-indicator) {
#cfr-notification-footer-filled-stars,
#cfr-notification-footer-empty-stars {
-moz-context-properties: fill, fill-opacity;
- background-image: url(chrome://browser/skin/bookmark.svg);
+ background-image: url(chrome://browser/skin/starred48.png);
fill: currentColor;
fill-opacity: 0.7;
height: 16px;
@@ -826,3 +821,8 @@ popupnotificationcontent {
#tab-notification-deck {
display: block;
}
+
+#nav-bar, #nav-bar-customization-target {
+ height: 36px !important;
+}
+
diff --git a/browser/themes/shared/contextmenu.inc.css b/browser/themes/shared/contextmenu.inc.css
--- a/browser/themes/shared/contextmenu.inc.css
+++ b/browser/themes/shared/contextmenu.inc.css
@@ -37,11 +37,11 @@
}
#context-bookmarkpage {
- list-style-image: url("chrome://browser/skin/bookmark-hollow.svg");
+ list-style-image: url("chrome://browser/skin/unstarred48.png");
}
#context-bookmarkpage[starred=true] {
- list-style-image: url("chrome://browser/skin/bookmark.svg");
+ list-style-image: url("chrome://browser/skin/starred48.png");
}
#context-back:-moz-locale-dir(rtl),
diff --git a/browser/themes/shared/controlcenter/panel.inc.css b/browser/themes/shared/controlcenter/panel.inc.css
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -721,7 +721,7 @@ description#identity-popup-content-verif
margin: 0;
width: 12px;
height: 12px;
- list-style-image: url(chrome://global/skin/icons/close.svg);
+ list-style-image: url(chrome://browser/skin/tab-close.png);
-moz-context-properties: fill;
fill: currentColor;
}
diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css
--- a/browser/themes/shared/identity-block/identity-block.inc.css
+++ b/browser/themes/shared/identity-block/identity-block.inc.css
@@ -279,3 +279,6 @@
#urlbar-input-container[pageproxystate="invalid"] > #tracking-protection-icon-container {
visibility: collapse;
}
+.verifiedDomain {
+ margin 0 4px !important;
+}
diff --git a/browser/themes/shared/places/tree-icons.css b/browser/themes/shared/places/tree-icons.css
--- a/browser/themes/shared/places/tree-icons.css
+++ b/browser/themes/shared/places/tree-icons.css
@@ -41,7 +41,7 @@ treechildren::-moz-tree-image(query) {
}
treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
- list-style-image: url("chrome://browser/skin/bookmark.svg");
+ list-style-image: url("chrome://browser/skin/starred48.png");
}
treechildren::-moz-tree-image(query, OrganizerQuery_downloads__v) {
diff --git a/browser/themes/shared/preferences/preferences.inc.css b/browser/themes/shared/preferences/preferences.inc.css
--- a/browser/themes/shared/preferences/preferences.inc.css
+++ b/browser/themes/shared/preferences/preferences.inc.css
@@ -601,8 +601,8 @@ richlistitem[selected] .actionsMenu:focu
background-color: transparent; /* override common.css, but keep hover/active states */
min-width: 0;
min-height: auto;
- width: 20px;
- height: 20px;
+ width: 16px !important;
+ height: 16px !important;
padding: 0;
margin-inline: 0 8px;
}
@@ -790,7 +790,7 @@ dialog > .sync-engines-list + hbox {
.sync-engine-bookmarks .checkbox-icon,
.sync-engine-bookmarks.sync-engine-image {
- list-style-image: url("chrome://browser/skin/bookmark.svg");
+ list-style-image: url("chrome://browser/skin/starred48.png");
}
.sync-engine-history .checkbox-icon,
diff --git a/browser/themes/shared/sidebar.inc.css b/browser/themes/shared/sidebar.inc.css
--- a/browser/themes/shared/sidebar.inc.css
+++ b/browser/themes/shared/sidebar.inc.css
@@ -106,7 +106,7 @@ toolbarseparator + #sidebar-extensions-s
}
#sidebar-box[sidebarcommand="viewBookmarksSidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
- list-style-image: url(chrome://browser/skin/bookmark.svg);
+ list-style-image: url(chrome://browser/skin/starred48.png);
-moz-context-properties: fill;
fill: currentColor;
opacity: 0.8;
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -44,6 +44,7 @@
#tabbrowser-tabs {
--tab-min-width: 76px;
--tab-loading-fill: #0A84FF;
+ --tab-min-height: 24px !important;
}
#tabbrowser-tabpanels {
@@ -443,10 +444,11 @@
.tab-close-button {
-moz-context-properties: fill, fill-opacity;
margin-inline-end: calc(var(--inline-tab-padding) / -2);
- width: 24px;
- height: 24px;
- padding: 7px;
+ width: 16px !important;
+ height: 16px !important;
+ padding: 0px;
border-radius: var(--tab-border-radius);
+ list-style-image: url("chrome://browser/skin/tab-close.png");
}
/* The following rulesets allow showing more of the tab title */
@@ -776,3 +778,53 @@
.all-tabs-item > toolbarbutton {
margin-inline-start: 0;
}
+
+
+
+tab {
+ font-size: 16px !important;
+ font-family: sans-serif !important;
+}
+
+.tab-background {
+ /*background: #eeeeee;*/
+ border-radius: 0 !important;
+ margin-bottom: 0px !important;
+ box-shadow: 0 0 2px 2px rgba(0,0,0,0.1) !important;
+ border: 1px solid rgba(0,0,0,.5) !important;
+ border-bottom-width: 0px !important;
+}
+
+#tabbrowser-tabs {
+ --tab-min-height: 24px !important;
+}
+#scrollbutton-up,
+#scrollbutton-down {
+ border-top-width: 0 !important;
+ border-bottom-width: 0 !important;
+}
+
+.tabbrowser-tab[selected] .tab-background {
+ background: #75cc00 !important;
+}
+
+.tabbrowser-tab[selected] .tab-label {
+ color: black !important;
+ font-weight: bold !important;
+}
+
+#TabsToolbar {
+ border-bottom: 2px solid #000000 !important;
+ height: 24px !important;
+}
+/*
+.tabbrowser-tab:hover .tab-background:not([selected]) {
+ background: #75cc00 !important;
+}*/
+
+.tabbrowser-tab:not([selected]) > .tab-stack > .tab-content > .tab-label-container > .tab-close-button {
+ list-style-image: url("chrome://browser/skin/tab-close_inactive.png") !important;
+}
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-label-container > .tab-close-button:hover {
+ list-style-image: url("chrome://browser/skin/tab-close_hover.png") !important;
+}
diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -56,11 +56,11 @@ toolbar[brighttext]:-moz-lwtheme {
}
#back-button {
- list-style-image: url("chrome://browser/skin/back.svg");
+ list-style-image: url("chrome://browser/skin/back.png");
}
#forward-button {
- list-style-image: url("chrome://browser/skin/forward.svg");
+ list-style-image: url("chrome://browser/skin/forward.png");
}
/* The animations for the reload-button and stop-button are disabled
@@ -120,10 +120,6 @@ toolbar[brighttext]:-moz-lwtheme {
position: relative;
}
-#nav-bar-customization-target :where(#reload-button, #stop-button) > .toolbarbutton-icon {
- padding: calc(var(--toolbarbutton-inner-padding) + 1px) var(--toolbarbutton-inner-padding) calc(var(--toolbarbutton-inner-padding) - 1px ) !important; /* The animation is 18px but the other icons are 16px, lower it by 1px so it is vertically centered */
-}
-
#reload-button > .toolbarbutton-animatable-box,
#stop-button > .toolbarbutton-animatable-box {
top: calc(50% - 9px); /* Vertically center the 20px tall animatable image, which is 1px higher than other icons */
@@ -134,25 +130,6 @@ toolbar[brighttext]:-moz-lwtheme {
height: 20px; /* Height of each frame within the SVG sprite */
}
-#stop-reload-button[animate] > #reload-button > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
- background-image: url("chrome://browser/skin/stop-to-reload.svg");
- /*
- transition from stop icon to reload icon
- pause at frame 0 for 6 ticks,
- pause at frame 15 for 16 ticks
- total 35 steps*/
- --anim-frames: 14;
- --anim-steps: calc(var(--anim-frames) + 21); /* Add steps for doing the pause at the start and end */
- width: calc(20px * (var(--anim-frames) + 1));
- height: 20px;
-
- /* initial state for animation */
- transform: translateX(0);
-}
-
-#stop-reload-button[animate] > #reload-button:not([displaystop]) > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
- animation-name: stop-to-reload;
-}
#reload-button:not([displaystop]) > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
animation-duration: calc(var(--anim-steps) * 16.667ms);
@@ -193,15 +170,16 @@ toolbar[brighttext]:-moz-lwtheme {
}
#reload-button {
- list-style-image: url("chrome://global/skin/icons/reload.svg");
+ list-style-image: url("chrome://browser/skin/refresh.png");
}
#stop-button {
- list-style-image: url("chrome://global/skin/icons/close.svg");
+ list-style-image: url("chrome://browser/skin/stop.png");
+ display: block !important;
}
#home-button {
- list-style-image: url("chrome://browser/skin/home.svg");
+ list-style-image: url("chrome://browser/skin/home.png");
}
#bookmarks-toolbar-button,
diff --git a/browser/themes/shared/toolbarbuttons.inc.css b/browser/themes/shared/toolbarbuttons.inc.css
--- a/browser/themes/shared/toolbarbuttons.inc.css
+++ b/browser/themes/shared/toolbarbuttons.inc.css
@@ -54,6 +54,10 @@
.toolbarbutton-1 > .toolbarbutton-icon {
margin-inline-end: 0 !important;
+ height: 24px !important;
+ width: 24px !important;
+ padding: 0 !important;
+ margin: 0 4px !important;
}
.toolbarbutton-1 > .toolbarbutton-icon,
diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
--- a/browser/themes/shared/urlbar-searchbar.inc.css
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
@@ -43,14 +43,14 @@
background-color: var(--toolbar-field-background-color);
background-clip: border-box;
border: 1px solid var(--toolbar-field-border-color);
- border-radius: var(--toolbarbutton-border-radius);
+ /*border-radius: var(--toolbarbutton-border-radius);*/
}
-
+/*
#urlbar-input-container,
#searchbar {
border-radius: var(--toolbarbutton-border-radius);
overflow: clip;
-}
+}*/
#urlbar-input,
#urlbar-scheme,
@@ -66,13 +66,13 @@
#urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background,
#searchbar:focus-within {
- outline: var(--focus-outline);
- outline-offset: calc(var(--focus-outline-width) * -1);
+ /*outline: var(--focus-outline);
+ outline-offset: calc(var(--focus-outline-width) * -1);*/
/* We used --focus-outline above to inherit its width and style properties,
but we still want to use the theme's border-color.
--toolbar-field-focus-border-color is set equal to --focus-outline-color
on :root, but LWT themes can override this value. */
- outline-color: var(--toolbar-field-focus-border-color);
+ /*outline-color: var(--toolbar-field-focus-border-color);*/
border-color: transparent;
}
@@ -186,13 +186,14 @@
position: absolute;
width: 100%;
height: var(--urlbar-height);
- top: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
+ /*top: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);*/
+ top: 2px;
left: 0;
}
#urlbar[breakout] > #urlbar-input-container {
width: 100%;
- height: 100%;
+ height: 32px !important;
}
#urlbar:not([open]) > .urlbarView,
@@ -277,7 +278,7 @@
color: var(--urlbar-box-text-color);
margin-inline-end: 8px;
align-items: center;
- border-radius: var(--urlbar-icon-border-radius);
+/* border-radius: var(--urlbar-icon-border-radius);*/
padding-inline: 8px 6px;
}
@@ -336,11 +337,15 @@
#pageAction-panel-bookmark,
#star-button {
- list-style-image: url("chrome://browser/skin/bookmark-hollow.svg");
+ list-style-image: url("chrome://browser/skin/unstarred48.png");
+ width: 28px !important;
+ height: 28px !important;
}
#pageAction-panel-bookmark[starred],
#star-button[starred] {
- list-style-image: url("chrome://browser/skin/bookmark.svg");
+ list-style-image: url("chrome://browser/skin/starred48.png");
+ width: 28px !important;
+ height: 28px !important;
}
#star-button[starred] {
fill-opacity: 1;
@@ -383,7 +388,7 @@
.search-go-button {
width: calc(var(--urlbar-min-height) - 2px /* border */ - 2 * var(--urlbar-container-padding));
height: calc(var(--urlbar-min-height) - 2px /* border */ - 2 * var(--urlbar-container-padding));
- border-radius: var(--urlbar-icon-border-radius);
+/* border-radius: var(--urlbar-icon-border-radius);*/
padding: var(--urlbar-icon-padding);
color: inherit;
}
@@ -501,7 +506,7 @@
#cfr-label-container {
width: 0;
overflow: hidden;
- border-radius: 5px;
+/* border-radius: 5px;*/
padding-inline-start: 28px;
mask-image: linear-gradient(to right, transparent 0, black 0);
mask-position-x: var(--cfr-label-width);
@@ -578,7 +583,7 @@
color: inherit;
font-size: .8em;
padding: 3px 7px;
- border-radius: var(--urlbar-icon-border-radius);
+/* border-radius: var(--urlbar-icon-border-radius);*/
background-color: var(--urlbar-box-bgcolor);
color: var(--urlbar-box-text-color);
margin-block: calc((var(--urlbar-min-height) - 20px) / 2 - 1px /* border */ - var(--urlbar-container-padding));
diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
--- a/browser/themes/shared/urlbarView.inc.css
+++ b/browser/themes/shared/urlbarView.inc.css
@@ -718,7 +718,7 @@
.urlbarView-row[source="bookmarks"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
#urlbar-engine-one-off-item-bookmarks {
- list-style-image: url("chrome://browser/skin/bookmark.svg");
+ list-style-image: url("chrome://browser/skin/starred48.png");
fill: var(--toolbarbutton-icon-fill-attention);
fill-opacity: 1;
-moz-context-properties: fill, fill-opacity;

35
patches/icons.patch Normal file
View File

@ -0,0 +1,35 @@
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -116,9 +116,9 @@
skin/classic/browser/add-circle-fill.svg (../shared/icons/add-circle-fill.svg)
skin/classic/browser/back.svg (../shared/icons/back.svg)
- skin/classic/browser/bookmark.svg (../shared/icons/bookmark.svg)
+ skin/classic/browser/starred48.png (../shared/icons/starred48.png)
skin/classic/browser/bookmark-12.svg (../shared/icons/bookmark-12.svg)
- skin/classic/browser/bookmark-hollow.svg (../shared/icons/bookmark-hollow.svg)
+ skin/classic/browser/unstarred48.png (../shared/icons/unstarred48.png)
skin/classic/browser/bookmark-star-on-tray.svg (../shared/icons/bookmark-star-on-tray.svg)
skin/classic/browser/bookmarks-toolbar.svg (../shared/icons/bookmarks-toolbar.svg)
skin/classic/browser/canvas.svg (../shared/icons/canvas.svg)
@@ -143,6 +143,19 @@
skin/classic/browser/history.svg (../shared/icons/history.svg)
skin/classic/browser/home.svg (../shared/icons/home.svg)
skin/classic/browser/import.svg (../shared/icons/import.svg)
+ skin/classic/browser/back.png (../shared/icons/back.png)
+ skin/classic/browser/back_hover.png (../shared/icons/back_hover.png)
+ skin/classic/browser/forward.png (../shared/icons/forward.png)
+ skin/classic/browser/forward_hover.png (../shared/icons/forward_hover.png)
+ skin/classic/browser/stop.png (../shared/icons/stop.png)
+ skin/classic/browser/stop_hover.png (../shared/icons/stop_hover.png)
+ skin/classic/browser/home.png (../shared/icons/home.png)
+ skin/classic/browser/home_hover.png (../shared/icons/home_hover.png)
+ skin/classic/browser/refresh.png (../shared/icons/refresh.png)
+ skin/classic/browser/refresh_hover.png (../shared/icons/refresh_hover.png)
+ skin/classic/browser/tab-close.png (../shared/icons/tab-close.png)
+ skin/classic/browser/tab-close_hover.png (../shared/icons/tab-close_hover.png)
+ skin/classic/browser/tab-close_inactive.png (../shared/icons/tab-close_inactive.png)
#ifndef MOZ_WIDGET_GTK
skin/classic/browser/import-export.svg (../shared/icons/import-export.svg)
#endif

87
patches/urlbar.patch
View File

@ -1,5 +1,5 @@
--- b/browser/base/content/navigator-toolbox.inc.xhtml 2021-10-10 21:48:17.083622211 +0200
+++ a/browser/base/content/navigator-toolbox.inc.xhtml 2021-10-10 22:13:56.728620597 +0200
--- a/browser/base/content/navigator-toolbox.inc.xhtml 2021-09-28 01:17:27.000000000 +0200
+++ b/browser/base/content/navigator-toolbox.inc.xhtml 2021-10-12 00:25:27.055330998 +0200
@@ -28,83 +28,6 @@
#include titlebar-items.inc.xhtml
</toolbar>
@ -84,10 +84,32 @@
</vbox>
<toolbar id="nav-bar"
@@ -137,27 +60,33 @@
@@ -137,28 +60,33 @@
onclick="checkForMiddleClick(this, event);"
tooltip="forward-button-tooltip"
context="backForwardMenu"/>
- <toolbaritem id="stop-reload-button" class="chromeclass-toolbar-additional"
- data-l10n-id="toolbar-button-stop-reload"
- removable="true" overflows="false">
- <toolbarbutton id="reload-button" class="toolbarbutton-1"
- data-l10n-id="toolbar-button-reload"
- command="Browser:ReloadOrDuplicate"
- onclick="checkForMiddleClick(this, event);"
- tooltip="dynamic-shortcut-tooltip">
- <box class="toolbarbutton-animatable-box">
- <image class="toolbarbutton-animatable-image"/>
- </box>
- </toolbarbutton>
- <toolbarbutton id="stop-button" class="toolbarbutton-1"
- data-l10n-id="toolbar-button-stop"
- command="Browser:Stop"
- tooltip="dynamic-shortcut-tooltip">
- <box class="toolbarbutton-animatable-box">
- <image class="toolbarbutton-animatable-image"/>
- </box>
- </toolbarbutton>
- </toolbaritem>
- <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ removable="true"
+ label="&homeButton.label;"
@ -115,31 +137,10 @@
+ <image class="toolbarbutton-animatable-image"/>
+ </box>
+ </toolbarbutton>
- <toolbaritem id="stop-reload-button" class="chromeclass-toolbar-additional"
- data-l10n-id="toolbar-button-stop-reload"
- removable="true" overflows="false">
- <toolbarbutton id="reload-button" class="toolbarbutton-1"
- data-l10n-id="toolbar-button-reload"
- command="Browser:ReloadOrDuplicate"
- onclick="checkForMiddleClick(this, event);"
- tooltip="dynamic-shortcut-tooltip">
- <box class="toolbarbutton-animatable-box">
- <image class="toolbarbutton-animatable-image"/>
- </box>
- </toolbarbutton>
- <toolbarbutton id="stop-button" class="toolbarbutton-1"
- data-l10n-id="toolbar-button-stop"
- command="Browser:Stop"
- tooltip="dynamic-shortcut-tooltip">
- <box class="toolbarbutton-animatable-box">
- <image class="toolbarbutton-animatable-image"/>
- </box>
- </toolbarbutton>
- </toolbaritem>
<toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
<toolbaritem id="urlbar-container" flex="400" persist="width"
removable="false"
@@ -180,20 +109,6 @@
class="chromeclass-location" overflows="false">
@@ -180,20 +108,6 @@
class="chromeclass-toolbar-additional"/>
<!-- Use onclick instead of normal popup= syntax since the popup
code fires onmousedown, and hence eats our favicon drag events. -->
@ -160,7 +161,16 @@
<box id="identity-box"
pageproxystate="invalid"
ondragstart="gIdentityHandler.onDragStart(event);">
@@ -539,6 +454,83 @@
@@ -380,8 +294,6 @@
<toolbartabstop/>
</toolbaritem>
- <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
-
<toolbarbutton id="downloads-button"
class="toolbarbutton-1 chromeclass-toolbar-additional"
badged="true"
@@ -539,6 +451,83 @@
</toolbaritem>
</toolbar>
@ -244,7 +254,7 @@
<html:template id="tab-notification-deck-template">
<html:named-deck id="tab-notification-deck"></html:named-deck>
</html:template>
@@ -682,17 +674,6 @@
@@ -682,17 +671,6 @@
<toolbartabstop/>
</toolbaritem>
@ -262,3 +272,24 @@
<toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
removable="true"
onmousedown="PanelUI.showSubView('appMenu-libraryView', this, event);"
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -240,14 +240,10 @@ var CustomizableUIInternal = {
let navbarPlacements = [
"back-button",
"forward-button",
- "stop-reload-button",
- Services.policies.isAllowed("removeHomeButtonByDefault")
- ? null
- : "home-button",
- "spring",
+ "reload-button",
+ "stop-button",
+ "home-button",
"urlbar-container",
- "spring",
- "save-to-pocket-button",
"downloads-button",
AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
"fxa-toolbar-menu-button",

BIN
source_files/browser/themes/shared/icons/Toolbar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 55 KiB

BIN
source_files/browser/themes/shared/icons/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 980 B

BIN
source_files/browser/themes/shared/icons/back_hover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 893 B

BIN
source_files/browser/themes/shared/icons/forward.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 990 B

BIN
source_files/browser/themes/shared/icons/forward_hover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 906 B

BIN
source_files/browser/themes/shared/icons/home.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
source_files/browser/themes/shared/icons/home_hover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
source_files/browser/themes/shared/icons/refresh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
source_files/browser/themes/shared/icons/refresh_hover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
source_files/browser/themes/shared/icons/starred48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
source_files/browser/themes/shared/icons/stop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
source_files/browser/themes/shared/icons/stop_hover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
source_files/browser/themes/shared/icons/tab-close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
source_files/browser/themes/shared/icons/tab-close_hover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
source_files/browser/themes/shared/icons/tab-close_inactive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
source_files/browser/themes/shared/icons/unstarred48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 430 B