From cf1a6698323cfb4dcde78d74eecd9e3ab19af889 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Mon, 11 Jan 2016 11:35:52 +0100 Subject: [PATCH] 1.4.6.1 [fix] 'old search': tab key navigation through suggestions [fix] 'old search': temp. workaround for SearchWP add-on [fix] 'Fx46+' & add-ons managers version number: displayed number in update category --- xpi/content/addonversion_fx46.xml | 11 +++++++++++ xpi/content/css/alt_optionswindow2.css | 4 ++-- xpi/content/css/linux/smallnavbutextra.css | 8 ++++++++ xpi/content/css/mac/smallnavbutextra.css | 8 ++++++++ xpi/content/css/oldsearch.css | 7 ++++++- xpi/content/css/win8/smallnavbutextra.css | 8 ++++++++ xpi/content/css/winaero/smallnavbutextra.css | 11 ++++++++++- xpi/content/css/winxp/smallnavbutextra.css | 8 ++++++++ xpi/content/ctr_oldsearch.xml | 4 ++++ xpi/install.rdf | 2 +- 10 files changed, 66 insertions(+), 5 deletions(-) diff --git a/xpi/content/addonversion_fx46.xml b/xpi/content/addonversion_fx46.xml index 7675734c..8f9ff9a5 100644 --- a/xpi/content/addonversion_fx46.xml +++ b/xpi/content/addonversion_fx46.xml @@ -670,6 +670,14 @@ ]]> + + + + diff --git a/xpi/content/css/alt_optionswindow2.css b/xpi/content/css/alt_optionswindow2.css index 735b9c9d..5d2139b4 100644 --- a/xpi/content/css/alt_optionswindow2.css +++ b/xpi/content/css/alt_optionswindow2.css @@ -103,8 +103,8 @@ -moz-padding-start: 0px !important; margin-top: -35px !important; -moz-margin-start: -40px !important; - -moz-margin-end: -30px !important; - padding-top: 10px !important; + -moz-margin-end: -36px !important; + padding-top: 0px !important; } #mainPrefPane textbox { diff --git a/xpi/content/css/linux/smallnavbutextra.css b/xpi/content/css/linux/smallnavbutextra.css index fe95a1fa..cbba5c59 100644 --- a/xpi/content/css/linux/smallnavbutextra.css +++ b/xpi/content/css/linux/smallnavbutextra.css @@ -133,6 +133,14 @@ #main-window[defaultfxtheme="true"] #nav-bar .searchbar-textbox[focused] { border-color: Highlight !important; } + + /* tweaks for text/full modes */ + #nav-bar[mode="text"] toolbarbutton .toolbarbutton-text, + #nav-bar[mode="full"] toolbarbutton .toolbarbutton-text { + background: none !important; + box-shadow: none !important; + border: unset !important; + } /*buttons with SVG images*/ #nav-bar .toolbarbutton-1[image$="svg"] .toolbarbutton-icon { diff --git a/xpi/content/css/mac/smallnavbutextra.css b/xpi/content/css/mac/smallnavbutextra.css index bbdedf80..01588d8b 100644 --- a/xpi/content/css/mac/smallnavbutextra.css +++ b/xpi/content/css/mac/smallnavbutextra.css @@ -191,6 +191,14 @@ margin-bottom: 0px !important; } + /* tweaks for text/full modes */ + #nav-bar[mode="text"] toolbarbutton .toolbarbutton-text, + #nav-bar[mode="full"] toolbarbutton .toolbarbutton-text { + background: none !important; + box-shadow: none !important; + border: unset !important; + } + /*buttons with SVG images*/ #nav-bar .toolbarbutton-1[image$="svg"] .toolbarbutton-icon { max-width: 22px !important; diff --git a/xpi/content/css/oldsearch.css b/xpi/content/css/oldsearch.css index d922007e..dd4a4aea 100644 --- a/xpi/content/css/oldsearch.css +++ b/xpi/content/css/oldsearch.css @@ -7,9 +7,14 @@ -moz-binding: url("chrome://classic_theme_restorer/content/ctr_oldsearch.xml#searchbar") !important; } - searchbar .searchbar-textbox { + #main-window:not([searchwp-moz-platform]) searchbar .searchbar-textbox { -moz-binding: url("chrome://classic_theme_restorer/content/ctr_oldsearch.xml#searchbar-textbox") !important; } + + /* SearchWP add-on support */ + /*#main-window[searchwp-moz-platform] searchbar .searchbar-textbox { + -moz-binding: url("chrome://searchwp/content/searchbox.xml#searchbox") !important; + }*/ .searchbar-engine-button { -moz-appearance: none !important; diff --git a/xpi/content/css/win8/smallnavbutextra.css b/xpi/content/css/win8/smallnavbutextra.css index 0ad02f39..f35bb1b8 100644 --- a/xpi/content/css/win8/smallnavbutextra.css +++ b/xpi/content/css/win8/smallnavbutextra.css @@ -392,6 +392,14 @@ margin-bottom: 2px !important; } + /* tweaks for text/full modes */ + #nav-bar[mode="text"] toolbarbutton .toolbarbutton-text, + #nav-bar[mode="full"] toolbarbutton .toolbarbutton-text { + background: none !important; + box-shadow: none !important; + border: unset !important; + } + /* default badge buttons: loop/panelUI */ #nav-bar #PanelUI-menu-button .toolbarbutton-badge, #nav-bar #PanelUI-menu-button .toolbarbutton-badge-container, diff --git a/xpi/content/css/winaero/smallnavbutextra.css b/xpi/content/css/winaero/smallnavbutextra.css index 45e60149..a6acf44a 100644 --- a/xpi/content/css/winaero/smallnavbutextra.css +++ b/xpi/content/css/winaero/smallnavbutextra.css @@ -257,7 +257,7 @@ } } - + @media (min-resolution: 1.1dppx) { #main-window[fx40plus="true"] #nav-bar toolbarbutton[cui-areatype="toolbar"] > :-moz-any(#zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button) > .toolbarbutton-icon, #main-window[fx40plus="true"] #nav-bar :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button):-moz-any([cui-areatype="toolbar"],:not([cui-areatype])) > .toolbarbutton-icon, @@ -345,6 +345,14 @@ margin-bottom: 2px !important; } + /* tweaks for text/full modes */ + #nav-bar[mode="text"] toolbarbutton .toolbarbutton-text, + #nav-bar[mode="full"] toolbarbutton .toolbarbutton-text { + background: none !important; + box-shadow: none !important; + border: unset !important; + } + /* default badge buttons: loop/panelUI */ #nav-bar #PanelUI-menu-button .toolbarbutton-badge, #nav-bar #PanelUI-menu-button .toolbarbutton-badge-container, @@ -455,6 +463,7 @@ #nav-bar #zoompage-zoomout-n image{ padding:0px !important; } + /* special buttons inside urlbars boxes */ #urlbar #notification-popup-box + box toolbarbutton, #urlbar #notification-popup-box + box toolbarbutton .toolbarbutton-icon, diff --git a/xpi/content/css/winxp/smallnavbutextra.css b/xpi/content/css/winxp/smallnavbutextra.css index 39176109..b45eb142 100644 --- a/xpi/content/css/winxp/smallnavbutextra.css +++ b/xpi/content/css/winxp/smallnavbutextra.css @@ -284,6 +284,14 @@ margin-bottom: 2px !important; } + /* tweaks for text/full modes */ + #nav-bar[mode="text"] toolbarbutton .toolbarbutton-text, + #nav-bar[mode="full"] toolbarbutton .toolbarbutton-text { + background: none !important; + box-shadow: none !important; + border: unset !important; + } + /* default badge buttons: loop/panelUI */ #nav-bar #PanelUI-menu-button .toolbarbutton-badge, #nav-bar #PanelUI-menu-button .toolbarbutton-badge-container, diff --git a/xpi/content/ctr_oldsearch.xml b/xpi/content/ctr_oldsearch.xml index 2aaf53f1..2b7cf441 100644 --- a/xpi/content/ctr_oldsearch.xml +++ b/xpi/content/ctr_oldsearch.xml @@ -791,6 +791,10 @@ if (!popup.popupOpen) return; + let list = document.getAnonymousElementByAttribute(popup, "anonid", + "search-panel-one-offs"); + if (!list) // remove this check when removing the old search UI. + return; // accel + up/down changes the default engine and shouldn't affect // the selection on the one-off buttons. if (aEvent.ctrlKey) diff --git a/xpi/install.rdf b/xpi/install.rdf index 3dd38a32..9159cc72 100644 --- a/xpi/install.rdf +++ b/xpi/install.rdf @@ -5,7 +5,7 @@ ClassicThemeRestorer@ArisT2Noia4dev Classic Theme Restorer - 1.4.6 + 1.4.6.1 2 true