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

+ urlbar, wordmark patches

master
Dominika Liberda 2021-10-11 00:41:56 +02:00
parent 5dee011f4c
commit d3621b1f39
3 changed files with 287 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
patches/mozilla_dirs.patch
View File

@ -7,19 +7,19 @@ index 50a64a2..79d7d9c 100644
getter_AddRefs(localDir));
if (NS_SUCCEEDED(rv)) {
- rv = localDir->AppendNative("Mozilla"_ns);
+ rv = localDir->AppendNative("LibreWolf"_ns);
+ rv = localDir->AppendNative("Foxgirl"_ns);
}
# else
constexpr auto dirname =
# ifdef HAVE_USR_LIB64_DIR
- "/usr/lib64/mozilla"_ns
+ "/usr/lib64/librewolf"_ns
+ "/usr/lib64/foxgirl"_ns
# elif defined(__OpenBSD__) || defined(__FreeBSD__)
- "/usr/local/lib/mozilla"_ns
+ "/usr/local/lib/librewolf"_ns
+ "/usr/local/lib/foxgirl"_ns
# else
- "/usr/lib/mozilla"_ns
+ "/usr/lib/librewolf"_ns
+ "/usr/lib/foxgirl"_ns
# endif
;
rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));
@ -28,10 +28,10 @@ index 50a64a2..79d7d9c 100644
if (NS_SUCCEEDED(rv)) {
# if defined(XP_MACOSX)
- rv = localDir->AppendNative("Mozilla"_ns);
+ rv = localDir->AppendNative("LibreWolf"_ns);
+ rv = localDir->AppendNative("Foxgirl"_ns);
# else
- rv = localDir->AppendNative(".mozilla"_ns);
+ rv = localDir->AppendNative(".librewolf"_ns);
+ rv = localDir->AppendNative(".foxgirl"_ns);
# endif
}
if (NS_SUCCEEDED(rv)) {
@ -40,10 +40,10 @@ index 50a64a2..79d7d9c 100644
# ifdef ENABLE_SYSTEM_EXTENSION_DIRS
# if defined(__OpenBSD__) || defined(__FreeBSD__)
- static const char* const sysLExtDir = "/usr/local/share/mozilla/extensions";
+ static const char* const sysLExtDir = "/usr/local/share/librewolf/extensions";
+ static const char* const sysLExtDir = "/usr/local/share/foxgirl/extensions";
# else
- static const char* const sysLExtDir = "/usr/share/mozilla/extensions";
+ static const char* const sysLExtDir = "/usr/share/librewolf/extensions";
+ static const char* const sysLExtDir = "/usr/share/foxgirl/extensions";
# endif
return NS_NewNativeLocalFile(nsDependentCString(sysLExtDir), false, aFile);
# else
@ -52,7 +52,7 @@ index 50a64a2..79d7d9c 100644
return NS_ERROR_FAILURE;
}
- } else if (NS_FAILED(localDir->AppendNative("Mozilla"_ns))) {
+ } else if (NS_FAILED(localDir->AppendNative("LibreWolf"_ns))) {
+ } else if (NS_FAILED(localDir->AppendNative("Foxgril"_ns))) {
return NS_ERROR_FAILURE;
}
@ -61,7 +61,7 @@ index 50a64a2..79d7d9c 100644
#if defined(XP_MACOSX) || defined(XP_WIN)
- static const char* const sXR = "Mozilla";
+ static const char* const sXR = "LibreWolf";
+ static const char* const sXR = "Foxgirl";
rv = aFile->AppendNative(nsDependentCString(sXR));
NS_ENSURE_SUCCESS(rv, rv);
@ -70,7 +70,7 @@ index 50a64a2..79d7d9c 100644
#elif defined(XP_UNIX)
- static const char* const sXR = ".mozilla";
+ static const char* const sXR = ".librewolf";
+ static const char* const sXR = ".foxgirl";
rv = aFile->AppendNative(nsDependentCString(sXR));
NS_ENSURE_SUCCESS(rv, rv);

264
patches/urlbar.patch Normal file
View File

