v1.0.8

Aris-t2 · Oct 15, 2017 · a531325 · a531325
1 parent b07f629
commit a531325
Show file tree

Hide file tree

Showing 11 changed files with 171 additions and 39 deletions.
diff --git a/classic/css/buttons/appbutton_in_titlebar.css b/classic/css/buttons/appbutton_in_titlebar.css
@@ -208,4 +208,30 @@
 #main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-menu-button .toolbarbutton-icon,
 #main-window[tabsintitlebar][uidensity=touch] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-menu-button .toolbarbutton-icon {
   padding: 0 !important;
-}
+}
+
+/* fix for toolbar + text mode */
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) toolbaritem #PanelUI-menu-button,
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) #PanelUI-menu-button,
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] #PanelUI-menu-button{
+  -moz-appearance: unset !important;
+}
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) toolbaritem #PanelUI-menu-button .toolbarbutton-text,
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) #PanelUI-menu-button:not([type="menu-button"]) .toolbarbutton-text,
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] #PanelUI-menu-button .toolbarbutton-text{
+  display: none !important;
+}
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) toolbaritem #PanelUI-menu-button:not([type="menu-button"]),
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) #PanelUI-menu-button:not([type="menu-button"]),
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] #PanelUI-menu-button{
+  -moz-box-orient: unset !important;
+  min-width: unset !important;
+}
+
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) toolbaritem #PanelUI-menu-button:not(#nav-bar-overflow-button):not(#PlacesChevron) > :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack),
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) #PanelUI-menu-button:not([type="menu-button"]):not(#nav-bar-overflow-button):not(#PlacesChevron) > :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack)/*,
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) #PanelUI-menu-button[type="menu-button"]:not(#nav-bar-overflow-button):not(#PlacesChevron) toolbarbutton :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack)*/{
+  opacity: 1.0 !important;
+  margin-bottom: unset !important;
+}
+
diff --git a/classic/css/buttons/custom_backforward_large.css b/classic/css/buttons/custom_backforward_large.css
@@ -70,14 +70,7 @@
   width: 30px !important;
   height: 32px !important;
 }
-/*
-#main-window #navigator-toolbox #nav-bar #forward-button {
-  -moz-margin-start: -2px !important;
-}
 
-#main-window[uidensity=compact] #navigator-toolbox toolbar #forward-button {
-  -moz-margin-start: -4px !important;
-}*/
 
 #main-window[uidensity=compact] #nav-bar #nav-bar-customization-target > :-moz-any(#back-button, #forward-button) {
   margin: unset !important;

diff --git a/classic/css/buttons/custom_backforward_small.css b/classic/css/buttons/custom_backforward_small.css
@@ -70,15 +70,7 @@
   -moz-image-region: rect(0px 46px 23px 23px) !important;
   width: 23px !important;
 }
-/*
-#main-window #navigator-toolbox #nav-bar #forward-button {
-  -moz-margin-start: -2px !important;
-}
 
-#main-window[uidensity=compact] #navigator-toolbox toolbar #forward-button {
-  -moz-margin-start: -4px !important;
-}
-*/
 #main-window[uidensity=compact] #nav-bar #nav-bar-customization-target > :-moz-any(#back-button, #forward-button) {
   margin: unset !important;
   padding: unset !important;

diff --git a/classic/css/buttons/custom_icons.css b/classic/css/buttons/custom_icons.css
@@ -158,9 +158,9 @@
   -moz-image-region: rect(1px, 647px, 17px, 631px) !important;
 }
 
-
 /* remove load/stop button animations */
 #stop-button .toolbarbutton-animatable-image,
 #reload-button .toolbarbutton-animatable-image {
   display: none !important;
-}
+}
+/**/
diff --git a/classic/css/buttons/squared_button_appearance_for_classic_buttons_on_navbar.css b/classic/css/buttons/squared_button_appearance_for_classic_buttons_on_navbar.css
@@ -6,7 +6,8 @@
 /* Github: https://github.com/aris-t2/customcssforfx ************************************/
 /****************************************************************************************/
 
-/* this won't work for all buttons the same */
+/* This code won't work for all buttons the same way. There are way too many different ***
+** types and button variations out there to catch all of them with genereal code. *******/
 
 #main-window #nav-bar #downloads-indicator-progress-outer,
 #main-window #nav-bar #downloads-indicator-icon,

diff --git a/classic/css/locationbar/pageaction_button_in_location_bar_hidden.css b/classic/css/locationbar/pageaction_button_in_location_bar_hidden.css
@@ -0,0 +1,12 @@
+/*AGENT_SHEET*/
+
+/* Firefox 57+ userChrome.css tweaks ****************************************************/
+/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/
+/* by Aris ([email protected])*********************************************************/
+/* Github: https://github.com/aris-t2/customcssforfx ************************************/
+/****************************************************************************************/
+
+/* hide page action (three dots) button */
+#urlbar-container #pageActionButton{
+  visibility: collapse !important;
+}
diff --git a/classic/css/locationbar/pageaction_separator_in_location_bar_hidden.css b/classic/css/locationbar/pageaction_separator_in_location_bar_hidden.css
@@ -0,0 +1,12 @@
+/*AGENT_SHEET*/
+
+/* Firefox 57+ userChrome.css tweaks ****************************************************/
+/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/
+/* by Aris ([email protected])*********************************************************/
+/* Github: https://github.com/aris-t2/customcssforfx ************************************/
+/****************************************************************************************/
+
+/* hide page action separator */
+#urlbar-container #pageActionSeparator{
+  visibility: collapse !important;
+}
diff --git a/classic/css/toolbars/toolbar_mode_icons_and_text.css b/classic/css/toolbars/toolbar_mode_icons_and_text.css
@@ -0,0 +1,69 @@
+/*AGENT_SHEET*/
+
+/* Firefox 57+ userChrome.css tweaks ****************************************************/
+/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/
+/* by Aris ([email protected])*********************************************************/
+/* Github: https://github.com/aris-t2/customcssforfx ************************************/
+/****************************************************************************************/
+
+toolbar:not(#TabsToolbar) .toolbarbutton-1 .toolbarbutton-badge-stack,
+toolbar:not(#TabsToolbar) toolbaritem .toolbarbutton-1,
+toolbar:not(#TabsToolbar) .toolbarbutton-1,
+toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton,
+toolbar:not(#TabsToolbar) toolbaritem .toolbarbutton-1 :-moz-any(.toolbarbutton-icon, .toolbarbutton-text),
+toolbar:not(#TabsToolbar) .toolbarbutton-1 :-moz-any(.toolbarbutton-icon, .toolbarbutton-text),
+toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton :-moz-any(.toolbarbutton-icon, .toolbarbutton-text){
+  background: unset !important;
+  box-shadow: unset !important;
+}
+
+toolbar:not(#TabsToolbar) toolbaritem .toolbarbutton-1,
+toolbar:not(#TabsToolbar) .toolbarbutton-1,
+toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton{
+  -moz-appearance: toolbarbutton !important;
+}
+
+@media (-moz-windows-classic) {
+  toolbar:not(#TabsToolbar) toolbaritem .toolbarbutton-1:hover,
+  toolbar:not(#TabsToolbar) .toolbarbutton-1:hover,
+  toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton:hover{
+	box-shadow:	1px 0 0 0 white inset,
+				0 1px 0 0 white inset,
+				-1px 0 0 0 gray inset,
+				0 -1px 0 0 gray inset !important;
+	}
+}
+
+toolbar:not(#TabsToolbar) toolbaritem .toolbarbutton-1 .toolbarbutton-text,
+toolbar:not(#TabsToolbar) .toolbarbutton-1:not([type="menu-button"]) .toolbarbutton-text,
+toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton .toolbarbutton-text{
+  display: -moz-box !important;
+  padding:0 !important;
+}
+toolbar:not(#TabsToolbar) toolbaritem .toolbarbutton-1:not([type="menu-button"]),
+toolbar:not(#TabsToolbar) .toolbarbutton-1:not([type="menu-button"]),
+toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton{
+  -moz-box-orient: vertical !important;
+  min-width: 57px !important;
+}
+
+toolbar:not(#TabsToolbar) toolbaritem .toolbarbutton-1,
+toolbar:not(#TabsToolbar) .toolbarbutton-1,
+toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton{
+  padding-top: 4px !important;
+}
+
+toolbar:not(#TabsToolbar)  #bookmarks-menu-button::after {
+  visibility: collapse !important;
+}
+
+/* remove load/stop button animations */
+toolbar:not(#TabsToolbar) #stop-button .toolbarbutton-animatable-image,
+toolbar:not(#TabsToolbar) #reload-button .toolbarbutton-animatable-image {
+  visibility: collapse !important;
+}
+
+#stop-reload-button[animate] > #reload-button > .toolbarbutton-icon,
+#stop-reload-button[animate] > #reload-button[displaystop] + #stop-button > .toolbarbutton-icon {
+  fill: unset !important;
+}
diff --git a/classic/css/toolbars/toolbar_mode_text.css b/classic/css/toolbars/toolbar_mode_text.css
@@ -0,0 +1,28 @@
+/*AGENT_SHEET*/
+
+/* Firefox 57+ userChrome.css tweaks ****************************************************/
+/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/
+/* by Aris ([email protected])*********************************************************/
+/* Github: https://github.com/aris-t2/customcssforfx ************************************/
+/****************************************************************************************/
+
+@import url(./toolbar_mode_icons_and_text.css);
+
+
+toolbar:not(#TabsToolbar) toolbaritem .toolbarbutton-1:not(#nav-bar-overflow-button):not(#PlacesChevron) > :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack),
+toolbar:not(#TabsToolbar) .toolbarbutton-1:not([type="menu-button"]):not(#nav-bar-overflow-button):not(#PlacesChevron) > :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack)/*,
+toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"]:not(#nav-bar-overflow-button):not(#PlacesChevron) toolbarbutton :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack)*/{
+  opacity: 0.01 !important;
+}
+
+#nav-bar:not(#TabsToolbar) toolbaritem .toolbarbutton-1 > :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack),
+#nav-bar:not(#TabsToolbar) .toolbarbutton-1:not([type="menu-button"]) > :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack)/*,
+#nav-bar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack)*/{
+  margin-bottom: -22px !important;
+}
+
+toolbar:not(#nav-bar):not(#TabsToolbar) toolbaritem .toolbarbutton-1 > :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack),
+toolbar:not(#nav-bar):not(#TabsToolbar) .toolbarbutton-1:not([type="menu-button"]) > :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack)/*,
+#nav-bar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack)*/{
+  margin-bottom: -15px !important;
+}
diff --git a/classic/userChrome.css b/classic/userChrome.css
@@ -11,8 +11,8 @@
 /* TOOLBAR BUTTONS **********************************************************************/
 /****************************************************************************************/
 
-@import url(./css/buttons/classic_button_appearance_on_navbar.css);
-/*@import url(./css/buttons/squared_button_appearance_for_classic_buttons_on_navbar.css);*/  /* <--- experimental */
+/*@import url(./css/buttons/classic_button_appearance_on_navbar.css);*/
+/*@import url(./css/buttons/squared_button_appearance_for_classic_buttons_on_navbar.css);*/ /* <--- experimental */
 @import url(./css/buttons/custom_icon_colors.css);
 /*@import url(./css/buttons/custom_icons.css);*/
 @import url(./css/buttons/bookmarks_toolbar_button_size.css);
@@ -109,6 +109,7 @@
 /*@import url(./css/generalui/close_icon_gchrome.css);*/
 /*@import url(./css/generalui/close_icon_red.css);*/
 
+
 /****************************************************************************************/
 /* Toolbars *****************************************************************************/
 /****************************************************************************************/
@@ -119,6 +120,8 @@
 @import url(./css/toolbars/toolbars_old_padding.css);
 /*@import url(./css/toolbars/navbar_more_compact_mode.css);*/
 /*@import url(./css/toolbars/toolbars_in_fullscreen_mode.css);*/
+/*@import url(./css/toolbars/toolbar_mode_icons_and_text.css);*/ /* <--- experimental */
+/*@import url(./css/toolbars/toolbar_mode_text.css);*/ /* <--- experimental */
 
 
 /****************************************************************************************/
@@ -134,7 +137,9 @@
 @import url(./css/locationbar/identitybox_colors.css);
 @import url(./css/locationbar/identitybox_padlock_icon.css);
 @import url(./css/locationbar/starbutton_is_last_pageaction_button.css);
-/*@import url(./css/locationbar/go_button_in_location_bar_hidden.css);*/
+/*@import url(./css/locationbar/pageaction_button_in_location_bar_hidden.css);*/
+@import url(./css/locationbar/pageaction_separator_in_location_bar_hidden.css);
+@import url(./css/locationbar/go_button_in_location_bar_hidden.css);
 /*@import url(./css/locationbar/dark_background.css);*/
 
 
@@ -153,4 +158,4 @@
 /*@import url(./css/locationbar/ac_popup_result_separator.css);*/
 /*@import url(./css/locationbar/ac_popup_hide_searchwith_and_visit_items.css);*/
 
-/**/
+/**/
diff --git a/classic/xml/urlbarBindings_fx57.xml b/classic/xml/urlbarBindings_fx57.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- Modified Firefox 54+ bindings offered in
- chrome://global/content/bindings/autocomplete.xml#autocomplete-rich-result-popup
- and
- chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup
- to simulate pre-Fx48 look of location bars autocomplete popup.
- Removed all default comments to reduce file size.
- Many "empty" methods to provide compatibility with future Fx builds.  
+** Modified Firefox 57+ bindings offered in ***********************************************
+** chrome://global/content/bindings/autocomplete.xml#autocomplete-rich-result-popup *******
+** and ************************************************************************************
+** chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup *******************
+** to simulate pre-Fx48 look of location bars autocomplete popup and removed all default **
+** default comments to reduce file size. **************************************************
 -->
 
 <!DOCTYPE bindings [
@@ -19,12 +18,12 @@
 %brandDTD;
 ]>
 
-<bindings id="urlbarBindings" xmlns="http://www.mozilla.org/xbl"
+<bindings id="urlbarBindings"
+		  xmlns="http://www.mozilla.org/xbl"
           xmlns:html="http://www.w3.org/1999/xhtml"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:xbl="http://www.mozilla.org/xbl">
 
-
   <binding id="urlbar-rich-result-popup" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete-rich-result-popup">
 
     <resources>
@@ -38,7 +37,7 @@
                 align="center"
                 role="alert"
                 selectedIndex="0">
-        <!-- OPT-OUT -->
+
         <xul:hbox flex="1" align="center" anonid="search-suggestions-opt-out">
           <xul:image class="ac-site-icon" type="searchengine"/>
           <xul:hbox anonid="search-suggestions-hint-typing">
@@ -215,7 +214,7 @@
             return;
           }
   
-		  width = 300;
+		  var width = 300;
 
 		  try{
 			width = Math.round(document.getElementById("urlbar").getBoundingClientRect().width);
@@ -263,7 +262,6 @@
             }
           }
 
-
           this.searchSuggestionsNotification.setAttribute("aria-describedby",
                                                           "search-suggestions-hint");
 
@@ -291,7 +289,6 @@
           this.removeAttribute("dontanimate");
           this.searchSuggestionsNotification.removeAttribute("animate");
           if (this._matchCount) {
-            // Update popup height.
             this._invalidate();
           } else {
             this.closePopup();
@@ -422,7 +419,6 @@
               }
             }
 
-
             this.footer.collapsed = false;
             this.input.tabScrolling = true;
 
@@ -1056,7 +1052,6 @@
           let action;
 
           if (initialTypes.has("autofill")) {
-            // Treat autofills as visiturl actions.
             action = {
               type: "visiturl",
               params: {
@@ -1068,7 +1063,6 @@
           this.removeAttribute("actiontype");
           this.classList.remove("overridable-action");
 
-          // If the type includes an action, set up the item appropriately.
           if (initialTypes.has("action") || action) {
             action = action || this._parseActionUrl(originalUrl);
             this.setAttribute("actiontype", action.type);