@ -0,0 +1,264 @@
--- 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
@@ -28,83 +28,6 @@
#include titlebar-items.inc.xhtml
</toolbar>
- <toolbar id="TabsToolbar"
- class="browser-toolbar titlebar-color"
- fullscreentoolbar="true"
- customizable="true"
- customizationtarget="TabsToolbar-customization-target"
- mode="icons"
- aria-label="&tabsToolbar.label;"
- context="toolbar-context-menu"
- flex="1">
-
- <hbox class="titlebar-spacer" type="pre-tabs"/>
-
- <hbox flex="1" align="end" class="toolbar-items">
- <hbox id="TabsToolbar-customization-target" flex="1">
- <tabs id="tabbrowser-tabs"
- is="tabbrowser-tabs"
- flex="1"
- aria-multiselectable="true"
- setfocus="false"
- tooltip="tabbrowser-tab-tooltip"
- stopwatchid="FX_TAB_CLICK_MS">
- <hbox class="tab-drop-indicator" hidden="true"/>
- <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" style="min-width: 1px;" clicktoscroll="true" scrolledtostart="true" scrolledtoend="true">
- <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="true" fadein="true"/>
- <toolbarbutton id="tabs-newtab-button"
- class="toolbarbutton-1"
- command="cmd_newNavigatorTab"
- onclick="checkForMiddleClick(this, event);"
- tooltip="dynamic-shortcut-tooltip"/>
- <spacer class="closing-tabs-spacer" style="width: 0;"/>
- </arrowscrollbox>
- <html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
- </tabs>
-
- <toolbarbutton id="new-tab-button"
- class="toolbarbutton-1 chromeclass-toolbar-additional"
- label="&tabCmd.label;"
- command="cmd_newNavigatorTab"
- onclick="checkForMiddleClick(this, event);"
- tooltip="dynamic-shortcut-tooltip"
- ondrop="newTabButtonObserver.onDrop(event)"
- ondragover="newTabButtonObserver.onDragOver(event)"
- ondragenter="newTabButtonObserver.onDragOver(event)"
- cui-areatype="toolbar"
- removable="true"/>
-
- <toolbarbutton id="alltabs-button"
- class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
- badged="true"
- oncommand="gTabsPanel.showAllTabsPanel(event);"
- label="&listAllTabs.label;"
- tooltiptext="&listAllTabs.label;"
- removable="false"/>
- </hbox>
- </hbox>
-
- <hbox class="titlebar-spacer" type="post-tabs"/>
-
-#ifndef XP_MACOSX
- <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
- aria-live="polite"/>
- <hbox class="private-browsing-indicator"/>
-#endif
-
-#include titlebar-items.inc.xhtml
-
-#ifdef XP_MACOSX
- <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary
- buttonbox from reversing order in RTL by forcing an LTR direction. -->
- <hbox id="titlebar-secondary-buttonbox" dir="ltr">
- <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" aria-live="polite"/>
- <hbox class="private-browsing-indicator"/>
- <hbox id="titlebar-fullscreen-button"/>
- </hbox>
-#endif
- </toolbar>
-
</vbox>
<toolbar id="nav-bar"
@@ -137,27 +60,33 @@
onclick="checkForMiddleClick(this, event);"
tooltip="forward-button-tooltip"
context="backForwardMenu"/>
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ removable="true"
+ label="&homeButton.label;"
+ ondragover="homeButtonObserver.onDragOver(event)"
+ ondragenter="homeButtonObserver.onDragOver(event)"
+ ondrop="homeButtonObserver.onDrop(event)"
+ key="goHome"
+ onclick="BrowserHome(event);"
+ cui-areatype="toolbar"
+ tooltiptext="&homeButton.defaultPage.tooltip;"/>
+ <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 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-toolbar-additional"/>
<!-- Use onclick instead of normal popup= syntax since the popup
code fires onmousedown, and hence eats our favicon drag events. -->
- <box id="tracking-protection-icon-container" align="center"
- role="button"
- onclick="gProtectionsHandler.handleProtectionsButtonEvent(event);"
- onkeypress="gProtectionsHandler.handleProtectionsButtonEvent(event);"
- onmouseover="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
- onfocus="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
- tooltip="tracking-protection-icon-tooltip">
- <box id="tracking-protection-icon-box">
- <image id="tracking-protection-icon"/>
- </box>
- <tooltip id="tracking-protection-icon-tooltip">
- <description id="tracking-protection-icon-tooltip-label" class="tooltip-label"/>
- </tooltip>
- </box>
<box id="identity-box"
pageproxystate="invalid"
ondragstart="gIdentityHandler.onDragStart(event);">
@@ -539,6 +454,83 @@
</toolbaritem>
</toolbar>
+ <toolbar id="TabsToolbar"
+ class="browser-toolbar titlebar-color"
+ fullscreentoolbar="true"
+ customizable="true"
+ customizationtarget="TabsToolbar-customization-target"
+ mode="icons"
+ aria-label="&tabsToolbar.label;"
+ context="toolbar-context-menu"
+ flex="1">
+
+ <hbox class="titlebar-spacer" type="pre-tabs"/>
+
+ <hbox flex="1" align="end" class="toolbar-items">
+ <hbox id="TabsToolbar-customization-target" flex="1">
+ <tabs id="tabbrowser-tabs"
+ is="tabbrowser-tabs"
+ flex="1"
+ aria-multiselectable="true"
+ setfocus="false"
+ tooltip="tabbrowser-tab-tooltip"
+ stopwatchid="FX_TAB_CLICK_MS">
+ <hbox class="tab-drop-indicator" hidden="true"/>
+ <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" style="min-width: 1px;" clicktoscroll="true" scrolledtostart="true" scrolledtoend="true">
+ <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="true" fadein="true"/>
+ <toolbarbutton id="tabs-newtab-button"
+ class="toolbarbutton-1"
+ command="cmd_newNavigatorTab"
+ onclick="checkForMiddleClick(this, event);"
+ tooltip="dynamic-shortcut-tooltip"/>
+ <spacer class="closing-tabs-spacer" style="width: 0;"/>
+ </arrowscrollbox>
+ <html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
+ </tabs>
+
+ <toolbarbutton id="new-tab-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&tabCmd.label;"
+ command="cmd_newNavigatorTab"
+ onclick="checkForMiddleClick(this, event);"
+ tooltip="dynamic-shortcut-tooltip"
+ ondrop="newTabButtonObserver.onDrop(event)"
+ ondragover="newTabButtonObserver.onDragOver(event)"
+ ondragenter="newTabButtonObserver.onDragOver(event)"
+ cui-areatype="toolbar"
+ removable="true"/>
+
+ <toolbarbutton id="alltabs-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
+ badged="true"
+ oncommand="gTabsPanel.showAllTabsPanel(event);"
+ label="&listAllTabs.label;"
+ tooltiptext="&listAllTabs.label;"
+ removable="false"/>
+ </hbox>
+ </hbox>
+
+ <hbox class="titlebar-spacer" type="post-tabs"/>
+
+#ifndef XP_MACOSX
+ <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
+ aria-live="polite"/>
+ <hbox class="private-browsing-indicator"/>
+#endif
+
+#include titlebar-items.inc.xhtml
+
+#ifdef XP_MACOSX
+ <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary
+ buttonbox from reversing order in RTL by forcing an LTR direction. -->
+ <hbox id="titlebar-secondary-buttonbox" dir="ltr">
+ <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" aria-live="polite"/>
+ <hbox class="private-browsing-indicator"/>
+ <hbox id="titlebar-fullscreen-button"/>
+ </hbox>
+#endif
+ </toolbar>
+
<html:template id="tab-notification-deck-template">
<html:named-deck id="tab-notification-deck"></html:named-deck>
</html:template>
@@ -682,17 +674,6 @@
<toolbartabstop/>
</toolbaritem>
- <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
- removable="true"
- label="&homeButton.label;"
- ondragover="homeButtonObserver.onDragOver(event)"
- ondragenter="homeButtonObserver.onDragOver(event)"
- ondrop="homeButtonObserver.onDrop(event)"
- key="goHome"
- onclick="BrowserHome(event);"
- cui-areatype="toolbar"
- tooltiptext="&homeButton.defaultPage.tooltip;"/>
-
<toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
removable="true"
onmousedown="PanelUI.showSubView('appMenu-libraryView', this, event);"

12
patches/wordmark.patch Normal file
View File

@ -0,0 +1,12 @@
--- a/components/newtab/css/activity-stream-linux.css 2021-10-11 00:33:16.266611832 +0200
+++ b/components/newtab/css/activity-stream-linux.css 2021-10-11 00:34:40.395611744 +0200
@@ -1575,6 +1575,9 @@
margin-inline-start: 16px;
width: 134px;
}
+.wordmark {
+ width: 0px !important;
+}
@media (max-width: 609px) {
.search-wrapper .logo-and-wordmark .logo {
background-size: 64px;