From 81c9fd44364441dc42815c2720eee57367cf8d66 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Sat, 6 Jan 2018 15:08:09 +0100 Subject: [PATCH 01/47] 1.5.5 --- ...uttons_on_navbar_classic_appearance_v2.css | 108 ++++++++++++++++++ .../buttons_on_navbar_osx_appearance.css | 108 ++++++++++++++++++ classic/userChrome.css | 7 +- 3 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 classic/css/buttons/buttons_on_navbar_classic_appearance_v2.css create mode 100644 classic/css/buttons/buttons_on_navbar_osx_appearance.css diff --git a/classic/css/buttons/buttons_on_navbar_classic_appearance_v2.css b/classic/css/buttons/buttons_on_navbar_classic_appearance_v2.css new file mode 100644 index 00000000..235465df --- /dev/null +++ b/classic/css/buttons/buttons_on_navbar_classic_appearance_v2.css @@ -0,0 +1,108 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +/**************************** +******* BUTTONS ************* +****************************/ + +/*******************************************/ +/* Classic Button ui on navigation toolbar */ +/*******************************************/ + +/* main menu button adjustment */ +#PanelUI-button { + margin-inline-start: 0px !important; + border-inline-start: 0px solid !important; + border-image-slice: 0 !important; + padding-left: 2px !important; + padding-right: 2px !important; +} +#PanelUI-menu-button { + -moz-appearance: unset !important; + background: unset !important; + box-shadow: unset !important; + border-image: unset !important; + border: unset !important; + padding: unset !important; + margin: unset !important; + min-width: unset !important; + width: unset !important; + max-width: unset !important; + min-height: unset !important; + height: unset !important; + max-height: unset !important; +} + +/* back button adjustment */ +#nav-bar #back-button .toolbarbutton-icon { + border: 0 !important; +} + +/* adjust zoom reset and copy buttons position */ +#nav-bar :-moz-any(#copy-button,#zoom-reset-button) { + -moz-margin-start: -1px !important; + -moz-margin-end: -1px !important; +} +#nav-bar :-moz-any(#edit-controls, #zoom-controls) separator { + visibility: collapse !important; +} + +/* classic button style */ +#main-window:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-icon, +#main-window:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-text, +#main-window:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-badge-stack, +#nav-bar toolbarbutton[type="menu-button"] .toolbarbutton-icon, +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-button > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +#nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-text, +#nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-badge-stack, +#nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon { + background: rgba(151,152,153,.05) linear-gradient(rgba(251,252,253,.95), rgba(246,247,248,.57) 49%, + rgba(231,232,233,.75) 51%, rgba(225,226,229,.6)) !important; + border-color: rgba(0,0,0,.12) rgba(0,0,0,.19) rgba(0,0,0,.38) !important; + box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, + 0 0 0 2px rgba(255,255,255,.1) inset, + 0 0 0 1px rgba(0,0,0,.8) inset !important; +} +#nav-bar .toolbarbutton-1:not([disabled=true]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text, +#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack, +#nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon { + background-color: rgba(0,0,0,.2) !important; + border-color: hsla(190,50%,65%,.8) hsla(190,50%,50%,.8) hsla(190,50%,40%,.8) !important; + transition: background-color .3s ease-in, + border-color .2s ease-in, + box-shadow .2s ease-in !important; +} +#nav-bar toolbarbutton[type="menu"][open]:not([disabled]) .toolbarbutton-icon, +#nav-bar toolbarbutton[type="menu-button"]:not([open]):hover:not([disabled]):active .toolbarbutton-icon, +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active,:active, [open]) > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-text, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-badge-stack { + background-color: rgba(0,0,0,.1) !important; + border-color: rgba(0,0,0,.65) rgba(0,0,0,.55) rgba(0,0,0,.5) !important; + box-shadow: 0 0 6.5px rgba(0,0,0,.4) inset, + 0 0 2px rgba(0,0,0,.4) inset, + 0 1px 0 rgba(255,255,255,.4), + 0 0 0 1px rgba(0,0,0,.9) inset !important; +} +#nav-bar toolbarbutton[disabled=true] > .toolbarbutton-icon { + opacity: .6 !important; +} + +#nav-bar toolbarbutton[disabled=true]{ + opacity: 1.0 !important; +} diff --git a/classic/css/buttons/buttons_on_navbar_osx_appearance.css b/classic/css/buttons/buttons_on_navbar_osx_appearance.css new file mode 100644 index 00000000..16bfbf4e --- /dev/null +++ b/classic/css/buttons/buttons_on_navbar_osx_appearance.css @@ -0,0 +1,108 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +/**************************** +******* BUTTONS ************* +****************************/ + +/*******************************************/ +/* Classic Button ui on navigation toolbar */ +/*******************************************/ + +/* main menu button adjustment */ +#PanelUI-button { + margin-inline-start: 0px !important; + border-inline-start: 0px solid !important; + border-image-slice: 0 !important; + padding-left: 2px !important; + padding-right: 2px !important; +} +#PanelUI-menu-button { + -moz-appearance: unset !important; + background: unset !important; + box-shadow: unset !important; + border-image: unset !important; + border: unset !important; + padding: unset !important; + margin: unset !important; + min-width: unset !important; + width: unset !important; + max-width: unset !important; + min-height: unset !important; + height: unset !important; + max-height: unset !important; +} + +/* back button adjustment */ +#nav-bar #back-button .toolbarbutton-icon { + border: 0 !important; +} + +/* adjust zoom reset and copy buttons position */ +#nav-bar :-moz-any(#copy-button,#zoom-reset-button) { + -moz-margin-start: -1px !important; + -moz-margin-end: -1px !important; +} +#nav-bar :-moz-any(#edit-controls, #zoom-controls) separator { + visibility: collapse !important; +} + +/* classic button style */ +#main-window:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-icon, +#main-window:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-text, +#main-window:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-badge-stack, +#nav-bar toolbarbutton[type="menu-button"] .toolbarbutton-icon, +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-button > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +#nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-text, +#nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-badge-stack, +#nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon { + background: hsla(0,0%,100%,.1) linear-gradient(hsla(0,0%,100%,.3), hsla(0,0%,100%,.5)) !important; + border-color: hsla(0,0%,0%,1.0) !important; + box-shadow: 0 1px 0 hsla(0,0%,100%,.5), + 0 1px 0 hsla(0,0%,100%,.5) inset, + 0 0 0 1px hsla(0,0%,0%,1.0) inset !important; +} +#nav-bar .toolbarbutton-1:not([disabled=true]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text, +#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack, +#nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon { + background-color: rgba(0,0,0,.1) !important; + border-color: hsla(190,50%,65%,.8) hsla(190,50%,50%,.8) hsla(190,50%,40%,.8) !important; + transition: background-color .3s ease-in, + border-color .2s ease-in, + box-shadow .2s ease-in !important; +} +#nav-bar toolbarbutton[type="menu"][open]:not([disabled]) .toolbarbutton-icon, +#nav-bar toolbarbutton[type="menu-button"]:not([open]):hover:not([disabled]):active .toolbarbutton-icon, +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active,:active, [open]) > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-text, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-badge-stack { + background: hsla(0,0%,0%,.02) linear-gradient(hsla(0,0%,0%,.12), hsla(0,0%,0%,0)) border-box !important; + border-color: hsla(0,0%,0%,.3) !important; + box-shadow: 0 1px 0 hsla(0,0%,100%,.5), + 0 1px 0 hsla(0,0%,0%,.05) inset, + 0 1px 1px hsla(0,0%,0%,.2) inset, + 0 0 0 1px hsla(0,0%,0%,.3) inset !important; + transition-duration: 10ms !important; +} +#nav-bar toolbarbutton[disabled=true] > .toolbarbutton-icon { + opacity: .6 !important; +} + +#nav-bar toolbarbutton[disabled=true]{ + opacity: 1.0 !important; +} diff --git a/classic/userChrome.css b/classic/userChrome.css index f77bb462..b5d764d7 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.5.4 ********************************************************************************/ +/* version 1.5.5 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -65,7 +65,9 @@ /* navigation toolbar buttons appearance - only use one at a time *******************************/ @import url(./css/buttons/buttons_on_navbar_classic_appearance.css); /**/ +/* @import url(./css/buttons/buttons_on_navbar_classic_appearance_v2.css); /**/ /* @import url(./css/buttons/buttons_on_navbar_glass_appearance.css); /**/ +/* @import url(./css/buttons/buttons_on_navbar_osx_appearance.css); /**/ /* navigation toolbar buttons - button roundness (edit file to set different roundness) *********/ /* @import url(./css/buttons/buttons_on_navbar_button_roundness.css); /**/ @@ -386,6 +388,9 @@ /* bookmarks toolbar ****************************************************************************/ @import url(./css/toolbars/bookmarks_toolbar_old_height.css); /* @import url(./css/toolbars/bookmarks_toolbar_in_fullscreen_mode.css); /**/ +/* bookmarks toolbar - multiple lines ***********************************************************/ +/* [!] Note: the amount of visible bookmark items is limited internally to ~90-110 bookmarks ****/ +/* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/99 ************************/ /* @import url(./css/toolbars/bookmarks_toolbar_multiple_lines.css); /**/ /* <--- EXPERIMENTAL */ /* toolbar colors - *****************************************************************************/ From e6617ec169fdba72badcccb584b41694512b46f2 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Tue, 16 Jan 2018 13:18:43 +0100 Subject: [PATCH 02/47] 1.5.6 --- classic/css/aboutnewtab/dark_appearance.css | 237 ++++++++++-------- classic/css/buttons/appbutton_in_titlebar.css | 2 +- .../appbutton_in_titlebar_icon_only.css | 2 +- classic/css/tabs/tab_maxwidth.css | 2 +- classic/userChrome.css | 2 +- 5 files changed, 134 insertions(+), 111 deletions(-) diff --git a/classic/css/aboutnewtab/dark_appearance.css b/classic/css/aboutnewtab/dark_appearance.css index 629f3108..7f76c298 100644 --- a/classic/css/aboutnewtab/dark_appearance.css +++ b/classic/css/aboutnewtab/dark_appearance.css @@ -8,115 +8,138 @@ @-moz-document url(about:newtab), url(about:home) { - body { - background-color: #323234 !important; - color: #D1D1D1 !important; - } - #newtab-customize-overlay { - background: #323234 !important; - } - .card, - .prefs-pane .sidebar { - background-color: #2c2c2c !important; /*202020*/ - color: #C4C4C4 !important; - } - .prefs-pane .actions { - background-color: #2c2c2c !important; - border-left: 1px solid #D7D7DB; - } - .prefs-pane .prefs-modal-inner-wrapper .options { - background-color: #2c2c2c !important; /*202020*/ - color: #C4C4C4 !important; - } - .prefs-pane-button button { - border: 1px solid #525A6D !important; - fill: #EEE !important; - } - .prefs-pane-button button:hover { - background-color: #444444 !important; - border: 1px solid #525A6D !important; - } - .prefs-pane-button button:active { - background-color: #323234 !important; - border: 1px solid #525A6D !important; - } - #searchWrapper input, - #newtab-search-container input, - .search-wrapper input { - background: #474749 !important; - color: #FFF !important; - } - .contentSearchHeader, - .contentSearchSuggestionTable, - .contentSearchSettingButton, - .contentSearchHeaderRow { - background: #2c2c2c !important; - color: #FFF !important; - -moz-appearance: none !important; - border-color: transparent !important; - } - .search-wrapper .search-label, - .search-wrapper .search-button { - fill: #EEE !important; - } - .search-wrapper .search-button:focus, - .search-wrapper .search-button:hover { - background-color: #444444 !important; - } - .search-wrapper .search-button:active { - background-color: #323234 !important; - } - .section-top-bar .info-option { - background: #2c2c2c !important; - color: #FFF !important; - -moz-appearance: none !important; - border-color: transparent !important; - } - .context-menu { - background: #2c2c2c !important; - color: #C4C4C4 !important; - -moz-appearance: none !important; - border-color: transparent !important; - } - .separator { - border: 1px solid #525A6D !important; - } + body { + background-color: #323234 !important; + color: #D1D1D1 !important; + } + #newtab-customize-overlay { + background: #323234 !important; + } + .card, + .prefs-pane .sidebar { + background-color: #2c2c2c !important; /*202020*/ + color: #C4C4C4 !important; + } + .prefs-pane .actions { + background-color: #2c2c2c !important; + border-left: 1px solid #D7D7DB; + } + .prefs-pane .prefs-modal-inner-wrapper .options { + background-color: #2c2c2c !important; /*202020*/ + color: #C4C4C4 !important; + } + .prefs-pane-button button { + border: 1px solid #525A6D !important; + fill: #EEE !important; + } + .prefs-pane-button button:hover { + background-color: #444444 !important; + border: 1px solid #525A6D !important; + } + .prefs-pane-button button:active { + background-color: #323234 !important; + border: 1px solid #525A6D !important; + } + #searchWrapper input, + #newtab-search-container input, + .search-wrapper input { + background: #474749 !important; + color: #FFF !important; + } + .contentSearchHeader, + .contentSearchSuggestionTable, + .contentSearchSettingButton, + .contentSearchHeaderRow { + background: #2c2c2c !important; + color: #FFF !important; + -moz-appearance: none !important; + border-color: transparent !important; + } + .search-wrapper .search-label, + .search-wrapper .search-button { + fill: #EEE !important; + } + .search-wrapper .search-button:focus, + .search-wrapper .search-button:hover { + background-color: #444444 !important; + } + .search-wrapper .search-button:active { + background-color: #323234 !important; + } + .section-top-bar .info-option { + background: #2c2c2c !important; + color: #FFF !important; + -moz-appearance: none !important; + border-color: transparent !important; + } + .context-menu { + background: #2c2c2c !important; + color: #C4C4C4 !important; + -moz-appearance: none !important; + border-color: transparent !important; + } + .separator { + border: 1px solid #525A6D !important; + } - #searchIcon, - #searchSubmit, - #newtab-search-icon, - #newtab-customize-button, - #newtab-search-submit, - .icon { - fill: #C4C4C4 !important; - } - #newtab-customize-button { - background-color: #323234 !important; - } + #searchIcon, + #searchSubmit, + #newtab-search-icon, + #newtab-customize-button, + #newtab-search-submit, + .icon { + fill: #C4C4C4 !important; + } + #newtab-customize-button { + background-color: #323234 !important; + } - #monthly-checkbox-container, - #block-snippet-overlay { - color: #FFF !important; - } - #searchSuggestionTable{ - background: #474749 !important; - color: #FFF !important; - } - #onboarding-notification-bar, - #onboarding-notification-bar section, - #snippets-container, - #snippets, - #snippet, - #snippet section{ - background-color: #323234 !important; - color: #FFF !important; - } + #monthly-checkbox-container, + #block-snippet-overlay { + color: #FFF !important; + } + #searchSuggestionTable{ + background: #474749 !important; + color: #FFF !important; + } - #onboarding-notification-close-btn, - .block-snippet-button { - background-color: #C4C4C4 !important; - opacity: 1.0 !important; - border-radius: 100px !important; - } + #snippetContainer, + #defaultSnippets, + #defaultSnippet1, + #defaultSnippet2, + #rightsSnippet, + #onboarding-notification-bar, + #onboarding-notification-bar .onboarding-action-button, + #onboarding-notification-bar section, + #onboarding-notification-body, + #onboarding-notification-tour-title, + #onboarding-notification-tour-message, + #snippets-container, + #snippets, + #snippet, + #snippet section { + background-color: #323234 !important; + color: #FFF !important; + } + + #onboarding-notification-close-btn, + .block-snippet-button { + background-color: #C4C4C4 !important; + opacity: 1.0 !important; + border-radius: 100px !important; + } + + #onboarding-notification-close-btn { + width: 20px !important; + height: 20px !important; + } + + #onboarding-notification-action-btn:hover { + background-color: #444444 !important; + } + + #onboarding-notification-bar { + border-top: 0px !important; + } } \ No newline at end of file diff --git a/classic/css/buttons/appbutton_in_titlebar.css b/classic/css/buttons/appbutton_in_titlebar.css index 03a426cb..46f0dcb3 100644 --- a/classic/css/buttons/appbutton_in_titlebar.css +++ b/classic/css/buttons/appbutton_in_titlebar.css @@ -38,7 +38,7 @@ position: fixed !important; height: 22px !important; margin: 0 !important; - -moz-margin-start: -1px !important; + -moz-margin-start: 0px !important; border: unset !important; box-shadow: unset !important; padding-left: 0px !important; diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only.css b/classic/css/buttons/appbutton_in_titlebar_icon_only.css index dc26438b..21f7a1a0 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only.css @@ -43,7 +43,7 @@ position: fixed !important; height: 22px !important; margin: 0 !important; - -moz-margin-start: -1px !important; + -moz-margin-start: 0px !important; border: unset !important; box-shadow: unset !important; padding-left: 0px !important; diff --git a/classic/css/tabs/tab_maxwidth.css b/classic/css/tabs/tab_maxwidth.css index da5f2a8d..500cbd77 100644 --- a/classic/css/tabs/tab_maxwidth.css +++ b/classic/css/tabs/tab_maxwidth.css @@ -20,7 +20,7 @@ */ /* tab max-width */ -.tabbrowser-tab[fadein]:not([pinned]) { +#tabbrowser-tabs:not([overflow="true"]) .tabbrowser-tab[fadein]:not([pinned]) { max-width: var(--tab_max_width) !important; overflow: hidden !important; } diff --git a/classic/userChrome.css b/classic/userChrome.css index b5d764d7..bde867ee 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.5.5 ********************************************************************************/ +/* version 1.5.6 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* From 72311bd3a4e7335eb49adc25033fb56a13040d6c Mon Sep 17 00:00:00 2001 From: Aris Date: Tue, 16 Jan 2018 13:23:15 +0100 Subject: [PATCH 03/47] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index eb3f3bfe..85754020 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ **[Classic Theme Restorer / Classic Toolbar Buttons / GlassMyFox CSS tweaks for Firefox 57+](https://github.com/Aris-t2/CustomCSSforFx/issues/2)** **[NoiaButtons CSS tweaks for Firefox 57+](https://github.com/Aris-t2/CustomCSSforFx/releases/tag/NoiaButtons)** +**[Custom Scrollbars for Firefox 57+](https://github.com/Aris-t2/Scrollbars)** ## Want to support this project? From 70dbe02f35ce7fc4e97e8d9772159fb4b1d3d61a Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Thu, 18 Jan 2018 18:08:22 +0100 Subject: [PATCH 04/47] 1.5.7 --- classic/css/locationbar/icons_colorized.css | 8 +++----- classic/css/tabs/classic_squared_tabs.css | 14 +++++++++++++- .../css/tabs/classic_squared_tabs_australized.css | 14 +++++++++++++- classic/css/tabs/tab_close_icon_size.css | 3 ++- classic/css/tabs/tabs_below_main_content.css | 2 +- .../css/toolbars/addonbar_content_on_the_right.css | 2 +- .../addonbar_move_bookmarks_toolbar_to_bottom.css | 8 ++++---- .../css/toolbars/addonbar_status_in_addonbar.css | 4 ++-- .../tabs_toolbar_adjustments_macOS_fix.css | 12 ++++++++++++ classic/userChrome.css | 3 ++- 10 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 classic/css/toolbars/tabs_toolbar_adjustments_macOS_fix.css diff --git a/classic/css/locationbar/icons_colorized.css b/classic/css/locationbar/icons_colorized.css index 8fdea890..ae442216 100644 --- a/classic/css/locationbar/icons_colorized.css +++ b/classic/css/locationbar/icons_colorized.css @@ -19,14 +19,12 @@ box-shadow: unset !important; } -/* colorize reader, page action and dropmarker icons */ -#urlbar #reader-mode-button, -#urlbar #pageActionButton, +/* colorize location bar icons (except star button) */ +#urlbar :-moz-any(#reader-mode-button,#pageActionButton, #pageAction-urlbar-emailLink,#pageAction-urlbar-sendToDevice,#pageAction-urlbar-screenshots,#pageAction-urlbar-copyURL), #urlbar .urlbar-history-dropmarker { fill: blue !important; } -#urlbar #reader-mode-button:-moz-any(:hover,:hover:active,[open]), -#urlbar #pageActionButton:-moz-any(:hover,:hover:active,[open]), +#urlbar :-moz-any(#reader-mode-button,#pageActionButton, #pageAction-urlbar-emailLink,#pageAction-urlbar-sendToDevice,#pageAction-urlbar-screenshots,#pageAction-urlbar-copyURL):-moz-any(:hover,:hover:active,[open]), #urlbar .urlbar-history-dropmarker:-moz-any(:hover,:hover:active,[open]) { fill: #2558ff !important; } diff --git a/classic/css/tabs/classic_squared_tabs.css b/classic/css/tabs/classic_squared_tabs.css index 5b77f42f..6e741fed 100644 --- a/classic/css/tabs/classic_squared_tabs.css +++ b/classic/css/tabs/classic_squared_tabs.css @@ -248,14 +248,26 @@ .tabbrowser-tab:not([pinned]) .close-icon > .toolbarbutton-icon { width: 16px !important; height: 16px !important; - -moz-margin-end:-4px !important; } +.tabbrowser-tab:not([pinned]) .tab-content .close-icon, +:root[uidensity=touch] .tabbrowser-tab:not([pinned]) .tab-content .close-icon { + width: 16px !important; + height: 16px !important; + -moz-margin-end: -6px !important; +} + +:root[uidensity=touch] .tabbrowser-tab:not([pinned]) .tab-content .close-icon, :root[uidensity=touch] .tabbrowser-tab:not([pinned]) .close-icon > .toolbarbutton-icon { margin-top: -8px !important; margin-bottom: -8px !important; } +:root[uidensity=touch] .tabbrowser-tab:not([pinned]) .tab-close-button { + margin-inline-end: unset !important; + padding: unset !important; +} + /*tab favicon position*/ .tabbrowser-tab:not([pinned]):not([locked]) .tab-throbber, .tabbrowser-tab:not([pinned]) .tab-icon-image{ diff --git a/classic/css/tabs/classic_squared_tabs_australized.css b/classic/css/tabs/classic_squared_tabs_australized.css index e10ff5d5..25907b86 100644 --- a/classic/css/tabs/classic_squared_tabs_australized.css +++ b/classic/css/tabs/classic_squared_tabs_australized.css @@ -223,14 +223,26 @@ .tabbrowser-tab:not([pinned]) .close-icon > .toolbarbutton-icon { width: 16px !important; height: 16px !important; - -moz-margin-end:-4px !important; } +.tabbrowser-tab:not([pinned]) .tab-content .close-icon, +:root[uidensity=touch] .tabbrowser-tab:not([pinned]) .tab-content .close-icon { + width: 16px !important; + height: 16px !important; + -moz-margin-end: -6px !important; +} + +:root[uidensity=touch] .tabbrowser-tab:not([pinned]) .tab-content .close-icon, :root[uidensity=touch] .tabbrowser-tab:not([pinned]) .close-icon > .toolbarbutton-icon { margin-top: -8px !important; margin-bottom: -8px !important; } +:root[uidensity=touch] .tabbrowser-tab:not([pinned]) .tab-close-button { + margin-inline-end: unset !important; + padding: unset !important; +} + /*tab favicon position*/ .tabbrowser-tab:not([pinned]):not([locked]) .tab-throbber, .tabbrowser-tab:not([pinned]) .tab-icon-image{ diff --git a/classic/css/tabs/tab_close_icon_size.css b/classic/css/tabs/tab_close_icon_size.css index 89d60a72..4ac9352d 100644 --- a/classic/css/tabs/tab_close_icon_size.css +++ b/classic/css/tabs/tab_close_icon_size.css @@ -13,7 +13,8 @@ #main-window #navigator-toolbox #TabsToolbar #closetab_fmarin_com-browser-action .toolbarbutton-icon, #main-window #navigator-toolbox #TabsToolbar #_fe8cab45-aaee-45f8-8765-781e0ebea300_-browser-action .toolbarbutton-icon, -#main-window #navigator-toolbox #TabsToolbar .close-icon > .toolbarbutton-icon { +#main-window #navigator-toolbox #TabsToolbar .close-icon > .toolbarbutton-icon, +#main-window #navigator-toolbox #TabsToolbar .tab-content .close-icon { min-width: var(--tab_close_icons_size) !important; width: var(--tab_close_icons_size) !important; min-height: var(--tab_close_icons_size) !important; diff --git a/classic/css/tabs/tabs_below_main_content.css b/classic/css/tabs/tabs_below_main_content.css index e8a2248f..15693408 100644 --- a/classic/css/tabs/tabs_below_main_content.css +++ b/classic/css/tabs/tabs_below_main_content.css @@ -79,7 +79,7 @@ } /* lw-theme */ -#browser-panel > #navigator-toolbox > #TabsToolbar:-moz-lwtheme { +#navigator-toolbox > #TabsToolbar:-moz-lwtheme { background-repeat: no-repeat !important; background-position: bottom left !important; background-color: var(--toolbar-bgcolor) !important; diff --git a/classic/css/toolbars/addonbar_content_on_the_right.css b/classic/css/toolbars/addonbar_content_on_the_right.css index dcb4ead8..9f329dd7 100644 --- a/classic/css/toolbars/addonbar_content_on_the_right.css +++ b/classic/css/toolbars/addonbar_content_on_the_right.css @@ -8,7 +8,7 @@ /* move content to the right */ -#main-window:not([chromehidden*="toolbar"]) #browser-panel > #navigator-toolbox > #PersonalToolbar { +#main-window:not([chromehidden*="toolbar"]) #navigator-toolbox > #PersonalToolbar { direction: rtl !important; } #PersonalToolbar toolbarbutton { diff --git a/classic/css/toolbars/addonbar_move_bookmarks_toolbar_to_bottom.css b/classic/css/toolbars/addonbar_move_bookmarks_toolbar_to_bottom.css index 72476e00..c5e2478a 100644 --- a/classic/css/toolbars/addonbar_move_bookmarks_toolbar_to_bottom.css +++ b/classic/css/toolbars/addonbar_move_bookmarks_toolbar_to_bottom.css @@ -47,7 +47,7 @@ } /* move bookmarks toolbar to bottom + style bookmarks toolbar */ -#main-window:not([chromehidden*="toolbar"]) #browser-panel > #navigator-toolbox > #PersonalToolbar { +#main-window:not([chromehidden*="toolbar"]) #navigator-toolbox > #PersonalToolbar { -moz-window-dragging: no-drag; display: block !important; position: fixed !important; @@ -58,7 +58,7 @@ -moz-padding-end: 1px !important; border-top: 1px solid var(--toolbox-border-bottom-color) !important; } -#browser-panel > #navigator-toolbox > #PersonalToolbar:-moz-lwtheme { +#navigator-toolbox > #PersonalToolbar:-moz-lwtheme { background-repeat: no-repeat !important; background-position: bottom left !important; background-color: var(--toolbar-bgcolor) !important; @@ -128,10 +128,10 @@ /* icon shadows for dark and light themes */ /* -#main-window[lwthemetextcolor=bright] #browser-panel > #navigator-toolbox > #PersonalToolbar > .webextension-browser-action > .toolbarbutton-badge-stack { +#main-window[lwthemetextcolor=bright] #navigator-toolbox > #PersonalToolbar > .webextension-browser-action > .toolbarbutton-badge-stack { filter: drop-shadow(1px 1px 0.5px #bbb) drop-shadow(-1px -1px 0.5px #bbb) drop-shadow(-1px 1px 0.5px #bbb) drop-shadow(1px -1px 0.5px #bbb); } -#main-window[lwthemetextcolor=dark] #browser-panel > #navigator-toolbox > #PersonalToolbar > .webextension-browser-action > .toolbarbutton-badge-stack { +#main-window[lwthemetextcolor=dark] #navigator-toolbox > #PersonalToolbar > .webextension-browser-action > .toolbarbutton-badge-stack { filter: drop-shadow(1px 1px 1px #222); } /**/ \ No newline at end of file diff --git a/classic/css/toolbars/addonbar_status_in_addonbar.css b/classic/css/toolbars/addonbar_status_in_addonbar.css index 6cd747fb..8218367b 100644 --- a/classic/css/toolbars/addonbar_status_in_addonbar.css +++ b/classic/css/toolbars/addonbar_status_in_addonbar.css @@ -37,9 +37,9 @@ statuspanel:-moz-lwtheme-brighttext .statuspanel-label { } /* add space for status text on add-on bar */ -#main-window:not([chromehidden*="toolbar"]) #browser-panel > #navigator-toolbox > #PersonalToolbar { +#main-window:not([chromehidden*="toolbar"]) #navigator-toolbox > #PersonalToolbar { padding-left: 400px !important; } -#main-window:not([chromehidden*="toolbar"]) #browser-panel > #navigator-toolbox > #PersonalToolbar:-moz-locale-dir(rtl) { +#main-window:not([chromehidden*="toolbar"]) #navigator-toolbox > #PersonalToolbar:-moz-locale-dir(rtl) { padding-right: 400px !important; } diff --git a/classic/css/toolbars/tabs_toolbar_adjustments_macOS_fix.css b/classic/css/toolbars/tabs_toolbar_adjustments_macOS_fix.css new file mode 100644 index 00000000..06793c69 --- /dev/null +++ b/classic/css/toolbars/tabs_toolbar_adjustments_macOS_fix.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 (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +#TabsToolbar .titlebar-placeholder[type="caption-buttons"] { + -moz-margin-start: 20px !important; +} diff --git a/classic/userChrome.css b/classic/userChrome.css index bde867ee..e6a2d04b 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.5.6 ********************************************************************************/ +/* version 1.5.7 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -374,6 +374,7 @@ /* general toolbar settings *********************************************************************/ @import url(./css/toolbars/toolbars_old_padding.css); /**/ @import url(./css/toolbars/tabs_toolbar_adjustments.css); /**/ +/* @import url(./css/toolbars/tabs_toolbar_adjustments_macOS_fix.css); /**/ /* <-- macOS fix */ /* @import url(./css/toolbars/navbar_more_compact_mode.css); /**/ /* edit target file to select which items to hide ***********************************************/ From 034dd3ccffee50fbbe1712ac38cc805f8c81bed5 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Sat, 20 Jan 2018 21:49:33 +0100 Subject: [PATCH 05/47] 1.5.8 --- classic/config/color_variables.css | 14 +++--- classic/config/color_variables_aero.css | 14 +++--- classic/config/color_variables_aeroglass.css | 18 ++++---- .../config/color_variables_classic-grey.css | 14 +++--- classic/config/color_variables_fx3.css | 14 +++--- .../config/color_variables_transparent.css | 14 +++--- .../addonlists_move_button_to_start.css | 23 ++++++++++ .../appbutton_in_titlebar_fx58_fix.css | 11 +++++ ...tton_popup_classic_appearance_fx58_fix.css | 19 ++++++++ ...labels_with_and_without_icons_fx58_fix.css | 13 ++++++ classic/css/tabs/classic_squared_tabs.css | 29 ++++++------ .../tabs/classic_squared_tabs_australized.css | 21 ++++----- .../tabs/classic_squared_tabs_fx58_fix.css | 13 ++++++ .../tabs/tabs_below_navigation_toolbar.css | 7 +-- ...elow_navigation_toolbar_fx58_fix_win10.css | 15 +++++++ ...on_toolbar_fx58_fix_win7_classic_theme.css | 44 +++++++++++++++++++ ...on_toolbar_fx58_fix_win7_default_theme.css | 12 +++++ .../css/toolbars/general_toolbar_colors.css | 5 +-- ..._icons_and_text_and_text_only_fx58_fix.css | 18 ++++++++ classic/userChrome.css | 25 ++++++++++- classic/userContent.css | 1 + 21 files changed, 275 insertions(+), 69 deletions(-) create mode 100644 classic/css/aboutaddons/addonlists_move_button_to_start.css create mode 100644 classic/css/buttons/appbutton_in_titlebar_fx58_fix.css create mode 100644 classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css create mode 100644 classic/css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css create mode 100644 classic/css/tabs/classic_squared_tabs_fx58_fix.css create mode 100644 classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css create mode 100644 classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css create mode 100644 classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.css create mode 100644 classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_fx58_fix.css diff --git a/classic/config/color_variables.css b/classic/config/color_variables.css index 18018ac3..c2fb8ff3 100644 --- a/classic/config/color_variables.css +++ b/classic/config/color_variables.css @@ -12,9 +12,10 @@ --general_toolbar_color_toolbars: linear-gradient(#f9f9fa,#f9f9fa) !important; --general_toolbar_color_navbar: linear-gradient(#f9f9fa,#f9f9fa) !important; --general_toolbar_text_color: inherit !important; - --general_toolbar_text_shadow: unset !important; + --general_toolbar_text_shadow: transparent !important; --tabs_toolbar_color_tabs_not_on_top: linear-gradient(#f9f9fa,#f9f9fa) !important; - --tabs_toolbar_border-tnot_normal_mode: 1px solid var(--tabs-border-color) !important; + --tabs_toolbar_border-tnot_normal_mode_size: 1px !important; + --tabs_toolbar_border-tnot_normal_mode: var(--tabs-border-color) !important; --colored_menubar_background_image: linear-gradient(#f9f9fa,#f9f9fa) !important; --colored_menubar_text_color: black !important; --classic_squared_tabs_active_tab: linear-gradient(to top,#f9f9fa,#f9f9fa,#f9f9fa) !important; @@ -22,12 +23,13 @@ --classic_squared_tabs_other_tabs: linear-gradient(to top,#aeaba5,#c1beb7,#c9c6be) !important; --classic_squared_tabs_unloaded_tabs: linear-gradient(to top,#aeaba5,#c1beb7,#c9c6be) !important; --classic_squared_tabs_unread_tabs: linear-gradient(to top,#aeaba5,#c1beb7,#c9c6be) !important; - --classic_squared_tabs-border1: 1px solid #5f7181 !important; - --classic_squared_tabs-border2: 1px solid rgba(0,0,0,.2) !important; - --classic_squared_tabs-border3: 1px solid rgba(0,0,0,.5) !important; + --classic_squared_tabs-border_size: 1px; + --classic_squared_tabs-border1: #5f7181 !important; + --classic_squared_tabs-border2: rgba(0,0,0,.2) !important; + --classic_squared_tabs-border3: rgba(0,0,0,.5) !important; --classic_squared_tabs_new_tab_icon_color: black !important; --classic_squared_tabs_tab_text_color: black !important; - --classic_squared_tabs_tab_text_shadow: unset !important; + --classic_squared_tabs_tab_text_shadow: transparent !important; --classic_squared_tabs_lwt-dark_hovered_tabs: linear-gradient(hsla(0,0%,80%,.5), hsla(0,0%,60%,.5) 80%) !important; --classic_squared_tabs_lwt-dark_other_tabs: linear-gradient(hsla(0,0%,60%,.5), hsla(0,0%,45%,.5) 80%) !important; --classic_squared_tabs_lwt-bright_hovered_tabs: linear-gradient(hsla(0,0%,60%,.6), hsla(0,0%,45%,.6) 80%) !important; diff --git a/classic/config/color_variables_aero.css b/classic/config/color_variables_aero.css index f44ee31e..f38cf086 100644 --- a/classic/config/color_variables_aero.css +++ b/classic/config/color_variables_aero.css @@ -12,9 +12,10 @@ --general_toolbar_color_toolbars: linear-gradient(#ddebf9,#ddebf9) !important; --general_toolbar_color_navbar: linear-gradient(#eaf2fb,#ddebf9) !important; --general_toolbar_text_color: black !important; - --general_toolbar_text_shadow: unset !important; + --general_toolbar_text_shadow: transparent !important; --tabs_toolbar_color_tabs_not_on_top: linear-gradient(#ddebf9,#ddebf9) !important; - --tabs_toolbar_border-tnot_normal_mode: 1px solid var(--tabs-border-color) !important; + --tabs_toolbar_border-tnot_normal_mode_size: 1px !important; + --tabs_toolbar_border-tnot_normal_mode: var(--tabs-border-color) !important; --colored_menubar_background_image: linear-gradient(#ddebf9,#ddebf9) !important; --colored_menubar_text_color: black !important; --classic_squared_tabs_active_tab: linear-gradient(to top,#eaf2fb,#eef5fc,#fbfdff) !important; @@ -22,12 +23,13 @@ --classic_squared_tabs_other_tabs: linear-gradient(to top,#b4c0cc,#c8d4e1,#d1deec) !important; --classic_squared_tabs_unloaded_tabs: linear-gradient(to top,#b4c0cc,#c8d4e1,#d1deec) !important; --classic_squared_tabs_unread_tabs: linear-gradient(to top,#b4c0cc,#c8d4e1,#d1deec) !important; - --classic_squared_tabs-border1: 1px solid #5f7181 !important; - --classic_squared_tabs-border2: 1px solid rgba(0,0,0,.2) !important; - --classic_squared_tabs-border3: 1px solid rgba(0,0,0,.5) !important; + --classic_squared_tabs-border_size: 1px; + --classic_squared_tabs-border1: #5f7181 !important; + --classic_squared_tabs-border2: rgba(0,0,0,.2) !important; + --classic_squared_tabs-border3: rgba(0,0,0,.5) !important; --classic_squared_tabs_new_tab_icon_color: black !important; --classic_squared_tabs_tab_text_color: black !important; - --classic_squared_tabs_tab_text_shadow: unset !important; + --classic_squared_tabs_tab_text_shadow: transparent !important; --classic_squared_tabs_lwt-dark_hovered_tabs: linear-gradient(hsla(0,0%,80%,.5), hsla(0,0%,60%,.5) 80%) !important; --classic_squared_tabs_lwt-dark_other_tabs: linear-gradient(hsla(0,0%,60%,.5), hsla(0,0%,45%,.5) 80%) !important; --classic_squared_tabs_lwt-bright_hovered_tabs: linear-gradient(hsla(0,0%,60%,.6), hsla(0,0%,45%,.6) 80%) !important; diff --git a/classic/config/color_variables_aeroglass.css b/classic/config/color_variables_aeroglass.css index 85c90547..ab11e29b 100644 --- a/classic/config/color_variables_aeroglass.css +++ b/classic/config/color_variables_aeroglass.css @@ -9,12 +9,13 @@ /* AeroGlass colors */ :root { - --general_toolbar_color_toolbars: unset !important; - --general_toolbar_color_navbar: unset !important; + --general_toolbar_color_toolbars: none !important; + --general_toolbar_color_navbar: none !important; --general_toolbar_text_color: white !important; - --general_toolbar_text_shadow: 1px 1px 1px black !important; + --general_toolbar_text_shadow: black !important; --tabs_toolbar_color_tabs_not_on_top: unset !important; - --tabs_toolbar_border-tnot_normal_mode: 0px !important; + --tabs_toolbar_border-tnot_normal_mode_size: 0px !important; + --tabs_toolbar_border-tnot_normal_mode: var(--tabs-border-color) !important; --colored_menubar_background_image: unset !important; --colored_menubar_text_color: white !important; --classic_squared_tabs_active_tab: linear-gradient(to top,rgba(255,255,255,.0),rgba(255,255,255,.7)) !important; @@ -22,12 +23,13 @@ --classic_squared_tabs_other_tabs: linear-gradient(to top,rgba(255,255,255,.0),rgba(255,255,255,.2)) !important; --classic_squared_tabs_unloaded_tabs: linear-gradient(to top,rgba(255,255,255,.0),rgba(255,255,255,.2)) !important; --classic_squared_tabs_unread_tabs: linear-gradient(to top,rgba(255,255,255,.0),rgba(255,255,255,.2)) !important; - --classic_squared_tabs-border1: 1px solid rgba(0,0,0,.0) !important; - --classic_squared_tabs-border2: 1px solid rgba(0,0,0,.0) !important; - --classic_squared_tabs-border3: 1px solid rgba(0,0,0,.0) !important; + --classic_squared_tabs-border_size: 1px; + --classic_squared_tabs-border1: rgba(0,0,0,.0) !important; + --classic_squared_tabs-border2: rgba(0,0,0,.0) !important; + --classic_squared_tabs-border3: rgba(0,0,0,.0) !important; --classic_squared_tabs_new_tab_icon_color: white !important; --classic_squared_tabs_tab_text_color: white !important; - --classic_squared_tabs_tab_text_shadow: 1px 1px 1px black !important; + --classic_squared_tabs_tab_text_shadow: black !important; --classic_squared_tabs_lwt-dark_hovered_tabs: linear-gradient(hsla(0,0%,80%,.5), hsla(0,0%,60%,.5) 80%) !important; --classic_squared_tabs_lwt-dark_other_tabs: linear-gradient(hsla(0,0%,60%,.5), hsla(0,0%,45%,.5) 80%) !important; --classic_squared_tabs_lwt-bright_hovered_tabs: linear-gradient(hsla(0,0%,60%,.6), hsla(0,0%,45%,.6) 80%) !important; diff --git a/classic/config/color_variables_classic-grey.css b/classic/config/color_variables_classic-grey.css index e1018681..203e4c44 100644 --- a/classic/config/color_variables_classic-grey.css +++ b/classic/config/color_variables_classic-grey.css @@ -12,9 +12,10 @@ --general_toolbar_color_toolbars: linear-gradient(#d4d0c8,#d4d0c8) !important; --general_toolbar_color_navbar: linear-gradient(#d4d0c8,#d4d0c8) !important; --general_toolbar_text_color: black !important; - --general_toolbar_text_shadow: unset !important; + --general_toolbar_text_shadow: transparent !important; --tabs_toolbar_color_tabs_not_on_top: linear-gradient(#d4d0c8,#d4d0c8) !important; - --tabs_toolbar_border-tnot_normal_mode: 0px !important; + --tabs_toolbar_border-tnot_normal_mode_size: 0px !important; + --tabs_toolbar_border-tnot_normal_mode: var(--tabs-border-color) !important; --colored_menubar_background_image: linear-gradient(#d4d0c8,#d4d0c8) !important; --colored_menubar_text_color: black !important; --classic_squared_tabs_active_tab: linear-gradient(to top,#d4d0c8,#e6e4df,#f1efed) !important; @@ -22,12 +23,13 @@ --classic_squared_tabs_other_tabs: linear-gradient(to top,#aeaba5,#c2bfb8,#c9c6be) !important; --classic_squared_tabs_unloaded_tabs: linear-gradient(to top,#aeaba5,#c2bfb8,#c9c6be) !important; --classic_squared_tabs_unread_tabs: linear-gradient(to top,#aeaba5,#c2bfb8,#c9c6be) !important; - --classic_squared_tabs-border1: 1px solid #5f7181 !important; - --classic_squared_tabs-border2: 1px solid rgba(0,0,0,.2) !important; - --classic_squared_tabs-border3: 1px solid rgba(0,0,0,.5) !important; + --classic_squared_tabs-border_size: 1px; + --classic_squared_tabs-border1: #5f7181 !important; + --classic_squared_tabs-border2: rgba(0,0,0,.2) !important; + --classic_squared_tabs-border3: rgba(0,0,0,.5) !important; --classic_squared_tabs_new_tab_icon_color: black !important; --classic_squared_tabs_tab_text_color: black !important; - --classic_squared_tabs_tab_text_shadow: unset !important; + --classic_squared_tabs_tab_text_shadow: transparent !important; --classic_squared_tabs_lwt-dark_hovered_tabs: linear-gradient(hsla(0,0%,80%,.5), hsla(0,0%,60%,.5) 80%) !important; --classic_squared_tabs_lwt-dark_other_tabs: linear-gradient(hsla(0,0%,60%,.5), hsla(0,0%,45%,.5) 80%) !important; --classic_squared_tabs_lwt-bright_hovered_tabs: linear-gradient(hsla(0,0%,60%,.6), hsla(0,0%,45%,.6) 80%) !important; diff --git a/classic/config/color_variables_fx3.css b/classic/config/color_variables_fx3.css index fff0e1b6..6889f689 100644 --- a/classic/config/color_variables_fx3.css +++ b/classic/config/color_variables_fx3.css @@ -12,9 +12,10 @@ --general_toolbar_color_toolbars: linear-gradient(#d3daed,#d3daed) !important; --general_toolbar_color_navbar: linear-gradient(#d3daed,#d3daed) !important; --general_toolbar_text_color: black !important; - --general_toolbar_text_shadow: unset !important; + --general_toolbar_text_shadow: transparent !important; --tabs_toolbar_color_tabs_not_on_top: linear-gradient(to top, #e9ecfa,#d0d7ec,#e3e8f4,#ffffff) !important; - --tabs_toolbar_border-tnot_normal_mode: 1px solid var(--tabs-border-color) !important; + --tabs_toolbar_border-tnot_normal_mode_size: 1px !important; + --tabs_toolbar_border-tnot_normal_mode: var(--tabs-border-color) !important; --colored_menubar_background_image: linear-gradient(to top,#d3daed,#d3daed,#e5eaf5,#fefeff) !important; --colored_menubar_text_color: black !important; --classic_squared_tabs_active_tab: linear-gradient(to top,#ededed,#e8e8e8,#efefef,#fafafa) !important; @@ -22,12 +23,13 @@ --classic_squared_tabs_other_tabs: linear-gradient(to top,#e1e3f0,#c6cddd,#dbdfe9,#ececef) !important; --classic_squared_tabs_unloaded_tabs: linear-gradient(to top,#e1e3f0,#c6cddd,#dbdfe9,#ececef) !important; --classic_squared_tabs_unread_tabs: linear-gradient(to top,#e1e3f0,#c6cddd,#dbdfe9,#ececef) !important; - --classic_squared_tabs-border1: 1px solid #5f7181 !important; - --classic_squared_tabs-border2: 1px solid rgba(0,0,0,.2) !important; - --classic_squared_tabs-border3: 1px solid rgba(0,0,0,.5) !important; + --classic_squared_tabs-border_size: 1px; + --classic_squared_tabs-border1: #5f7181 !important; + --classic_squared_tabs-border2: rgba(0,0,0,.2) !important; + --classic_squared_tabs-border3: rgba(0,0,0,.5) !important; --classic_squared_tabs_new_tab_icon_color: grey !important; --classic_squared_tabs_tab_text_color: black !important; - --classic_squared_tabs_tab_text_shadow: unset !important; + --classic_squared_tabs_tab_text_shadow: transparent !important; --classic_squared_tabs_lwt-dark_hovered_tabs: linear-gradient(hsla(0,0%,80%,.5), hsla(0,0%,60%,.5) 80%) !important; --classic_squared_tabs_lwt-dark_other_tabs: linear-gradient(hsla(0,0%,60%,.5), hsla(0,0%,45%,.5) 80%) !important; --classic_squared_tabs_lwt-bright_hovered_tabs: linear-gradient(hsla(0,0%,60%,.6), hsla(0,0%,45%,.6) 80%) !important; diff --git a/classic/config/color_variables_transparent.css b/classic/config/color_variables_transparent.css index e389a1ca..0c438fe3 100644 --- a/classic/config/color_variables_transparent.css +++ b/classic/config/color_variables_transparent.css @@ -12,9 +12,10 @@ --general_toolbar_color_toolbars: linear-gradient(rgba(255,255,255,.4),rgba(255,255,255,.4)) !important; --general_toolbar_color_navbar: linear-gradient(rgba(255,255,255,.4),rgba(255,255,255,.4)) !important; --general_toolbar_text_color: white !important; - --general_toolbar_text_shadow: 1px 1px 1px black !important; + --general_toolbar_text_shadow: black !important; --tabs_toolbar_color_tabs_not_on_top: linear-gradient(rgba(255,255,255,.4),rgba(255,255,255,.4)) !important; - --tabs_toolbar_border-tnot_normal_mode: 0px !important; + --tabs_toolbar_border-tnot_normal_mode_size: 0px !important; + --tabs_toolbar_border-tnot_normal_mode: var(--tabs-border-color) !important; --colored_menubar_background_image: linear-gradient(rgba(255,255,255,.4),rgba(255,255,255,.4)) !important; --colored_menubar_text_color: white !important; --classic_squared_tabs_active_tab: linear-gradient(to top,rgba(255,255,255,.4),rgba(255,255,255,.9)) !important; @@ -22,12 +23,13 @@ --classic_squared_tabs_other_tabs: linear-gradient(to top,rgba(255,255,255,.1),rgba(255,255,255,.4)) !important; --classic_squared_tabs_unloaded_tabs: linear-gradient(to top,rgba(255,255,255,.1),rgba(255,255,255,.4)) !important; --classic_squared_tabs_unread_tabs: linear-gradient(to top,rgba(255,255,255,.1),rgba(255,255,255,.4)) !important; - --classic_squared_tabs-border1: 1px solid rgba(0,0,0,.0) !important; - --classic_squared_tabs-border2: 1px solid rgba(0,0,0,.0) !important; - --classic_squared_tabs-border3: 1px solid rgba(0,0,0,.0) !important; + --classic_squared_tabs-border_size: 1px; + --classic_squared_tabs-border1: rgba(0,0,0,.0) !important; + --classic_squared_tabs-border2: rgba(0,0,0,.0) !important; + --classic_squared_tabs-border3: rgba(0,0,0,.0) !important; --classic_squared_tabs_new_tab_icon_color: white !important; --classic_squared_tabs_tab_text_color: white !important; - --classic_squared_tabs_tab_text_shadow: 1px 1px 1px black !important; + --classic_squared_tabs_tab_text_shadow: black !important; --classic_squared_tabs_lwt-dark_hovered_tabs: linear-gradient(hsla(0,0%,80%,.5), hsla(0,0%,60%,.5) 80%) !important; --classic_squared_tabs_lwt-dark_other_tabs: linear-gradient(hsla(0,0%,60%,.5), hsla(0,0%,45%,.5) 80%) !important; --classic_squared_tabs_lwt-bright_hovered_tabs: linear-gradient(hsla(0,0%,60%,.6), hsla(0,0%,45%,.6) 80%) !important; diff --git a/classic/css/aboutaddons/addonlists_move_button_to_start.css b/classic/css/aboutaddons/addonlists_move_button_to_start.css new file mode 100644 index 00000000..aada29d6 --- /dev/null +++ b/classic/css/aboutaddons/addonlists_move_button_to_start.css @@ -0,0 +1,23 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + +@-moz-document url-prefix(chrome://mozapps/content/extensions/extensions.xul), url-prefix(about:addons) { + + .content-container .icon-container{ + -moz-box-ordinal-group: 0 !important; + } + + .content-container .status-control-wrapper{ + -moz-box-ordinal-group: 1 !important; + } + + .content-container .content-inner-container{ + -moz-box-ordinal-group: 2 !important; + } + +} \ No newline at end of file diff --git a/classic/css/buttons/appbutton_in_titlebar_fx58_fix.css b/classic/css/buttons/appbutton_in_titlebar_fx58_fix.css new file mode 100644 index 00000000..11b7d2bb --- /dev/null +++ b/classic/css/buttons/appbutton_in_titlebar_fx58_fix.css @@ -0,0 +1,11 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + +#main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { + top: 2px !important; +} diff --git a/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css b/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css new file mode 100644 index 00000000..81a0e157 --- /dev/null +++ b/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css @@ -0,0 +1,19 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + +#BMB_bookmarksPopup menupopup, +#BMB_bookmarksPopup .panel-arrowcontent { + background: -moz-Dialog !important; +} +#BMB_bookmarksPopup .menu-iconic-left { + -moz-margin-start: 3px !important; + -moz-margin-end: 3px !important; +} +#BMB_bookmarksPopup :-moz-any(menu,menuitem):-moz-any(:hover,:active) { + color: HighlightText !important; +} diff --git a/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css new file mode 100644 index 00000000..9e2eda88 --- /dev/null +++ b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css @@ -0,0 +1,13 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +:-moz-any(#context-back,#context-forward,#context-reload,#context-stop,#context-bookmarkpage) image { + -moz-margin-start: 0px !important; + -moz-margin-end: 2px !important; +} diff --git a/classic/css/tabs/classic_squared_tabs.css b/classic/css/tabs/classic_squared_tabs.css index 6e741fed..3d5cbe57 100644 --- a/classic/css/tabs/classic_squared_tabs.css +++ b/classic/css/tabs/classic_squared_tabs.css @@ -19,13 +19,14 @@ --classic_squared_tabs_lwt-dark_other_tabs: linear-gradient(hsla(0,0%,60%,.5), hsla(0,0%,45%,.5) 80%); --classic_squared_tabs_lwt-bright_hovered_tabs: linear-gradient(hsla(0,0%,60%,.6), hsla(0,0%,45%,.6) 80%); --classic_squared_tabs_lwt-bright_other_tabs: linear-gradient(hsla(0,0%,40%,.6), hsla(0,0%,30%,.6) 80%); - --classic_squared_tabs-border1: 1px solid #5f7181; - --classic_squared_tabs-border2: 1px solid rgba(0,0,0,.2); - --classic_squared_tabs-border3: 1px solid rgba(0,0,0,.5); + --classic_squared_tabs-border_size: 1px; + --classic_squared_tabs-border1: #5f7181; + --classic_squared_tabs-border2: rgba(0,0,0,.2); + --classic_squared_tabs-border3: rgba(0,0,0,.5); --classic_squared_tabs-border-radius: 3px; --classic_squared_tabs_new_tab_icon_color: black; --classic_squared_tabs_tab_text_color: black; - --classic_squared_tabs_tab_text_shadow: unset; + --classic_squared_tabs_tab_text_shadow: transparent; --mltabs-newtab-height: calc( var(--classic_squared_tabs_tab_height) + 1px ) !important; @@ -54,7 +55,7 @@ /* black tab text color */ #TabsToolbar:not(:-moz-lwtheme) .tabbrowser-tab { color: var(--classic_squared_tabs_tab_text_color) !important; - text-shadow: var(--classic_squared_tabs_tab_text_shadow) !important; + text-shadow: 1px 1px 1px var(--classic_squared_tabs_tab_text_shadow) !important; } /* default tabs color */ @@ -85,21 +86,21 @@ /* tab border color */ #TabsToolbar:not(:-moz-lwtheme) .tabs-newtab-button, #TabsToolbar:not(:-moz-lwtheme) .tabbrowser-tab .tab-content { - border-top: var(--classic_squared_tabs-border1) !important; - border-left: var(--classic_squared_tabs-border1) !important; - border-right: var(--classic_squared_tabs-border1) !important; + border-top: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border1) !important; + border-left: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border1) !important; + border-right: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border1) !important; } #TabsToolbar .tabs-newtab-button { - border-top: var(--classic_squared_tabs-border2) !important; - border-left: var(--classic_squared_tabs-border2) !important; - border-right: var(--classic_squared_tabs-border2) !important; + border-top: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border2) !important; + border-left: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border2) !important; + border-right: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border2) !important; } #TabsToolbar .tabbrowser-tab:not(:-moz-lwtheme):not([selected]) .tab-content { - border-top: var(--classic_squared_tabs-border3) !important; - border-left: var(--classic_squared_tabs-border3) !important; - border-right: var(--classic_squared_tabs-border3) !important; + border-top: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border3) !important; + border-left: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border3) !important; + border-right: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border3) !important; } /* new tab icon color */ diff --git a/classic/css/tabs/classic_squared_tabs_australized.css b/classic/css/tabs/classic_squared_tabs_australized.css index 25907b86..7edd8e4f 100644 --- a/classic/css/tabs/classic_squared_tabs_australized.css +++ b/classic/css/tabs/classic_squared_tabs_australized.css @@ -11,7 +11,8 @@ --classic_squared_tabs_tab_height: 26px; --classic_squared_tabs_tab_default_loading_icon_color: #0A84FF; --classic_squared_tabs_active_tab: linear-gradient(to top,#f9f9fa,#f9f9fa,#f9f9fa); - --classic_squared_tabs-border1: 1px solid #5f7181; + --classic_squared_tabs-border_size: 1px; + --classic_squared_tabs-border1: #5f7181; --classic_squared_tabs-border-radius: 3px; --mltabs-newtab-height: calc( var(--classic_squared_tabs_tab_height) + 1px ); @@ -72,21 +73,21 @@ /* tab border color */ #TabsToolbar:not(:-moz-lwtheme) .tabs-newtab-button:hover, #TabsToolbar:not(:-moz-lwtheme) .tabbrowser-tab .tab-content { - border-top: var(--classic_squared_tabs-border1) !important; - border-left: var(--classic_squared_tabs-border1) !important; - border-right: var(--classic_squared_tabs-border1) !important; + border-top: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border1) !important; + border-left: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border1) !important; + border-right: var(--classic_squared_tabs-border_size) solid var(--classic_squared_tabs-border1) !important; } #TabsToolbar .tabs-newtab-button { - border-top: 1px solid transparent !important; - border-left: 1px solid transparent !important; - border-right: 1px solid transparent !important; + border-top: var(--classic_squared_tabs-border_size) solid transparent !important; + border-left: var(--classic_squared_tabs-border_size) solid transparent !important; + border-right: var(--classic_squared_tabs-border_size) solid transparent !important; } #TabsToolbar .tabbrowser-tab:not(:-moz-lwtheme):not([selected]):not(:hover) .tab-content { - border-top: 1px solid transparent !important; - border-left: 1px solid transparent !important; - border-right: 1px solid transparent !important; + border-top: var(--classic_squared_tabs-border_size) solid transparent !important; + border-left: var(--classic_squared_tabs-border_size) solid transparent !important; + border-right: var(--classic_squared_tabs-border_size) solid transparent !important; } diff --git a/classic/css/tabs/classic_squared_tabs_fx58_fix.css b/classic/css/tabs/classic_squared_tabs_fx58_fix.css new file mode 100644 index 00000000..0502424a --- /dev/null +++ b/classic/css/tabs/classic_squared_tabs_fx58_fix.css @@ -0,0 +1,13 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +.titlebar-button { + padding-top: 7px !important; + padding-bottom: 7px !important; +} diff --git a/classic/css/tabs/tabs_below_navigation_toolbar.css b/classic/css/tabs/tabs_below_navigation_toolbar.css index 3b798d26..f9240c65 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar.css @@ -9,7 +9,8 @@ :root { --tabs_toolbar_color_tabs_not_on_top: linear-gradient(#f9f9fa,#f9f9fa); - --tabs_toolbar_border-tnot_normal_mode: 1px solid var(--tabs-border-color); + --tabs_toolbar_border-tnot_normal_mode_size: 1px; + --tabs_toolbar_border-tnot_normal_mode: var(--tabs-border-color); --tab-min-height_tnot: calc( var(--tab-min-height) - 1px ); } @@ -131,8 +132,8 @@ } #main-window[sizemode="normal"] #navigator-toolbox :-moz-any(#nav-bar,#PersonalToolbar,#TabsToolbar) { - border-left: var(--tabs_toolbar_border-tnot_normal_mode) !important; - border-right: var(--tabs_toolbar_border-tnot_normal_mode) !important; + border-left: var(--tabs_toolbar_border-tnot_normal_mode_size) solid var(--tabs_toolbar_border-tnot_normal_mode) !important; + border-right: var(--tabs_toolbar_border-tnot_normal_mode_size) solid var(--tabs_toolbar_border-tnot_normal_mode) !important; background-clip: padding-box !important; } diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css b/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css new file mode 100644 index 00000000..6f9f1118 --- /dev/null +++ b/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css @@ -0,0 +1,15 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] { + margin-top: 30px !important; +} +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] { + margin-top: 30px !important; +} diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css b/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css new file mode 100644 index 00000000..4423963c --- /dev/null +++ b/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css @@ -0,0 +1,44 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +/* tweaks for Windows Classic theme */ +#nav-bar:not(:-moz-lwtheme), +#PersonalToolbar:not(:-moz-lwtheme), +#main-window:not([tabsintitlebar]) #TabsToolbar:not(:-moz-lwtheme) { + border-left: unset !important; + border-right: unset !important; + background: unset !important; +} + +#main-window[sizemode="normal"] #navigator-toolbox :-moz-any(#nav-bar,#PersonalToolbar,#TabsToolbar) { + border-left: 0px !important; + border-right: 0px !important; +} + +#main-window:not([tabsintitlebar]) #toolbar-menubar:not(:-moz-lwtheme) { + background: unset !important; + box-shadow: unset !important; + border-bottom: unset !important; +} + +#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #navigator-toolbox, +#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #nav-bar, +#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #navigator-toolbox::before, +#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #nav-bar::before, +#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #navigator-toolbox::after, +#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #nav-bar::after { + background: unset !important; + box-shadow: unset !important; + border: unset !important; + border-image: unset !important; +} + +#main-window:not([tabsintitlebar]) toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) { + background: unset !important; +} diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.css b/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.css new file mode 100644 index 00000000..762c2e18 --- /dev/null +++ b/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.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 (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +.tabbrowser-tab:not([selected]) { + color: #ffffff !important; +} diff --git a/classic/css/toolbars/general_toolbar_colors.css b/classic/css/toolbars/general_toolbar_colors.css index 17e73fde..83450a5f 100644 --- a/classic/css/toolbars/general_toolbar_colors.css +++ b/classic/css/toolbars/general_toolbar_colors.css @@ -11,7 +11,7 @@ --general_toolbar_color_toolbars: linear-gradient(#f9f9fa,#f9f9fa); --general_toolbar_color_navbar: linear-gradient(#f9f9fa,#f9f9fa); --general_toolbar_text_color: inherit; - --general_toolbar_text_shadow: unset; + --general_toolbar_text_shadow: transparent; } /* navigation toolbar background */ @@ -43,14 +43,13 @@ toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) background-image: var(--general_toolbar_color_toolbars) !important; } -/* set white text for toolbar items */ #main-window:not(:-moz-lwtheme) #PersonalToolbar #bookmarks-menu-button::after, #main-window:not(:-moz-lwtheme) toolbar > toolbarbutton > .toolbarbutton-text, #main-window:not(:-moz-lwtheme) #nav-bar-customization-target > toolbarbutton > .toolbarbutton-text, #main-window:not(:-moz-lwtheme) #main-menubar > menu > :-moz-any(label,description), #main-window:not(:-moz-lwtheme) #PlacesToolbarItems toolbarbutton > :-moz-any(label,description) { color: var(--general_toolbar_text_color) !important; - text-shadow: var(--general_toolbar_text_shadow) !important; + text-shadow: 1px 1px 1px var(--general_toolbar_text_shadow) !important; } /* findbar */ diff --git a/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_fx58_fix.css b/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_fx58_fix.css new file mode 100644 index 00000000..4534806b --- /dev/null +++ b/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_fx58_fix.css @@ -0,0 +1,18 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +/* tweaks for Windows Classic theme */ +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; +} diff --git a/classic/userChrome.css b/classic/userChrome.css index e6a2d04b..fe1899d6 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.5.7 ********************************************************************************/ +/* version 1.5.8 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -38,6 +38,11 @@ All options have significant categories & names. Read whole file to get an overview. GENERAL SUPPORT / DISCUSSION THREAD: https://github.com/Aris-t2/CustomCSSforFx/issues/88 + + FIREFOX 58 BUG: https://bugzilla.mozilla.org/show_bug.cgi?id=1431933 + - DISCUSSION THREAD: https://github.com/Aris-t2/CustomCSSforFx/issues/101 + - some @media rules get ignored so some options required temporal fixes + - look for "TEMPORAL FIX FOR FIREFOX 58" / "TEMPORAL FX58 fix" additions *************************************************************************************************/ @@ -111,6 +116,8 @@ /* popup appearance - only use one at a time ****************************************************/ @import url(./css/buttons/bookmarks_menu_button_popup_classic_appearance.css); /**/ /* @import url(./css/buttons/bookmarks_menu_button_popup_classic_appearance_fx59.css); /**/ +/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ +/* @import url(./css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* menubar - toolbar button appearance **********************************************************/ /* @import url(./css/buttons/buttons_on_menubar_toolbar_classic_appearance.css); /**/ @@ -188,6 +195,9 @@ /* @import url(./css/buttons/appbutton_in_titlebar_icon_only_grey.css); /**/ /* @import url(./css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css); /**/ +/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ +/* @import url(./css/buttons/appbutton_in_titlebar_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ + /* button color - only use one at a time ********************************************************/ @import url(./css/buttons/appbutton_in_titlebar_autocolor.css); /**/ /* @import url(./css/buttons/appbutton_in_titlebar_autocolor57p.css); /**/ @@ -207,6 +217,8 @@ /* custom tab appearance - only use one at a time ***********************************************/ @import url(./css/tabs/classic_squared_tabs.css); /**/ /* @import url(./css/tabs/classic_squared_tabs_australized.css); /**/ +/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS 10 *****************************************************/ +/* @import url(./css/tabs/classic_squared_tabs_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* custom tab colors for default/active/hovered/unread/unloaded tabs ****************************/ /* only use one at a time - edit target file to set own custom colors ***************************/ @@ -228,6 +240,13 @@ /* - TABS BELOW MAIN CONTENT (tabs on bottom) - EXPERIMENTAL ************************************/ /* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/33 ************************/ /* @import url(./css/tabs/tabs_below_main_content.css); /**/ /* <--- EXPERIMENTAL */ +/* TEMPORAL FIX FOR FIREFOX 58 & TABS BELOW NAVIGATION TOOLBAR and MAIN CONTENT *****************/ +/* - for Windows 7s default theme ***************************************************************/ +/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.css); /**/ /* <-- TEMPORAL FX58 fix */ +/* - for Windows 7s classic theme ***************************************************************/ +/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css); /**/ /* <-- TEMPORAL FX58 fix */ +/* - for Windows 10 *****************************************************************************/ +/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css); /**/ /* <-- TEMPORAL FX58 fix */ /************************************************************************************************/ /* - MOVE NAVIGATION TOOLBAR UP TO HIGHER POSITON (tabs not on top) - only use one at a time ****/ /* @import url(./css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon.css); /**/ /* <--- EXPERIMENTAL */ @@ -330,6 +349,8 @@ /* menuitem labels - only use one at a time *****************************************************/ @import url(./css/generalui/context_bfrsb_labels_without_icons.css); /**/ /* @import url(./css/generalui/context_bfrsb_labels_with_icons.css); /**/ +/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ +/* @import url(./css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* close icons for general ui and tabs - only use one at a time *********************************/ /* @import url(./css/generalui/close_icon_windows7.css); /**/ @@ -407,6 +428,8 @@ /* TOOLBAR TEXT MODES - only use one at a time **************************************************/ /* @import url(./css/toolbars/toolbar_mode_icons_and_text.css); /**/ /* @import url(./css/toolbars/toolbar_mode_text.css); /**/ +/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ +/* @import url(./css/toolbars/toolbar_mode_icons_and_text_and_text_only_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /************************************************************************************************/ diff --git a/classic/userContent.css b/classic/userContent.css index 2eb58939..f62fa588 100644 --- a/classic/userContent.css +++ b/classic/userContent.css @@ -57,6 +57,7 @@ /* other settings *******************************************************************************/ /* @import url(./css/aboutaddons/addonlists_only_show_buttons_on_hover.css); /**/ /* @import url(./css/aboutaddons/addonlists_replace_button_labels_with_icons.css); /**/ +/* @import url(./css/aboutaddons/addonlists_move_button_to_start.css); /**/ @import url(./css/aboutaddons/description_page_alternative_content_order.css); /**/ @import url(./css/aboutaddons/recentupdates_category_always_visible.css); /**/ /* @import url(./css/aboutaddons/search_category_always_visible.css); /**/ From 6775c7a59f3923b6d08ed56b4690a412f8d85cbe Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Tue, 23 Jan 2018 19:09:09 +0100 Subject: [PATCH 06/47] 1.5.9 --- ...u_button_popup_classic_appearance_fx59.css | 21 ------------ ...buttons_on_navbar_squared_buttons_fx57.css | 16 +++++++++ .../tabs/tabs_below_navigation_toolbar.css | 4 +++ .../bookmarks_toolbar_in_fullscreen_mode.css | 2 +- .../toolbars/menubar_in_fullscreen_mode.css | 2 +- classic/userChrome.css | 34 +++++++++---------- classic/userContent.css | 21 +++++++----- 7 files changed, 51 insertions(+), 49 deletions(-) delete mode 100644 classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx59.css diff --git a/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx59.css b/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx59.css deleted file mode 100644 index 605c35c8..00000000 --- a/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx59.css +++ /dev/null @@ -1,21 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - -@import url(./bookmarks_menu_button_popup_classic_appearance.css); - -#BMB_bookmarksPopup .menu-iconic-left { - -moz-margin-start: -8px !important; - -moz-margin-end: 0px !important; -} - -#BMB_bookmarksPopup :-moz-any(popup, menupopup) .menu-iconic-left { - -moz-margin-start: -3px !important; - -moz-margin-end: 9px !important; -} - - diff --git a/classic/css/buttons/buttons_on_navbar_squared_buttons_fx57.css b/classic/css/buttons/buttons_on_navbar_squared_buttons_fx57.css index 2afd617b..cd5d23b7 100644 --- a/classic/css/buttons/buttons_on_navbar_squared_buttons_fx57.css +++ b/classic/css/buttons/buttons_on_navbar_squared_buttons_fx57.css @@ -33,11 +33,17 @@ margin-left: 3px !important; margin-right: 3px !important; } + #main-window[uidensity=compact] #nav-bar :-moz-any(#add-ons-button,#zoom-out-button,#zoom-in-button) .toolbarbutton-icon { padding-left: 7px !important; padding-right: 7px !important; } +#main-window[uidensity=compact] #nav-bar #nav-bar-overflow-button .toolbarbutton-animatable-box{ + margin-left: 7px !important; + margin-right: 7px !important; +} + #main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar .toolbarbutton-1 .toolbarbutton-icon { width: 40px !important; height: 30px !important; @@ -70,6 +76,11 @@ padding-right: 11px !important; } +#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #nav-bar-overflow-button .toolbarbutton-animatable-box{ + margin-left: 11px !important; + margin-right: 11px !important; +} + #main-window[uidensity=touch] #nav-bar .toolbarbutton-1 .toolbarbutton-icon { width: 46px !important; height: 32px !important; @@ -102,6 +113,11 @@ padding-right: 14px !important; } +#main-window[uidensity=touch] #nav-bar #nav-bar-overflow-button .toolbarbutton-animatable-box{ + margin-left: 14px !important; + margin-right: 14px !important; +} + /* fix for toolbar button badges */ #nav-bar .toolbarbutton-1 .toolbarbutton-badge { margin-top: -1px !important; diff --git a/classic/css/tabs/tabs_below_navigation_toolbar.css b/classic/css/tabs/tabs_below_navigation_toolbar.css index f9240c65..a361921b 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar.css @@ -56,6 +56,10 @@ visibility: collapse !important; } +#main-window[inDOMFullscreen="true"] #TabsToolbar { + visibility: hidden !important; +} + /* tab height */ #tabbrowser-tabs, #tabbrowser-tabs > .tabbrowser-arrowscrollbox, diff --git a/classic/css/toolbars/bookmarks_toolbar_in_fullscreen_mode.css b/classic/css/toolbars/bookmarks_toolbar_in_fullscreen_mode.css index 721d4f70..bec92efa 100644 --- a/classic/css/toolbars/bookmarks_toolbar_in_fullscreen_mode.css +++ b/classic/css/toolbars/bookmarks_toolbar_in_fullscreen_mode.css @@ -8,6 +8,6 @@ /* bookmarks toolbar visibility in fullscreen mode */ -#main-window[inFullscreen] #PersonalToolbar { +#main-window[inFullscreen]:not([inDOMFullscreen="true"]) #PersonalToolbar { visibility: visible !important; } diff --git a/classic/css/toolbars/menubar_in_fullscreen_mode.css b/classic/css/toolbars/menubar_in_fullscreen_mode.css index 99a9b2dc..4010544b 100644 --- a/classic/css/toolbars/menubar_in_fullscreen_mode.css +++ b/classic/css/toolbars/menubar_in_fullscreen_mode.css @@ -8,6 +8,6 @@ /* menubar visibility in fullscreen mode */ -#main-window[inFullscreen] #toolbar-menubar { +#main-window[inFullscreen]:not([inDOMFullscreen="true"]) #toolbar-menubar { visibility: visible !important; } diff --git a/classic/userChrome.css b/classic/userChrome.css index fe1899d6..69216ef0 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,13 +8,13 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.5.8 ********************************************************************************/ +/* version 1.5.9 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* README - + Finding profile folder: address bar > about:support > Profile Folder > Open Folder CSS files and sub-folders belong into \PROFILEFOLDER\chrome\ directory. \chrome\config\ @@ -23,29 +23,28 @@ \chrome\xml\ \chrome\userChrome.css \chrome\userContent.css - + ENABLING options: remove the combination of / and * before '@import'. DISABLING options: add the combination of / and * before '@import'. - + FIREFOX BUGS (nothing CSS code can do about): - some '@import' features might not work properly on macOS and Linux - some '@import' features might not work properly, if multi-process mode (e10s) is disabled - - CSS tweaks won't work, if '@namespace' references are used inside .css files! - + + FIREFOX 58 BUG: bugzilla.mozilla.org/show_bug.cgi?id=1431933 + - DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/101 + - some @media rules get ignored so some options required temporal fixes + - look for TEMPORAL FIX FOR FIREFOX 58 TEMPORAL FX58 fix additions + + CSS tweaks won't work, if @namespace references are used inside .css files! + Do not report issues with EXPERIMENTAL settings! They are for testing only! - + All options have significant categories & names. Read whole file to get an overview. - - GENERAL SUPPORT / DISCUSSION THREAD: https://github.com/Aris-t2/CustomCSSforFx/issues/88 - - FIREFOX 58 BUG: https://bugzilla.mozilla.org/show_bug.cgi?id=1431933 - - DISCUSSION THREAD: https://github.com/Aris-t2/CustomCSSforFx/issues/101 - - some @media rules get ignored so some options required temporal fixes - - look for "TEMPORAL FIX FOR FIREFOX 58" / "TEMPORAL FX58 fix" additions -*************************************************************************************************/ + GENERAL SUPPORT / DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/88 +*************************************************************************************************/ /************************************************************************************************/ /* CONFIGURATION FILES - edit target files to change general values *****************************/ @@ -113,9 +112,8 @@ /* @import url(./css/buttons/bookmarks_menu_button_popup_sidebar_item_hidden.css); /**/ /* @import url(./css/buttons/bookmarks_menu_button_popup_toolbar_item_hidden.css); /**/ /* @import url(./css/buttons/bookmarks_menu_button_popup_other_item_hidden.css); /**/ -/* popup appearance - only use one at a time ****************************************************/ +/* popup appearance *****************************************************************************/ @import url(./css/buttons/bookmarks_menu_button_popup_classic_appearance.css); /**/ -/* @import url(./css/buttons/bookmarks_menu_button_popup_classic_appearance_fx59.css); /**/ /* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ /* @import url(./css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ diff --git a/classic/userContent.css b/classic/userContent.css index f62fa588..95b0575a 100644 --- a/classic/userContent.css +++ b/classic/userContent.css @@ -9,7 +9,7 @@ /************************************************************************************************* README - + Finding profile folder: address bar > about:support > Profile Folder > Open Folder CSS files and sub-folders belong into \PROFILEFOLDER\chrome\ directory. \chrome\config\ @@ -21,18 +21,23 @@ ENABLING options: remove the combination of / and * before '@import'. DISABLING options: add the combination of / and * before '@import'. - + FIREFOX BUGS (nothing CSS code can do about): - some '@import' features might not work properly on macOS and Linux - some '@import' features might not work properly, if multi-process mode (e10s) is disabled - - CSS tweaks won't work, if '@namespace' references are used inside .css files! - + + FIREFOX 58 BUG: bugzilla.mozilla.org/show_bug.cgi?id=1431933 + - DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/101 + - some @media rules get ignored so some options required temporal fixes + - look for TEMPORAL FIX FOR FIREFOX 58 TEMPORAL FX58 fix additions + + CSS tweaks won't work, if @namespace references are used inside .css files! + Do not report issues with EXPERIMENTAL settings! They are for testing only! - + All options have significant categories & names. Read whole file to get an overview. - - GENERAL SUPPORT / DISCUSSION THREAD: https://github.com/Aris-t2/CustomCSSforFx/issues/88 + + GENERAL SUPPORT / DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/88 *************************************************************************************************/ From 56f7ae8478cb0a4c60f6921482214a9f1720b234 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Thu, 25 Jan 2018 18:30:17 +0100 Subject: [PATCH 07/47] 1.6.0 --- classic/css/buttons/appbutton_in_titlebar.css | 140 ++++++++++-------- .../buttons/appbutton_in_titlebar_aurora.css | 16 +- .../appbutton_in_titlebar_autocolor.css | 32 +--- .../appbutton_in_titlebar_autocolor57p.css | 28 +--- .../appbutton_in_titlebar_deved57p.css | 14 +- .../appbutton_in_titlebar_fx58_fix.css | 2 +- .../appbutton_in_titlebar_icon_only.css | 111 +++++++------- ...ton_in_titlebar_icon_only_browser_logo.css | 2 +- .../appbutton_in_titlebar_icon_only_dark.css | 2 +- .../appbutton_in_titlebar_icon_only_grey.css | 2 +- .../buttons/appbutton_in_titlebar_nightly.css | 15 +- .../appbutton_in_titlebar_nightly57p.css | 13 +- .../appbutton_in_titlebar_palemoon.css | 16 +- ...appbutton_in_titlebar_semi_transparent.css | 17 +-- .../appbutton_in_titlebar_transparent.css | 17 +-- ...kmarks_toolbar_old_size_and_appearance.css | 44 +++--- ...olbar_old_size_and_appearance_fx58_fix.css | 31 ++++ ...abels_with_and_without_icons_macOS_fix.css | 13 ++ classic/css/generalui/findbar_on_top.css | 36 +++-- .../css/generalui/findbar_on_top_fx58_fix.css | 24 +++ .../tabs/custom_colors_for_squared_tabs.css | 1 + ...om_colors_for_squared_tabs_australized.css | 1 + .../tabs/tabs_below_navigation_toolbar.css | 8 +- ...abs_below_navigation_toolbar_macOS_fix.css | 15 ++ .../css/toolbars/general_toolbar_colors.css | 10 +- classic/userChrome.css | 47 +++--- classic/userContent.css | 10 +- 27 files changed, 350 insertions(+), 317 deletions(-) create mode 100644 classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance_fx58_fix.css create mode 100644 classic/css/generalui/context_bfrsb_labels_with_and_without_icons_macOS_fix.css create mode 100644 classic/css/generalui/findbar_on_top_fx58_fix.css create mode 100644 classic/css/tabs/tabs_below_navigation_toolbar_macOS_fix.css diff --git a/classic/css/buttons/appbutton_in_titlebar.css b/classic/css/buttons/appbutton_in_titlebar.css index 46f0dcb3..c152e993 100644 --- a/classic/css/buttons/appbutton_in_titlebar.css +++ b/classic/css/buttons/appbutton_in_titlebar.css @@ -7,7 +7,7 @@ /****************************************************************************************/ -/*************************************************/ +/************************************************/ /* cheat main menu button into title bar ********/ /************************************************/ @@ -32,65 +32,69 @@ -moz-padding-start: 92px !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { -moz-appearance: none !important; -moz-box-ordinal-group: 0 !important; position: fixed !important; height: 22px !important; margin: 0 !important; - -moz-margin-start: 0px !important; + -moz-margin-start: 1px !important; border: unset !important; box-shadow: unset !important; padding-left: 0px !important; padding-right: 0px !important; } -#main-window[tabsintitlebar][sizemode="normal"] #nav-bar #PanelUI-button { +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { + -moz-margin-start: 0px !important; +} + +#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 0px !important; } -#main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 8px !important; } @media (min-resolution: 110dpi) { - #main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 6px !important; } } @media (min-resolution: 120dpi) { - #main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 5px !important; } } @media (min-resolution: 140dpi) { - #main-window[tabsintitlebar][sizemode="normal"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 0px !important; } - #main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 4px !important; } } @media (min-resolution: 160dpi) { - #main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 2px !important; } } @media (-moz-windows-classic) { - #main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 2px !important; } } -#main-window[tabsintitlebar][inFullscreen] #nav-bar #PanelUI-button { +#main-window[tabsintitlebar][inFullscreen] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 0px !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { background-clip: padding-box !important; padding: 0 1.4em 0 !important; padding-top: 0 !important; @@ -100,20 +104,21 @@ height: 22px !important; border-radius: 0 0 4px 4px; border-top: none !important; - border-right: 2px solid !important; - border-left: 2px solid !important; - border-bottom: 2px solid !important; + border-right: 1px solid !important; + border-left: 1px solid !important; + border-bottom: 1px solid !important; } /* hide button in fullscreen mode, if toolbars get automatically hidden */ -#main-window[tabsintitlebar] #navigator-toolbox[inFullscreen="true"][style*="margin-top: -"] #nav-bar #PanelUI-button { +#main-window[tabsintitlebar] #navigator-toolbox[inFullscreen="true"][style*="margin-top: -"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { visibility: collapse !important; } /* dropmarker icon / arrow */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button .toolbarbutton-icon { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button .toolbarbutton-icon { -moz-margin-end: -94px !important; margin-top: 1px !important; + margin-bottom: 1px !important; list-style-image: url("../../image/dropdown-arrow-inverted.svg") !important; -moz-image-region: rect(0px, 0px, 0px, 0px) !important; width: 9px !important; @@ -122,11 +127,11 @@ box-shadow: unset !important; } -#main-window[uidensity=touch][tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button .toolbarbutton-icon { +#main-window[uidensity=touch][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button .toolbarbutton-icon { -moz-margin-end: -90px !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-menu-button::after { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button::after { display: block !important; color: white !important; font-weight: bold !important; @@ -139,50 +144,50 @@ } /* 'Firefox' title */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-menu-button[label="Firefox"]::after, -#main-window[tabsintitlebar] #nav-bar #PanelUI-menu-button:not([label="Nightly"]):not([label="Firefox Nightly"]):not([label="Firefox Developer Edition"]):not([label="Firefox"])::after { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Firefox"]::after, +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button:not([label="Nightly"]):not([label="Firefox Nightly"]):not([label="Firefox Developer Edition"]):not([label="Firefox"])::after { content: "Firefox" !important; -moz-margin-start: -6px !important; } -#main-window[uidensity=touch][tabsintitlebar] #nav-bar #PanelUI-menu-button[label="Firefox"]::after, -#main-window[uidensity=touch][tabsintitlebar] #nav-bar #PanelUI-menu-button:not([label="Nightly"]):not([label="Firefox Nightly"]):not([label="Firefox Developer Edition"]):not([label="Firefox"])::after { +#main-window[uidensity=touch][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Firefox"]::after, +#main-window[uidensity=touch][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button:not([label="Nightly"]):not([label="Firefox Nightly"]):not([label="Firefox Developer Edition"]):not([label="Firefox"])::after { -moz-margin-start: -12px !important; } /* 'DevFox' title */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]::after { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]::after { content: "DevFox" !important; -moz-margin-start: -9px !important; } -#main-window[uidensity=touch][tabsintitlebar] #nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]::after { +#main-window[uidensity=touch][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]::after { -moz-margin-start: -15px !important; } /* 'Nightly' title */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-menu-button[label="Nightly"]::after, -#main-window[tabsintitlebar] #nav-bar #PanelUI-menu-button[label="Firefox Nightly"]::after { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Nightly"]::after, +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Firefox Nightly"]::after { content: "Nightly" !important; -moz-margin-start: -6px !important; } -#main-window[uidensity=touch][tabsintitlebar] #nav-bar #PanelUI-menu-button[label="Nightly"]::after, -#main-window[uidensity=touch][tabsintitlebar] #nav-bar #PanelUI-menu-button[label="Firefox Nightly"]::after { +#main-window[uidensity=touch][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Nightly"]::after, +#main-window[uidensity=touch][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Firefox Nightly"]::after { -moz-margin-start: -12px !important; } /* custom button title (remove Firefox/DevFox/Nightly) *//* -#main-window[tabsintitlebar] #nav-bar #PanelUI-menu-button::after{ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button::after{ content: "MyTitle" !important; -moz-margin-start: -6px !important; } -#main-window[uidensity=touch][tabsintitlebar] #nav-bar #PanelUI-menu-button::after { +#main-window[uidensity=touch][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button::after { -moz-margin-start: -12px !important; } /* adjust button badge stack */ -#main-window[tabsintitlebar] #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([checked]):not([open]):not(:active) > .toolbarbutton-badge-stack, -#main-window[tabsintitlebar] #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack, -#main-window[tabsintitlebar] #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack{ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([checked]):not([open]):not(:active) > .toolbarbutton-badge-stack, +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack, +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack{ background: unset !important; border-color: unset !important; border: 0 !important; @@ -190,7 +195,7 @@ } /* adjust button badge */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button .toolbarbutton-badge-stack .toolbarbutton-badge { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button .toolbarbutton-badge-stack .toolbarbutton-badge { -moz-margin-end: 2px !important; margin-top: 0px !important; } @@ -198,60 +203,67 @@ /* button color/border */ /* orange (default) */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { background-image: linear-gradient(rgb(247,182,82), rgb(215,98,10) 95%) !important; - -moz-border-right-colors: rgba(255,255,255,.60) hsla(214,89%,21%,.5) !important; - -moz-border-left-colors: rgba(255,255,255,.60) hsla(214,89%,21%,.5) !important; - -moz-border-bottom-colors: rgba(255,255,255,.70) hsla(214,89%,21%,.5) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.25) inset, - 0 0 0 1px rgba(255,255,255,.25) inset !important; -} -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ + border-right-color:hsla(214,89%,21%,.5) !important; + border-left-color: hsla(214,89%,21%,.5) !important; + border-bottom-color: hsla(214,89%,21%,.5) !important; + box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset, + 0 0 2px 1px hsla(0,0%,100%,.25) inset, + 0 1px 0 0px rgba(255,255,255,.6), + 0 -1px 0 0px rgba(255,255,255,.6), + 1px 0 0 0px rgba(255,255,255,.6), + -1px 0 0 0px rgba(255,255,255,.6) !important; +} +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, rgba(252,240,89,.5) 10%, rgba(252,240,89,0) 70%), radial-gradient(farthest-side at center bottom, rgb(236,133,0), rgba(255,229,172,0)), linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important; border-color: rgba(83,42,6,.9) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.1) inset, - 0 0 2px 1px rgba(250,234,169,.7) inset, - 0 -1px 0 rgba(250,234,169,.5) inset !important; -} -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]){ + box-shadow: 0 1px 0 hsla(0,0%,100%,.15) inset, + 0 0 2px 1px hsla(0,0%,100%,.5) inset, + 0 -1px 0 hsla(0,0%,100%,.2), + 0 1px 0 0px rgba(255,255,255,.6), + 0 -1px 0 0px rgba(255,255,255,.6), + 1px 0 0 0px rgba(255,255,255,.6), + -1px 0 0 0px rgba(255,255,255,.6) !important; +} +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]){ background-image: linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important; box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; + 0 1px 1px rgba(0,0,0,.2) inset, + 0 1px 0 0px rgba(255,255,255,.6), + 0 -1px 0 0px rgba(255,255,255,.6), + 1px 0 0 0px rgba(255,255,255,.6), + -1px 0 0 0px rgba(255,255,255,.6) !important; } /*private browsing - purple */ -#main-window[privatebrowsingmode=temporary][tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button{ +#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button{ background-image: linear-gradient(rgb(153,38,211), rgb(105,19,163) 95%) !important; - border-color: rgba(43,8,65,.9) !important; } -#main-window[privatebrowsingmode=temporary][tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ +#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, rgba(240,193,255,.5) 10%, rgba(240,193,255,0) 70%), radial-gradient(farthest-side at center bottom, rgb(192,81,247), rgba(236,172,255,0)), linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important; - border-color: rgba(43,8,65,.9) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.1) inset, - 0 0 2px 1px rgba(240,193,255,.7) inset, - 0 -1px 0 rgba(240,193,255,.5) inset !important; } -#main-window[privatebrowsingmode=temporary][tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { +#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important; } /* fix for 'buttons_on_navbar_squared_buttons.css' */ -#main-window[tabsintitlebar][uidensity=compact] #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack, -#main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack, -#main-window[tabsintitlebar][uidensity=touch] #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { +#main-window[tabsintitlebar][uidensity=compact] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack, +#main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack, +#main-window[tabsintitlebar][uidensity=touch] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { padding-top: 0px !important; padding-bottom: 0px !important; width: unset !important; height: 22px !important; } -#main-window[tabsintitlebar][uidensity=compact] #nav-bar #PanelUI-menu-button .toolbarbutton-icon, -#main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #PanelUI-menu-button .toolbarbutton-icon, -#main-window[tabsintitlebar][uidensity=touch] #nav-bar #PanelUI-menu-button .toolbarbutton-icon { +#main-window[tabsintitlebar][uidensity=compact] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-icon, +#main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-icon, +#main-window[tabsintitlebar][uidensity=touch] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-icon { padding: 6px !important; width: 9px !important; height: 7px !important; diff --git a/classic/css/buttons/appbutton_in_titlebar_aurora.css b/classic/css/buttons/appbutton_in_titlebar_aurora.css index 8d76047d..aa2e531d 100644 --- a/classic/css/buttons/appbutton_in_titlebar_aurora.css +++ b/classic/css/buttons/appbutton_in_titlebar_aurora.css @@ -8,24 +8,14 @@ /* Aurora */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { background-image: linear-gradient(hsl(208,99%,37%), hsl(214,90%,23%) 95%) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(205,100%,72%,.2) inset, - 0 0 2px 1px hsla(205,100%,72%,.25) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, hsla(202,100%,85%,.5) 10%, hsla(202,100%,85%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(205,100%,72%,.7), hsla(205,100%,72%,0)), linear-gradient(hsl(208,98%,34%), hsl(213,87%,20%) 95%) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(205,100%,72%,.15) inset, - 0 0 2px 1px hsla(205,100%,72%,.5) inset, - 0 -1px 0 hsla(205,100%,72%,.2) inset !important; } - -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { background-image: linear-gradient(hsl(208,95%,30%), hsl(214,85%,17%) 95%) !important; - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; } diff --git a/classic/css/buttons/appbutton_in_titlebar_autocolor.css b/classic/css/buttons/appbutton_in_titlebar_autocolor.css index 7301f620..fb7e68d5 100644 --- a/classic/css/buttons/appbutton_in_titlebar_autocolor.css +++ b/classic/css/buttons/appbutton_in_titlebar_autocolor.css @@ -8,47 +8,27 @@ /* Aurora */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"] { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"] { background-image: linear-gradient(hsl(208,99%,37%), hsl(214,90%,23%) 95%) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(205,100%,72%,.2) inset, - 0 0 2px 1px hsla(205,100%,72%,.25) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, hsla(202,100%,85%,.5) 10%, hsla(202,100%,85%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(205,100%,72%,.7), hsla(205,100%,72%,0)), linear-gradient(hsl(208,98%,34%), hsl(213,87%,20%) 95%) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(205,100%,72%,.15) inset, - 0 0 2px 1px hsla(205,100%,72%,.5) inset, - 0 -1px 0 hsla(205,100%,72%,.2) inset !important; } - -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:-moz-any(:hover:active,[open]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:-moz-any(:hover:active,[open]) { background-image: linear-gradient(hsl(208,95%,30%), hsl(214,85%,17%) 95%) !important; - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; } /* Nightly */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]) { background-image: linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%) !important; - border-color: hsla(210,59%,13%,.9) !important; - box-shadow: 0 1px 0 hsla(210,48%,90%,.15) inset, - 0 0 2px 1px hsla(211,65%,85%,.15) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, hsla(210,48%,90%,.5) 10%, hsla(210,48%,90%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(211,70%,83%,.5), hsla(211,70%,83%,0)), linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%) !important; - border-color: hsla(210,59%,13%,.9) !important; - box-shadow: 0 1px 0 hsla(210,48%,90%,.15) inset, - 0 0 2px 1px hsla(210,48%,90%,.4) inset, - 0 -1px 0 hsla(210,48%,90%,.2) inset !important; } - -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):-moz-any(:hover:active,[open]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):-moz-any(:hover:active,[open]) { background-image: linear-gradient(hsl(211,33%,26%), hsl(209,53%,6%) 95%) !important; - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; } \ No newline at end of file diff --git a/classic/css/buttons/appbutton_in_titlebar_autocolor57p.css b/classic/css/buttons/appbutton_in_titlebar_autocolor57p.css index 8a3ed89a..4adf545f 100644 --- a/classic/css/buttons/appbutton_in_titlebar_autocolor57p.css +++ b/classic/css/buttons/appbutton_in_titlebar_autocolor57p.css @@ -8,43 +8,27 @@ /* DeveloperEdition colors (Fx57+) [label="Firefox Developer Edition"] */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"] { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"] { background-image: linear-gradient(#0067de, #2398ff,#03daff) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.25) inset, - 0 0 0 1px rgba(255,255,255,.25) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.5) 10%, hsla(0,0%,100%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.7), hsla(0,0%,100%,0)), linear-gradient(#0067de, #2398ff,#03daff) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(0,0%,100%,.15) inset, - 0 0 2px 1px hsla(0,0%,100%,.5) inset, - 0 -1px 0 hsla(0,0%,100%,.2) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:-moz-any(:hover:active,[open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:-moz-any(:hover:active,[open]){ background-image: linear-gradient(#0067de, #2398ff,#03daff) !important; - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; } /* Nightly colors (Fx57+) [label="Nightly"] */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]) { background-image: linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.25) inset, - 0 0 0 1px rgba(255,255,255,.25) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:not(:active):not([open]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:not(:active):not([open]) { background-image: radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.5) 10%, hsla(0,0%,100%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.7), hsla(0,0%,100%,0)), linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(0,0%,100%,.15) inset, - 0 0 2px 1px hsla(0,0%,100%,.5) inset, - 0 -1px 0 hsla(0,0%,100%,.2) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):-moz-any(:hover:active,[open]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):-moz-any(:hover:active,[open]) { background-image: linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; } \ No newline at end of file diff --git a/classic/css/buttons/appbutton_in_titlebar_deved57p.css b/classic/css/buttons/appbutton_in_titlebar_deved57p.css index f823f515..eaf1e96c 100644 --- a/classic/css/buttons/appbutton_in_titlebar_deved57p.css +++ b/classic/css/buttons/appbutton_in_titlebar_deved57p.css @@ -8,22 +8,14 @@ /* DeveloperEdition colors (Fx57+) [label="Firefox Developer Edition"] */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { background-image: linear-gradient(#0067de, #2398ff,#03daff) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.25) inset, - 0 0 0 1px rgba(255,255,255,.25) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.5) 10%, hsla(0,0%,100%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.7), hsla(0,0%,100%,0)), linear-gradient(#0067de, #2398ff,#03daff) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(0,0%,100%,.15) inset, - 0 0 2px 1px hsla(0,0%,100%,.5) inset, - 0 -1px 0 hsla(0,0%,100%,.2) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]){ background-image: linear-gradient(#0067de, #2398ff,#03daff) !important; - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; } \ No newline at end of file diff --git a/classic/css/buttons/appbutton_in_titlebar_fx58_fix.css b/classic/css/buttons/appbutton_in_titlebar_fx58_fix.css index 11b7d2bb..8adf7c84 100644 --- a/classic/css/buttons/appbutton_in_titlebar_fx58_fix.css +++ b/classic/css/buttons/appbutton_in_titlebar_fx58_fix.css @@ -6,6 +6,6 @@ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ -#main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 2px !important; } diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only.css b/classic/css/buttons/appbutton_in_titlebar_icon_only.css index 21f7a1a0..fb9e977e 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only.css @@ -37,65 +37,69 @@ -moz-padding-start: 47px !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { -moz-appearance: none !important; -moz-box-ordinal-group: 0 !important; position: fixed !important; height: 22px !important; margin: 0 !important; - -moz-margin-start: 0px !important; + -moz-margin-start: 1px !important; border: unset !important; box-shadow: unset !important; padding-left: 0px !important; padding-right: 0px !important; } -#main-window[tabsintitlebar][sizemode="normal"] #nav-bar #PanelUI-button { +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { + -moz-margin-start: 0px !important; +} + +#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 0px !important; } -#main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 8px !important; } @media (min-resolution: 110dpi) { - #main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 6px !important; } } @media (min-resolution: 120dpi) { - #main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 5px !important; } } @media (min-resolution: 140dpi) { - #main-window[tabsintitlebar][sizemode="normal"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 0px !important; } - #main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 4px !important; } } @media (min-resolution: 160dpi) { - #main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 2px !important; } } @media (-moz-windows-classic) { - #main-window[tabsintitlebar][sizemode="maximized"] #nav-bar #PanelUI-button { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 2px !important; } } -#main-window[tabsintitlebar][inFullscreen] #nav-bar #PanelUI-button { +#main-window[tabsintitlebar][inFullscreen] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 0px !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { background-clip: padding-box !important; padding: 0 4px 0 !important; padding-top: 0 !important; @@ -105,23 +109,23 @@ height: 22px !important; border-radius: 0 0 4px 4px; border-top: none !important; - border-right: 2px solid !important; - border-left: 2px solid !important; - border-bottom: 2px solid !important; + border-right: 1px solid !important; + border-left: 1px solid !important; + border-bottom: 1px solid !important; } /* hide button in fullscreen mode, if toolbars get automatically hidden */ -#main-window[tabsintitlebar] #navigator-toolbox[inFullscreen="true"][style*="margin-top: -"] #nav-bar #PanelUI-button { +#main-window[tabsintitlebar] #navigator-toolbox[inFullscreen="true"][style*="margin-top: -"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { visibility: collapse !important; } /* dropmarker icon / arrow */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { list-style-image: unset !important; -moz-image-region: unset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button .toolbarbutton-icon { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button .toolbarbutton-icon { list-style-image: url("../../image/appbutton-inv.svg") !important; background: unset !important; box-shadow: unset !important; @@ -129,9 +133,9 @@ /* adjust button badge stack */ -#main-window[tabsintitlebar] #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([checked]):not([open]):not(:active) > .toolbarbutton-badge-stack, -#main-window[tabsintitlebar] #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack, -#main-window[tabsintitlebar] #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack{ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([checked]):not([open]):not(:active) > .toolbarbutton-badge-stack, +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack, +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack{ background: unset !important; border-color: unset !important; border: 0 !important; @@ -139,7 +143,7 @@ } /* adjust button badge */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button .toolbarbutton-badge-stack .toolbarbutton-badge { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button .toolbarbutton-badge-stack .toolbarbutton-badge { -moz-margin-end: 2px !important; margin-top: 0px !important; } @@ -147,60 +151,67 @@ /* button color/border */ /* orange (default) */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { background-image: linear-gradient(rgb(247,182,82), rgb(215,98,10) 95%) !important; - -moz-border-right-colors: rgba(255,255,255,.60) hsla(214,89%,21%,.5) !important; - -moz-border-left-colors: rgba(255,255,255,.60) hsla(214,89%,21%,.5) !important; - -moz-border-bottom-colors: rgba(255,255,255,.70) hsla(214,89%,21%,.5) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.25) inset, - 0 0 0 1px rgba(255,255,255,.25) inset !important; -} -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ + border-right-color:hsla(214,89%,21%,.5) !important; + border-left-color: hsla(214,89%,21%,.5) !important; + border-bottom-color: hsla(214,89%,21%,.5) !important; + box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset, + 0 0 2px 1px hsla(0,0%,100%,.25) inset, + 0 1px 0 0px rgba(255,255,255,.5), + 0 -1px 0 0px rgba(255,255,255,.5), + 1px 0 0 0px rgba(255,255,255,.5), + -1px 0 0 0px rgba(255,255,255,.5) !important; +} +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, rgba(252,240,89,.5) 10%, rgba(252,240,89,0) 70%), radial-gradient(farthest-side at center bottom, rgb(236,133,0), rgba(255,229,172,0)), linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important; border-color: rgba(83,42,6,.9) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.1) inset, - 0 0 2px 1px rgba(250,234,169,.7) inset, - 0 -1px 0 rgba(250,234,169,.5) inset !important; -} -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]){ + box-shadow: 0 1px 0 hsla(0,0%,100%,.15) inset, + 0 0 2px 1px hsla(0,0%,100%,.5) inset, + 0 -1px 0 hsla(0,0%,100%,.2), + 0 1px 0 0px rgba(255,255,255,.5), + 0 -1px 0 0px rgba(255,255,255,.5), + 1px 0 0 0px rgba(255,255,255,.5), + -1px 0 0 0px rgba(255,255,255,.5) !important; +} +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]){ background-image: linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important; box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; + 0 1px 1px rgba(0,0,0,.2) inset, + 0 1px 0 0px rgba(255,255,255,.5), + 0 -1px 0 0px rgba(255,255,255,.5), + 1px 0 0 0px rgba(255,255,255,.5), + -1px 0 0 0px rgba(255,255,255,.5) !important; } /*private browsing - purple */ -#main-window[privatebrowsingmode=temporary][tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button{ +#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button{ background-image: linear-gradient(rgb(153,38,211), rgb(105,19,163) 95%) !important; - border-color: rgba(43,8,65,.9) !important; } -#main-window[privatebrowsingmode=temporary][tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ +#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, rgba(240,193,255,.5) 10%, rgba(240,193,255,0) 70%), radial-gradient(farthest-side at center bottom, rgb(192,81,247), rgba(236,172,255,0)), linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important; - border-color: rgba(43,8,65,.9) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.1) inset, - 0 0 2px 1px rgba(240,193,255,.7) inset, - 0 -1px 0 rgba(240,193,255,.5) inset !important; } -#main-window[privatebrowsingmode=temporary][tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { +#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important; } /* fix for 'buttons_on_navbar_squared_buttons.css' */ -#main-window[tabsintitlebar][uidensity=compact] #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack, -#main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack, -#main-window[tabsintitlebar][uidensity=touch] #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { +#main-window[tabsintitlebar][uidensity=compact] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack, +#main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack, +#main-window[tabsintitlebar][uidensity=touch] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { padding-top: 0px !important; padding-bottom: 0px !important; width: unset !important; height: 22px !important; } -#main-window[tabsintitlebar][uidensity=compact] #nav-bar #PanelUI-menu-button .toolbarbutton-icon, -#main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #PanelUI-menu-button .toolbarbutton-icon, -#main-window[tabsintitlebar][uidensity=touch] #nav-bar #PanelUI-menu-button .toolbarbutton-icon { +#main-window[tabsintitlebar][uidensity=compact] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-icon, +#main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-icon, +#main-window[tabsintitlebar][uidensity=touch] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button .toolbarbutton-icon { padding: 0px !important; width: 16px !important; height: 16px !important; diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css b/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css index b38e6174..70ce8fa7 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css @@ -10,7 +10,7 @@ @import url(./appbutton_in_titlebar_icon_only.css); /* dropmarker icon / arrow */ -#main-window[tabsintitlebar] #navigator-toolbox #nav-bar #PanelUI-button .toolbarbutton-icon { +#main-window[tabsintitlebar] #navigator-toolbox #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button .toolbarbutton-icon { list-style-image: url("chrome://branding/content/about-logo.png") !important; width: 18px !important; } diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only_dark.css b/classic/css/buttons/appbutton_in_titlebar_icon_only_dark.css index d9a96af5..866be15d 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only_dark.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only_dark.css @@ -10,7 +10,7 @@ @import url(./appbutton_in_titlebar_icon_only.css); /* dropmarker icon / arrow */ -#main-window[tabsintitlebar] #navigator-toolbox #nav-bar #PanelUI-button .toolbarbutton-icon { +#main-window[tabsintitlebar] #navigator-toolbox #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button .toolbarbutton-icon { list-style-image: url("../../image/appbutton_dark.svg") !important; } diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only_grey.css b/classic/css/buttons/appbutton_in_titlebar_icon_only_grey.css index acd03e08..06fa7f7c 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only_grey.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only_grey.css @@ -10,7 +10,7 @@ @import url(./appbutton_in_titlebar_icon_only.css); /* dropmarker icon / arrow */ -#main-window[tabsintitlebar] #navigator-toolbox #nav-bar #PanelUI-button .toolbarbutton-icon { +#main-window[tabsintitlebar] #navigator-toolbox #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button .toolbarbutton-icon { list-style-image: url("../../image/appbutton_grey.svg") !important; } diff --git a/classic/css/buttons/appbutton_in_titlebar_nightly.css b/classic/css/buttons/appbutton_in_titlebar_nightly.css index 8c94914f..9991214f 100644 --- a/classic/css/buttons/appbutton_in_titlebar_nightly.css +++ b/classic/css/buttons/appbutton_in_titlebar_nightly.css @@ -8,24 +8,15 @@ /* Nightly */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { background-image: linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%) !important; - border-color: hsla(210,59%,13%,.9) !important; - box-shadow: 0 1px 0 hsla(210,48%,90%,.15) inset, - 0 0 2px 1px hsla(211,65%,85%,.15) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, hsla(210,48%,90%,.5) 10%, hsla(210,48%,90%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(211,70%,83%,.5), hsla(211,70%,83%,0)), linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%) !important; - border-color: hsla(210,59%,13%,.9) !important; - box-shadow: 0 1px 0 hsla(210,48%,90%,.15) inset, - 0 0 2px 1px hsla(210,48%,90%,.4) inset, - 0 -1px 0 hsla(210,48%,90%,.2) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { background-image: linear-gradient(hsl(211,33%,26%), hsl(209,53%,6%) 95%) !important; - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; } diff --git a/classic/css/buttons/appbutton_in_titlebar_nightly57p.css b/classic/css/buttons/appbutton_in_titlebar_nightly57p.css index 8b7d573a..aa1bb339 100644 --- a/classic/css/buttons/appbutton_in_titlebar_nightly57p.css +++ b/classic/css/buttons/appbutton_in_titlebar_nightly57p.css @@ -8,22 +8,15 @@ /* Nightly colors (Fx57+) [label="Nightly"] */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { background-image: linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.25) inset, - 0 0 0 1px rgba(255,255,255,.25) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.5) 10%, hsla(0,0%,100%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.7), hsla(0,0%,100%,0)), linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(0,0%,100%,.15) inset, - 0 0 2px 1px hsla(0,0%,100%,.5) inset, - 0 -1px 0 hsla(0,0%,100%,.2) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]){ background-image: linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; } \ No newline at end of file diff --git a/classic/css/buttons/appbutton_in_titlebar_palemoon.css b/classic/css/buttons/appbutton_in_titlebar_palemoon.css index 3beec7cd..8ccdde1f 100644 --- a/classic/css/buttons/appbutton_in_titlebar_palemoon.css +++ b/classic/css/buttons/appbutton_in_titlebar_palemoon.css @@ -8,24 +8,14 @@ /* Palemoon */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { background-image: linear-gradient(rgb(82,182,247), rgb(10,98,215) 95%) !important; - border-color: rgba(6,42,83,.9) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.25) inset, - 0 0 0 1px rgba(255,255,255,.25) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at bottom, rgba(89,240,252,.5) 10%, rgba(89,240,252,0) 70%), radial-gradient(farthest-side at bottom, rgb(60,68,236), rgba(172,229,255,0)), linear-gradient(rgb(69,170,246), rgb(30,40,209) 95%) !important; - border-color: rgba(6,42,83,.9) !important; - box-shadow: 0 1px 0 rgba(255,255,255,.1) inset, - 0 0 2px 1px rgba(169,234,250,.7) inset, - 0 -1px 0 rgba(169,234,250,.5) inset !important; } - -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { background-image: linear-gradient(rgb(69,170,246), rgb(0,74,209) 95%) !important; - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; } \ No newline at end of file diff --git a/classic/css/buttons/appbutton_in_titlebar_semi_transparent.css b/classic/css/buttons/appbutton_in_titlebar_semi_transparent.css index abfcbb05..71f94c49 100644 --- a/classic/css/buttons/appbutton_in_titlebar_semi_transparent.css +++ b/classic/css/buttons/appbutton_in_titlebar_semi_transparent.css @@ -8,24 +8,13 @@ /* Semi - transparent */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { background-image: linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,.5)) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset, - 0 0 2px 1px hsla(0,0%,100%,.25) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.5) 10%, hsla(0,0%,100%,0.5) 70%), radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.7), hsla(0,0%,100%,0.5)) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(0,0%,100%,.15) inset, - 0 0 2px 1px hsla(0,0%,100%,.5) inset, - 0 -1px 0 hsla(0,0%,100%,.2) inset !important; } - -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { background-image: linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,.5)) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; } diff --git a/classic/css/buttons/appbutton_in_titlebar_transparent.css b/classic/css/buttons/appbutton_in_titlebar_transparent.css index 9f4f1030..c3af368c 100644 --- a/classic/css/buttons/appbutton_in_titlebar_transparent.css +++ b/classic/css/buttons/appbutton_in_titlebar_transparent.css @@ -8,24 +8,13 @@ /* Transparent */ -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { background-image: linear-gradient(rgba(255,255,255,.0), rgba(255,255,255,.0)) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset, - 0 0 2px 1px hsla(0,0%,100%,.25) inset !important; } -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.5) 10%, hsla(0,0%,100%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.7), hsla(0,0%,100%,0)) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 1px 0 hsla(0,0%,100%,.15) inset, - 0 0 2px 1px hsla(0,0%,100%,.5) inset, - 0 -1px 0 hsla(0,0%,100%,.2) inset !important; } - -#main-window[tabsintitlebar] #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { background-image: linear-gradient(rgba(255,255,255,.0), rgba(255,255,255,.0)) !important; - border-color: hsla(214,89%,21%,.9) !important; - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset !important; } diff --git a/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance.css b/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance.css index 74278e30..7e690950 100644 --- a/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance.css +++ b/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance.css @@ -7,25 +7,29 @@ /****************************************************************************************/ -#PersonalToolbar toolbarbutton, -#PlacesToolbar toolbarbutton { - -moz-appearance: toolbarbutton !important; - background: unset !important; - box-shadow: unset !important; - padding-left: 3px !important; - padding-right: 3px !important; - margin-left: 0px !important; - margin-right: 0px !important; -} +@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10) { + @media not all and (-moz-windows-classic) { + #PersonalToolbar toolbarbutton, + #PlacesToolbar toolbarbutton { + -moz-appearance: toolbarbutton !important; + background: unset !important; + box-shadow: unset !important; + padding-left: 3px !important; + padding-right: 3px !important; + margin-left: 0px !important; + margin-right: 0px !important; + } -#PersonalToolbar .toolbarbutton-badge-stack, -#PersonalToolbar toolbarbutton .toolbarbutton-icon { - background: unset !important; - box-shadow: unset !important; -} + #PersonalToolbar .toolbarbutton-badge-stack, + #PersonalToolbar toolbarbutton .toolbarbutton-icon { + background: unset !important; + box-shadow: unset !important; + } -#PersonalToolbar toolbarbutton .toolbarbutton-icon { - padding-left: 0px !important; - padding-right: 0px !important; - width: 16px !important; -} + #PersonalToolbar toolbarbutton .toolbarbutton-icon { + padding-left: 0px !important; + padding-right: 0px !important; + width: 16px !important; + } + } +} \ No newline at end of file diff --git a/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance_fx58_fix.css b/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance_fx58_fix.css new file mode 100644 index 00000000..74278e30 --- /dev/null +++ b/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance_fx58_fix.css @@ -0,0 +1,31 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +#PersonalToolbar toolbarbutton, +#PlacesToolbar toolbarbutton { + -moz-appearance: toolbarbutton !important; + background: unset !important; + box-shadow: unset !important; + padding-left: 3px !important; + padding-right: 3px !important; + margin-left: 0px !important; + margin-right: 0px !important; +} + +#PersonalToolbar .toolbarbutton-badge-stack, +#PersonalToolbar toolbarbutton .toolbarbutton-icon { + background: unset !important; + box-shadow: unset !important; +} + +#PersonalToolbar toolbarbutton .toolbarbutton-icon { + padding-left: 0px !important; + padding-right: 0px !important; + width: 16px !important; +} diff --git a/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_macOS_fix.css b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_macOS_fix.css new file mode 100644 index 00000000..859a13ff --- /dev/null +++ b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_macOS_fix.css @@ -0,0 +1,13 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +:-moz-any(#context-back,#context-forward,#context-reload,#context-stop,#context-bookmarkpage) image { + -moz-margin-start: 2px !important; + -moz-margin-end: 3px !important; +} diff --git a/classic/css/generalui/findbar_on_top.css b/classic/css/generalui/findbar_on_top.css index eae8cbe7..1bdfcd06 100644 --- a/classic/css/generalui/findbar_on_top.css +++ b/classic/css/generalui/findbar_on_top.css @@ -14,13 +14,18 @@ } :-moz-any(.browserContainer, #viewSource) .findbar-closebutton { - position: relative !important; - top: 4px !important; padding: 0 !important; margin: 0 !important; -moz-margin-end: 2px !important; } +@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10) { + :-moz-any(.browserContainer, #viewSource) .findbar-closebutton { + position: relative !important; + top: 4px !important; + } +} + :-moz-any(.browserContainer, #viewSource) .findbar-closebutton .toolbarbutton-icon{ width: 16px !important; height: 16px !important; @@ -42,11 +47,13 @@ } #main-window:not([style*='--lwt-header-image:url("resource:///chrome/browser/content/browser/defaultthemes/compact.header.png");']):-moz-lwtheme :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar) { + -moz-appearance: none !important; border: 1px solid var(--tabs-border-color) !important; border-top: 0px solid transparent !important; } #main-window:not([style*='--lwt-header-image:url("resource:///chrome/browser/content/browser/defaultthemes/compact.header.png");']):-moz-lwtheme :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar) .findbar-container { + -moz-appearance: none !important; background-image: linear-gradient(to bottom, var(--toolbar-bgcolor),transparent) !important; -moz-margin-end: -18px !important; -moz-padding-end: 18px !important; @@ -67,23 +74,26 @@ width: 100% !important; } -/**//* +/** #viewSource #FindToolbar { background-color: -moz-dialog; color: -moz-dialogtext; } +*/ -/* exclude these from Windows Classic theme */ -:-moz-any(.browserContainer,#viewSource) .findbar-button { - -moz-appearance: toolbarbutton !important; - background: unset !important; - box-shadow: unset !important; +@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10) { + @media not all and (-moz-windows-classic) { + :-moz-any(.browserContainer,#viewSource) .findbar-button { + -moz-appearance: toolbarbutton !important; + background: unset !important; + box-shadow: unset !important; + } + .browserContainer findbar toolbarbutton * { + background: unset !important; + box-shadow: unset !important; + } + } } -.browserContainer findbar toolbarbutton * { - background: unset !important; - box-shadow: unset !important; -} -/**/ :-moz-any(.browserContainer, #viewSource) :-moz-any(.findbar-find-status,.found-matches) { -moz-margin-start: 4px !important; diff --git a/classic/css/generalui/findbar_on_top_fx58_fix.css b/classic/css/generalui/findbar_on_top_fx58_fix.css new file mode 100644 index 00000000..b6ed0825 --- /dev/null +++ b/classic/css/generalui/findbar_on_top_fx58_fix.css @@ -0,0 +1,24 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +:-moz-any(.browserContainer, #viewSource) .findbar-closebutton { + position: relative !important; + top: 4px !important; +} + +:-moz-any(.browserContainer,#viewSource) .findbar-button { + -moz-appearance: toolbarbutton !important; + background: unset !important; + box-shadow: unset !important; +} + +.browserContainer findbar toolbarbutton * { + background: unset !important; + box-shadow: unset !important; +} diff --git a/classic/css/tabs/custom_colors_for_squared_tabs.css b/classic/css/tabs/custom_colors_for_squared_tabs.css index 475b9c95..f302e3dc 100644 --- a/classic/css/tabs/custom_colors_for_squared_tabs.css +++ b/classic/css/tabs/custom_colors_for_squared_tabs.css @@ -15,6 +15,7 @@ background: linear-gradient(to bottom,#FF8800,#FFCC99) !important; } /* background color on toolbars */ +#main-window :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar), #main-window * #navigator-toolbox toolbar:not(#TabsToolbar):not(#toolbar-menubar) { background: linear-gradient(to bottom,#FFCC99,#FFCC99) !important; } diff --git a/classic/css/tabs/custom_colors_for_squared_tabs_australized.css b/classic/css/tabs/custom_colors_for_squared_tabs_australized.css index b8ff86c8..93e718be 100644 --- a/classic/css/tabs/custom_colors_for_squared_tabs_australized.css +++ b/classic/css/tabs/custom_colors_for_squared_tabs_australized.css @@ -15,6 +15,7 @@ background: linear-gradient(to bottom,#FF8800,#FFCC99) !important; } /* background color on toolbars */ +#main-window :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar), #main-window * #navigator-toolbox toolbar:not(#TabsToolbar):not(#toolbar-menubar) { background: linear-gradient(to bottom,#FFCC99,#FFCC99) !important; } diff --git a/classic/css/tabs/tabs_below_navigation_toolbar.css b/classic/css/tabs/tabs_below_navigation_toolbar.css index a361921b..dd38458a 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar.css @@ -57,7 +57,7 @@ } #main-window[inDOMFullscreen="true"] #TabsToolbar { - visibility: hidden !important; + opacity: 0 !important; } /* tab height */ @@ -107,10 +107,12 @@ /* adjust compact themes background color */ #main-window[style*='--lwt-header-image:url("resource:///chrome/browser/content/browser/defaultthemes/compact.header.png");']:-moz-lwtheme-brighttext #TabsToolbar:-moz-lwtheme { - background-image: linear-gradient(#323234,#323234) !important; + -moz-appearance: none !important; + background-image: linear-gradient(var(--toolbar-bgcolor),var(--toolbar-bgcolor)) !important; } #main-window[style*='--lwt-header-image:url("resource:///chrome/browser/content/browser/defaultthemes/compact.header.png");']:-moz-lwtheme-darktext #TabsToolbar:-moz-lwtheme { - background-image: linear-gradient(#f5f6f7,#f5f6f7) !important; + -moz-appearance: none !important; + background: linear-gradient(var(--toolbar-bgcolor),var(--toolbar-bgcolor)) !important; } #main-window:not(:-moz-lwtheme) #TabsToolbar :-moz-any(.tabs-newtab-button,.scrollbutton-up,.scrollbutton-down), diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_macOS_fix.css b/classic/css/tabs/tabs_below_navigation_toolbar_macOS_fix.css new file mode 100644 index 00000000..eb6e63ae --- /dev/null +++ b/classic/css/tabs/tabs_below_navigation_toolbar_macOS_fix.css @@ -0,0 +1,15 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] { + margin-top: 24px !important; +} +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] { + margin-top: 24px !important; +} diff --git a/classic/css/toolbars/general_toolbar_colors.css b/classic/css/toolbars/general_toolbar_colors.css index 83450a5f..0122824f 100644 --- a/classic/css/toolbars/general_toolbar_colors.css +++ b/classic/css/toolbars/general_toolbar_colors.css @@ -36,11 +36,11 @@ toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) } #nav-bar:not(:-moz-lwtheme) { - background-image: var(--general_toolbar_color_navbar) !important; + background-image: var(--general_toolbar_color_navbar, inherit) !important; } toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) { - background-image: var(--general_toolbar_color_toolbars) !important; + background-image: var(--general_toolbar_color_toolbars, inherit) !important; } #main-window:not(:-moz-lwtheme) #PersonalToolbar #bookmarks-menu-button::after, @@ -48,13 +48,13 @@ toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) #main-window:not(:-moz-lwtheme) #nav-bar-customization-target > toolbarbutton > .toolbarbutton-text, #main-window:not(:-moz-lwtheme) #main-menubar > menu > :-moz-any(label,description), #main-window:not(:-moz-lwtheme) #PlacesToolbarItems toolbarbutton > :-moz-any(label,description) { - color: var(--general_toolbar_text_color) !important; - text-shadow: 1px 1px 1px var(--general_toolbar_text_shadow) !important; + color: var(--general_toolbar_text_color, inherit) !important; + text-shadow: 1px 1px 1px var(--general_toolbar_text_shadow, inherit) !important; } /* findbar */ #main-window:not([style*='--lwt-header-image:url("resource:///chrome/browser/content/browser/defaultthemes/compact.header.png");']) :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar) { - background: var(--general_toolbar_color_toolbars) !important; + background: var(--general_toolbar_color_toolbars, inherit) !important; } #main-window:not([style*='--lwt-header-image:url("resource:///chrome/browser/content/browser/defaultthemes/compact.header.png");']):-moz-lwtheme :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar) { diff --git a/classic/userChrome.css b/classic/userChrome.css index 69216ef0..ac5ace43 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.5.9 ********************************************************************************/ +/* version 1.6.0 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -31,16 +31,21 @@ - some '@import' features might not work properly on macOS and Linux - some '@import' features might not work properly, if multi-process mode (e10s) is disabled - FIREFOX 58 BUG: bugzilla.mozilla.org/show_bug.cgi?id=1431933 + FIREFOX 58 BUG: bugzilla.mozilla.org/show_bug.cgi?id=1431933 - DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/101 - - some @media rules get ignored so some options required temporal fixes - - look for TEMPORAL FIX FOR FIREFOX 58 TEMPORAL FX58 fix additions + - some @media rules get ignored -> temporal fixes required + - look for TEMPORAL FIX FOR FIREFOX 58 or TEMPORAL FX58 fix additions + + MACOS issues / glitches / fixes -> look for 'macOS fix' + - tabs toolbar spaces in 'toolbars' category + - tabs not on top mode in 'tabs toolbar position' category + - page context items in 'general ui' category - CSS tweaks won't work, if @namespace references are used inside .css files! + CSS tweaks won't work, if '@namespace' references are used inside .css files! Do not report issues with EXPERIMENTAL settings! They are for testing only! - All options have significant categories & names. Read whole file to get an overview. + All options have significant categories and names. Read this file to get an overview. GENERAL SUPPORT / DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/88 @@ -102,8 +107,10 @@ /* @import url(./css/buttons/icons_custom_icons_fx45_inverted.css); /**/ /* bookmarks toolbar - buttons appearance - only use one at a time ******************************/ -/* old bookmarks toolbar button appearance - 'disable' for Windows 7s classic OS theme **********/ +/* old bookmarks toolbar button appearance ******************************************************/ @import url(./css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance.css); /**/ +/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS DEFAULT OS THEME ***************************************/ +/* @import url(./css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* @import url(./css/buttons/buttons_on_bookmarks_toolbar_classic_appearance.css); /**/ /* @import url(./css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items.css); /**/ @@ -115,7 +122,7 @@ /* popup appearance *****************************************************************************/ @import url(./css/buttons/bookmarks_menu_button_popup_classic_appearance.css); /**/ /* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ -/* @import url(./css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ +/* @import url(./css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* menubar - toolbar button appearance **********************************************************/ /* @import url(./css/buttons/buttons_on_menubar_toolbar_classic_appearance.css); /**/ @@ -127,7 +134,7 @@ /* CUSTOM BACK & FORWARD BUTTONS appearance - only use one at a time ****************************/ /* @import url(./css/buttons/custom_backforward_connected_to_location_bar.css); /**/ -/* @import url(./css/buttons/custom_backforward_connected_to_location_bar_aero.css); /**/ /* <-- AERO colors */ +/* @import url(./css/buttons/custom_backforward_connected_to_location_bar_aero.css); /**/ /* <-- AERO colors */ /* @import url(./css/buttons/custom_backforward_large_ff2.css); /**/ /* @import url(./css/buttons/custom_backforward_large_ff3.css); /**/ /* @import url(./css/buttons/custom_backforward_large_ff3_strata.css); /**/ @@ -194,7 +201,7 @@ /* @import url(./css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css); /**/ /* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ -/* @import url(./css/buttons/appbutton_in_titlebar_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ +/* @import url(./css/buttons/appbutton_in_titlebar_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* button color - only use one at a time ********************************************************/ @import url(./css/buttons/appbutton_in_titlebar_autocolor.css); /**/ @@ -216,7 +223,7 @@ @import url(./css/tabs/classic_squared_tabs.css); /**/ /* @import url(./css/tabs/classic_squared_tabs_australized.css); /**/ /* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS 10 *****************************************************/ -/* @import url(./css/tabs/classic_squared_tabs_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ +/* @import url(./css/tabs/classic_squared_tabs_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* custom tab colors for default/active/hovered/unread/unloaded tabs ****************************/ /* only use one at a time - edit target file to set own custom colors ***************************/ @@ -235,19 +242,20 @@ /* @import url(./css/tabs/tabs_below_titlebar_above_navigation_toolbar.css); /**/ /* - TABS BELOW NAVIGATION AND BOOKMARKS TOOLBARS (tabs not on top) *****************************/ /* @import url(./css/tabs/tabs_below_navigation_toolbar.css); /**/ /* <-- tabs not on top */ +/* @import url(./css/tabs/tabs_below_navigation_toolbar_macOS_fix.css); /**/ /* <-- macOS fix */ /* - TABS BELOW MAIN CONTENT (tabs on bottom) - EXPERIMENTAL ************************************/ /* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/33 ************************/ /* @import url(./css/tabs/tabs_below_main_content.css); /**/ /* <--- EXPERIMENTAL */ /* TEMPORAL FIX FOR FIREFOX 58 & TABS BELOW NAVIGATION TOOLBAR and MAIN CONTENT *****************/ /* - for Windows 7s default theme ***************************************************************/ -/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.css); /**/ /* <-- TEMPORAL FX58 fix */ +/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.css); /**/ /* <-- TEMPORAL FX58 fix */ /* - for Windows 7s classic theme ***************************************************************/ -/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css); /**/ /* <-- TEMPORAL FX58 fix */ +/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css); /**/ /* <-- TEMPORAL FX58 fix */ /* - for Windows 10 *****************************************************************************/ -/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css); /**/ /* <-- TEMPORAL FX58 fix */ +/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css); /**/ /* <-- TEMPORAL FX58 fix */ /************************************************************************************************/ /* - MOVE NAVIGATION TOOLBAR UP TO HIGHER POSITON (tabs not on top) - only use one at a time ****/ -/* @import url(./css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon.css); /**/ /* <--- EXPERIMENTAL */ +/* @import url(./css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon.css); /**/ /* <--- EXPERIMENTAL */ /* @import url(./css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton.css); /**/ /* <--- EXPERIMENTAL */ /* @import url(./css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton_icon_only.css); /**/ /* <--- EXPERIMENTAL */ /************************************************************************************************/ @@ -336,7 +344,9 @@ /* @import url(./css/generalui/sidebar_appearance_lwtheme_dark.css); /**/ /* findbar **************************************************************************************/ -/* @import url(./css/generalui/findbar_on_top.css); /**/ + @import url(./css/generalui/findbar_on_top.css); /**/ +/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS DEFAULT OS THEME ***************************************/ +/* @import url(./css/generalui/findbar_on_top_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* @import url(./css/generalui/findbar_show_full_quickfindbar.css); /**/ /* findbar - close icon position - only use one at a time ***************************************/ /* @import url(./css/generalui/findbar_on_top_close_at_findbars_start.css); /**/ @@ -347,8 +357,9 @@ /* menuitem labels - only use one at a time *****************************************************/ @import url(./css/generalui/context_bfrsb_labels_without_icons.css); /**/ /* @import url(./css/generalui/context_bfrsb_labels_with_icons.css); /**/ +/* @import url(./css/generalui/context_bfrsb_labels_with_and_without_icons_macOS_fix.css); /**/ /* <-- macOS fix */ /* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ -/* @import url(./css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ +/* @import url(./css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* close icons for general ui and tabs - only use one at a time *********************************/ /* @import url(./css/generalui/close_icon_windows7.css); /**/ @@ -393,7 +404,7 @@ /* general toolbar settings *********************************************************************/ @import url(./css/toolbars/toolbars_old_padding.css); /**/ @import url(./css/toolbars/tabs_toolbar_adjustments.css); /**/ -/* @import url(./css/toolbars/tabs_toolbar_adjustments_macOS_fix.css); /**/ /* <-- macOS fix */ +/* @import url(./css/toolbars/tabs_toolbar_adjustments_macOS_fix.css); /**/ /* <-- macOS fix */ /* @import url(./css/toolbars/navbar_more_compact_mode.css); /**/ /* edit target file to select which items to hide ***********************************************/ diff --git a/classic/userContent.css b/classic/userContent.css index 95b0575a..9a428c12 100644 --- a/classic/userContent.css +++ b/classic/userContent.css @@ -26,16 +26,16 @@ - some '@import' features might not work properly on macOS and Linux - some '@import' features might not work properly, if multi-process mode (e10s) is disabled - FIREFOX 58 BUG: bugzilla.mozilla.org/show_bug.cgi?id=1431933 + FIREFOX 58 BUG: bugzilla.mozilla.org/show_bug.cgi?id=1431933 - DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/101 - - some @media rules get ignored so some options required temporal fixes - - look for TEMPORAL FIX FOR FIREFOX 58 TEMPORAL FX58 fix additions + - some @media rules get ignored -> temporal fixes required + - look for TEMPORAL FIX FOR FIREFOX 58 or TEMPORAL FX58 fix additions - CSS tweaks won't work, if @namespace references are used inside .css files! + CSS tweaks won't work, if '@namespace' references are used inside .css files! Do not report issues with EXPERIMENTAL settings! They are for testing only! - All options have significant categories & names. Read whole file to get an overview. + All options have significant categories and names. Read this file to get an overview. GENERAL SUPPORT / DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/88 From 3b895fc344f5b8b9e669de00df63d3ecaffbd121 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Sat, 27 Jan 2018 21:23:07 +0100 Subject: [PATCH 08/47] 1.6.1 --- ...ton_in_titlebar_icon_only_browser_logo.css | 2 + .../appbutton_in_titlebar_label_and_icon.css | 10 +++ ...button_in_titlebar_label_and_icon_base.css | 72 +++++++++++++++++++ ...n_titlebar_label_and_icon_browser_logo.css | 10 +++ ...button_in_titlebar_label_and_icon_dark.css | 10 +++ ...button_in_titlebar_label_and_icon_grey.css | 10 +++ .../tab_icon_inactive_tabs_lower_opacity.css | 12 ++++ classic/userChrome.css | 9 ++- 8 files changed, 133 insertions(+), 2 deletions(-) create mode 100644 classic/css/buttons/appbutton_in_titlebar_label_and_icon.css create mode 100644 classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css create mode 100644 classic/css/buttons/appbutton_in_titlebar_label_and_icon_browser_logo.css create mode 100644 classic/css/buttons/appbutton_in_titlebar_label_and_icon_dark.css create mode 100644 classic/css/buttons/appbutton_in_titlebar_label_and_icon_grey.css create mode 100644 classic/css/tabs/tab_icon_inactive_tabs_lower_opacity.css diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css b/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css index 70ce8fa7..26adc6f7 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css @@ -13,6 +13,8 @@ #main-window[tabsintitlebar] #navigator-toolbox #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button .toolbarbutton-icon { list-style-image: url("chrome://branding/content/about-logo.png") !important; width: 18px !important; + padding-top: 1px !important; + padding-bottom: 1px !important; } diff --git a/classic/css/buttons/appbutton_in_titlebar_label_and_icon.css b/classic/css/buttons/appbutton_in_titlebar_label_and_icon.css new file mode 100644 index 00000000..6dc3cd70 --- /dev/null +++ b/classic/css/buttons/appbutton_in_titlebar_label_and_icon.css @@ -0,0 +1,10 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + +@import url(appbutton_in_titlebar_icon_only.css); +@import url(appbutton_in_titlebar_label_and_icon_base.css); diff --git a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css new file mode 100644 index 00000000..e8b52b8b --- /dev/null +++ b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css @@ -0,0 +1,72 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +/* gain space before tabs toolbar */ +#main-window[tabsintitlebar] #toolbar-menubar, +#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ + -moz-padding-start: 95px !important; +} + +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar, +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ + -moz-padding-start: 94px !important; +} + +#main-window[uidensity=compact][tabsintitlebar] #toolbar-menubar, +#main-window[uidensity=compact][tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ + -moz-padding-start: 93px !important; +} + +#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar, +#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ + -moz-padding-start: 92px !important; +} + +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { + background-clip: padding-box !important; + width: 90px !important; +} + +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button .toolbarbutton-icon { + -moz-margin-start: -16px !important; +} + +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button::after { + display: block !important; + color: white !important; + font-weight: bold !important; + text-shadow: 0 0 1px rgba(0,0,0,.7), + 0 1px 1.5px rgba(0,0,0,.5) !important; + margin-top: 0px !important; + margin-bottom: 2px !important; + border: unset !important; + box-shadow: unset !important; +} + +/* 'Firefox' title */ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Firefox"]::after, +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button:not([label="Nightly"]):not([label="Firefox Nightly"]):not([label="Firefox Developer Edition"]):not([label="Firefox"])::after { + content: "Firefox" !important; +} + +/* 'DevFox' title */ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]::after { + content: "DevFox" !important; +} + +/* 'Nightly' title */ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Nightly"]::after, +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button[label="Firefox Nightly"]::after { + content: "Nightly" !important; +} + +/* custom button title (remove Firefox/DevFox/Nightly) *//* +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button::after{ + content: "MyTitle" !important; +} diff --git a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_browser_logo.css b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_browser_logo.css new file mode 100644 index 00000000..61971b69 --- /dev/null +++ b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_browser_logo.css @@ -0,0 +1,10 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + +@import url(appbutton_in_titlebar_icon_only_browser_logo.css); +@import url(appbutton_in_titlebar_label_and_icon_base.css); diff --git a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_dark.css b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_dark.css new file mode 100644 index 00000000..1a2908d2 --- /dev/null +++ b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_dark.css @@ -0,0 +1,10 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + +@import url(appbutton_in_titlebar_icon_only_dark.css); +@import url(appbutton_in_titlebar_label_and_icon_base.css); diff --git a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_grey.css b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_grey.css new file mode 100644 index 00000000..f2938e22 --- /dev/null +++ b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_grey.css @@ -0,0 +1,10 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + +@import url(appbutton_in_titlebar_icon_only_grey.css); +@import url(appbutton_in_titlebar_label_and_icon_base.css); diff --git a/classic/css/tabs/tab_icon_inactive_tabs_lower_opacity.css b/classic/css/tabs/tab_icon_inactive_tabs_lower_opacity.css new file mode 100644 index 00000000..5a7ea135 --- /dev/null +++ b/classic/css/tabs/tab_icon_inactive_tabs_lower_opacity.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 (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +.tabbrowser-tab:not([selected="true"]) .tab-icon-image { + opacity: 0.5 !important; +} \ No newline at end of file diff --git a/classic/userChrome.css b/classic/userChrome.css index ac5ace43..4596e39b 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.6.0 ********************************************************************************/ +/* version 1.6.1 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -194,11 +194,15 @@ /************************************************************************************************/ /* button in titlebar - only use one at a time **************************************************/ -@import url(./css/buttons/appbutton_in_titlebar.css); /**/ +@import url(./css/buttons/appbutton_in_titlebar.css); /**/ /* <-- label only */ /* @import url(./css/buttons/appbutton_in_titlebar_icon_only.css); /**/ /* @import url(./css/buttons/appbutton_in_titlebar_icon_only_dark.css); /**/ /* @import url(./css/buttons/appbutton_in_titlebar_icon_only_grey.css); /**/ /* @import url(./css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css); /**/ +/* @import url(./css/buttons/appbutton_in_titlebar_label_and_icon.css); /**/ +/* @import url(./css/buttons/appbutton_in_titlebar_label_and_icon_dark.css); /**/ +/* @import url(./css/buttons/appbutton_in_titlebar_label_and_icon_grey.css); /**/ +/* @import url(./css/buttons/appbutton_in_titlebar_label_and_icon_browser_logo.css); /**/ /* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ /* @import url(./css/buttons/appbutton_in_titlebar_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ @@ -310,6 +314,7 @@ /* other tab settings ***************************************************************************/ @import url(./css/tabs/tab_icon_colors.css); /**/ +/* @import url(./css/tabs/tab_icon_inactive_tabs_lower_opacity.css); /**/ /* @import url(./css/tabs/tab_maxwidth.css); /**/ /* @import url(./css/tabs/tab_titles_remove_blur.css); /**/ /* @import url(./css/tabs/alltabs_button_always_visible.css); /**/ From 4f6c659ea9182e9d1d5194a2eb249315b2be6834 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Mon, 29 Jan 2018 10:00:19 +0100 Subject: [PATCH 09/47] 1.6.2 --- classic/css/buttons/appbutton_in_titlebar.css | 10 ++- .../appbutton_in_titlebar_autocolor.css | 12 +-- .../appbutton_in_titlebar_icon_only.css | 5 ++ ...button_in_titlebar_label_and_icon_base.css | 5 ++ .../appbutton_on_navbar_color_aurora.css | 8 +- .../appbutton_on_navbar_color_autocolor.css | 24 +++--- ...appbutton_on_navbar_color_autocolor57p.css | 24 +++--- .../appbutton_on_navbar_color_base.css | 18 +++-- .../appbutton_on_navbar_color_deved57p.css | 8 +- .../appbutton_on_navbar_color_nightly.css | 8 +- .../appbutton_on_navbar_color_nightly57p.css | 8 +- .../appbutton_on_navbar_color_orange.css | 8 +- .../appbutton_on_navbar_color_palemoon.css | 8 +- .../appbutton_on_navbar_icon_and_label.css | 13 ++++ .../tabs/tab_title_in_firefox_titlebar.css | 78 +++++++++++++++++++ .../toolbars/bookmarks_toolbar_autohide.css | 24 ++++++ classic/userChrome.css | 29 ++++--- 17 files changed, 219 insertions(+), 71 deletions(-) create mode 100644 classic/css/buttons/appbutton_on_navbar_icon_and_label.css create mode 100644 classic/css/tabs/tab_title_in_firefox_titlebar.css create mode 100644 classic/css/toolbars/bookmarks_toolbar_autohide.css diff --git a/classic/css/buttons/appbutton_in_titlebar.css b/classic/css/buttons/appbutton_in_titlebar.css index c152e993..c0320eaa 100644 --- a/classic/css/buttons/appbutton_in_titlebar.css +++ b/classic/css/buttons/appbutton_in_titlebar.css @@ -239,15 +239,15 @@ } /*private browsing - purple */ -#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button{ +#main-window[privatebrowsingmode=temporary][tabsintitlebar] #navigator-toolbox #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button{ background-image: linear-gradient(rgb(153,38,211), rgb(105,19,163) 95%) !important; } -#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ +#main-window[privatebrowsingmode=temporary][tabsintitlebar] #navigator-toolbox #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, rgba(240,193,255,.5) 10%, rgba(240,193,255,0) 70%), radial-gradient(farthest-side at center bottom, rgb(192,81,247), rgba(236,172,255,0)), linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important; } -#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { +#main-window[privatebrowsingmode=temporary][tabsintitlebar] #navigator-toolbox #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important; } @@ -293,3 +293,7 @@ margin-bottom: unset !important; } +/* support for tab title in Firefox titlebar option*/ +#main-window[tabsintitlebar]::after { + -moz-margin-start: 95px !important; +} \ No newline at end of file diff --git a/classic/css/buttons/appbutton_in_titlebar_autocolor.css b/classic/css/buttons/appbutton_in_titlebar_autocolor.css index fb7e68d5..f947edad 100644 --- a/classic/css/buttons/appbutton_in_titlebar_autocolor.css +++ b/classic/css/buttons/appbutton_in_titlebar_autocolor.css @@ -8,27 +8,27 @@ /* Aurora */ -#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"] { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"] { background-image: linear-gradient(hsl(208,99%,37%), hsl(214,90%,23%) 95%) !important; } -#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, hsla(202,100%,85%,.5) 10%, hsla(202,100%,85%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(205,100%,72%,.7), hsla(205,100%,72%,0)), linear-gradient(hsl(208,98%,34%), hsl(213,87%,20%) 95%) !important; } -#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:-moz-any(:hover:active,[open]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button[label="Firefox Developer Edition"]:-moz-any(:hover:active,[open]) { background-image: linear-gradient(hsl(208,95%,30%), hsl(214,85%,17%) 95%) !important; } /* Nightly */ -#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]) { background-image: linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%) !important; } -#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:not(:active):not([open]){ +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:not(:active):not([open]){ background-image: radial-gradient(farthest-side at center bottom, hsla(210,48%,90%,.5) 10%, hsla(210,48%,90%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(211,70%,83%,.5), hsla(211,70%,83%,0)), linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%) !important; } -#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):-moz-any(:hover:active,[open]) { +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):-moz-any(:hover:active,[open]) { background-image: linear-gradient(hsl(211,33%,26%), hsl(209,53%,6%) 95%) !important; } \ No newline at end of file diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only.css b/classic/css/buttons/appbutton_in_titlebar_icon_only.css index fb9e977e..8d12164b 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only.css @@ -240,3 +240,8 @@ opacity: 1.0 !important; margin-bottom: unset !important; } + +/* support for tab title in Firefox titlebar option*/ +#main-window[tabsintitlebar]::after { + -moz-margin-start: 45px !important; +} diff --git a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css index e8b52b8b..967a5f64 100644 --- a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css +++ b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css @@ -70,3 +70,8 @@ #main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-menu-button::after{ content: "MyTitle" !important; } + +/* support for tab title in Firefox titlebar option*/ +#main-window[tabsintitlebar]::after { + -moz-margin-start: 95px !important; +} diff --git a/classic/css/buttons/appbutton_on_navbar_color_aurora.css b/classic/css/buttons/appbutton_on_navbar_color_aurora.css index 15c4b982..ec21cb4d 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_aurora.css +++ b/classic/css/buttons/appbutton_on_navbar_color_aurora.css @@ -10,7 +10,7 @@ @import url(./appbutton_on_navbar_color_base.css); /* aurora */ -#nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(hsl(208,99%,37%), hsl(214,90%,23%) 95%) !important; border-color: hsla(214,89%,21%,.9) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -18,7 +18,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at center bottom, hsla(202,100%,85%,.5) 10%, hsla(202,100%,85%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(205,100%,72%,.7), hsla(205,100%,72%,0)), linear-gradient(hsl(208,98%,34%), hsl(213,87%,20%) 95%) !important; @@ -27,8 +27,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button[open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button[open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(hsl(208,95%,30%), hsl(214,85%,17%) 95%) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, diff --git a/classic/css/buttons/appbutton_on_navbar_color_autocolor.css b/classic/css/buttons/appbutton_on_navbar_color_autocolor.css index 546c428a..dc735e00 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_autocolor.css +++ b/classic/css/buttons/appbutton_on_navbar_color_autocolor.css @@ -10,7 +10,7 @@ @import url(./appbutton_on_navbar_color_base.css); /* autocolor - orange */ -#nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(rgb(247,182,82), rgb(215,98,10) 95%) !important; border-color: rgba(0,0,0,.12) rgba(0,0,0,.19) rgba(0,0,0,.38) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -18,7 +18,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at center bottom, rgba(252,240,89,.5) 10%, rgba(252,240,89,0) 70%), radial-gradient(farthest-side at center bottom, rgb(236,133,0), rgba(255,229,172,0)), linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important; @@ -27,8 +27,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button[open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button[open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, @@ -38,7 +38,7 @@ } /* aurora */ -#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(hsl(208,99%,37%), hsl(214,90%,23%) 95%) !important; border-color: hsla(214,89%,21%,.9) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -46,7 +46,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at center bottom, hsla(202,100%,85%,.5) 10%, hsla(202,100%,85%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(205,100%,72%,.7), hsla(205,100%,72%,0)), linear-gradient(hsl(208,98%,34%), hsl(213,87%,20%) 95%) !important; @@ -55,8 +55,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"][open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"][open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(hsl(208,95%,30%), hsl(214,85%,17%) 95%) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, @@ -66,7 +66,7 @@ } /* nightly */ -#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]) .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]) :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%) !important; border-color: hsla(210,59%,13%,.9) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -74,7 +74,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at center bottom, hsla(210,48%,90%,.5) 10%, hsla(210,48%,90%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(211,70%,83%,.5), hsla(211,70%,83%,0)), linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%) !important; @@ -83,8 +83,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"])[open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"])[open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(hsl(211,33%,26%), hsl(209,53%,6%) 95%) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, diff --git a/classic/css/buttons/appbutton_on_navbar_color_autocolor57p.css b/classic/css/buttons/appbutton_on_navbar_color_autocolor57p.css index 570de299..000cafc2 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_autocolor57p.css +++ b/classic/css/buttons/appbutton_on_navbar_color_autocolor57p.css @@ -10,7 +10,7 @@ @import url(./appbutton_on_navbar_color_base.css); /* autocolor 57+ - orange */ -#nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(rgb(247,182,82), rgb(215,98,10) 95%) !important; border-color: rgba(0,0,0,.12) rgba(0,0,0,.19) rgba(0,0,0,.38) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -18,7 +18,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at center bottom, rgba(252,240,89,.5) 10%, rgba(252,240,89,0) 70%), radial-gradient(farthest-side at center bottom, rgb(236,133,0), rgba(255,229,172,0)), linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important; @@ -27,8 +27,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button[open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button[open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, @@ -38,7 +38,7 @@ } /* aurora */ -#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(#0067de, #2398ff,#03daff) !important; border-color: hsla(214,89%,21%,.9) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -46,7 +46,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.5) 10%, hsla(0,0%,100%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.7), hsla(0,0%,100%,0)), linear-gradient(#0067de, #2398ff,#03daff) !important; @@ -55,8 +55,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"][open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"]:hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button[label="Firefox Developer Edition"][open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(#0067de, #2398ff,#03daff) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, @@ -66,7 +66,7 @@ } /* nightly */ -#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]) .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]) :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; border-color: hsla(210,59%,13%,.9) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -74,7 +74,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.5) 10%, hsla(0,0%,100%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.7), hsla(0,0%,100%,0)), linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; @@ -83,8 +83,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"])[open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"]):hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button:-moz-any([label="Nightly"],[label="Firefox Nightly"])[open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, diff --git a/classic/css/buttons/appbutton_on_navbar_color_base.css b/classic/css/buttons/appbutton_on_navbar_color_base.css index 24b1bdb5..99a5092f 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_base.css +++ b/classic/css/buttons/appbutton_on_navbar_color_base.css @@ -14,16 +14,16 @@ } /* force roundness known from CTR *//* -#PanelUI-menu-button .toolbarbutton-badge-stack { +#PanelUI-menu-button :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { border-radius: 2.5px !important; } */ /* private mode color */ -#main-window[privatebrowsingmode=temporary] #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack{ +#main-window[privatebrowsingmode=temporary] #nav-bar #PanelUI-menu-button :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text){ background-image: linear-gradient(rgb(153,38,211), rgb(105,19,163) 95%) !important; } -#main-window[privatebrowsingmode=temporary] #nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) .toolbarbutton-badge-stack{ +#main-window[privatebrowsingmode=temporary] #nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text){ background-image: radial-gradient(farthest-side at center bottom, rgba(240,193,255,.5) 10%, rgba(240,193,255,0) 70%), radial-gradient(farthest-side at center bottom, rgb(192,81,247), rgba(236,172,255,0)), linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important; @@ -32,8 +32,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#main-window[privatebrowsingmode=temporary] #nav-bar #PanelUI-menu-button:hover:active .toolbarbutton-badge-stack, -#main-window[privatebrowsingmode=temporary] #nav-bar #PanelUI-menu-button[open] .toolbarbutton-badge-stack { +#main-window[privatebrowsingmode=temporary] #nav-bar #PanelUI-menu-button:hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#main-window[privatebrowsingmode=temporary] #nav-bar #PanelUI-menu-button[open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, @@ -42,4 +42,12 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } + +#nav-bar #PanelUI-menu-button .toolbarbutton-text { + color: white !important; + font-weight: bold !important; + text-shadow: 0 0 1px rgba(0,0,0,.7), + 0 1px 1.5px rgba(0,0,0,.5) !important; +} + /**/ diff --git a/classic/css/buttons/appbutton_on_navbar_color_deved57p.css b/classic/css/buttons/appbutton_on_navbar_color_deved57p.css index 687ae2a1..f1daf9ea 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_deved57p.css +++ b/classic/css/buttons/appbutton_on_navbar_color_deved57p.css @@ -10,7 +10,7 @@ @import url(./appbutton_on_navbar_color_base.css); /* deved */ -#nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(#0067de, #2398ff,#03daff) !important; border-color: hsla(210,59%,13%,.9) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -18,7 +18,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.5) 10%, hsla(0,0%,100%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.7), hsla(0,0%,100%,0)), linear-gradient(#0067de, #2398ff,#03daff) !important; @@ -27,8 +27,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button[open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button[open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(#0067de, #2398ff,#03daff) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, diff --git a/classic/css/buttons/appbutton_on_navbar_color_nightly.css b/classic/css/buttons/appbutton_on_navbar_color_nightly.css index b3c1dbce..295a1822 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_nightly.css +++ b/classic/css/buttons/appbutton_on_navbar_color_nightly.css @@ -10,7 +10,7 @@ @import url(./appbutton_on_navbar_color_base.css); /* nightly */ -#nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%) !important; border-color: hsla(210,59%,13%,.9) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -18,7 +18,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at center bottom, hsla(210,48%,90%,.5) 10%, hsla(210,48%,90%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(211,70%,83%,.5), hsla(211,70%,83%,0)), linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%) !important; @@ -27,8 +27,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button[open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button[open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(hsl(211,33%,26%), hsl(209,53%,6%) 95%) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, diff --git a/classic/css/buttons/appbutton_on_navbar_color_nightly57p.css b/classic/css/buttons/appbutton_on_navbar_color_nightly57p.css index 757c992d..9be1a5eb 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_nightly57p.css +++ b/classic/css/buttons/appbutton_on_navbar_color_nightly57p.css @@ -10,7 +10,7 @@ @import url(./appbutton_on_navbar_color_base.css); /* Nightly 57+ */ -#nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; border-color: hsla(210,59%,13%,.9) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -18,7 +18,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.5) 10%, hsla(0,0%,100%,0) 70%), radial-gradient(farthest-side at center bottom, hsla(0,0%,100%,.7), hsla(0,0%,100%,0)), linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; @@ -27,8 +27,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button[open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button[open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(to right, #b539f9, #42acff,#00dd68) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, diff --git a/classic/css/buttons/appbutton_on_navbar_color_orange.css b/classic/css/buttons/appbutton_on_navbar_color_orange.css index 921891f6..d7a13a70 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_orange.css +++ b/classic/css/buttons/appbutton_on_navbar_color_orange.css @@ -10,7 +10,7 @@ @import url(./appbutton_on_navbar_color_base.css); /* orange */ -#nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(rgb(247,182,82), rgb(215,98,10) 95%) !important; border-color: rgba(0,0,0,.12) rgba(0,0,0,.19) rgba(0,0,0,.38) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -18,7 +18,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at center bottom, rgba(252,240,89,.5) 10%, rgba(252,240,89,0) 70%), radial-gradient(farthest-side at center bottom, rgb(236,133,0), rgba(255,229,172,0)), linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important; @@ -27,8 +27,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button[open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button[open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, diff --git a/classic/css/buttons/appbutton_on_navbar_color_palemoon.css b/classic/css/buttons/appbutton_on_navbar_color_palemoon.css index b66224ba..9323ccbc 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_palemoon.css +++ b/classic/css/buttons/appbutton_on_navbar_color_palemoon.css @@ -10,7 +10,7 @@ @import url(./appbutton_on_navbar_color_base.css); /* Palemoon */ -#nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background: linear-gradient(rgb(82,182,247), rgb(10,98,215) 95%) !important; border-color: rgba(6,42,83,.9) !important; box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset, @@ -18,7 +18,7 @@ 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:not(:active):not([open]) > :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: radial-gradient(farthest-side at bottom, rgba(89,240,252,.5) 10%, rgba(89,240,252,0) 70%), radial-gradient(farthest-side at bottom, rgb(60,68,236), rgba(172,229,255,0)), linear-gradient(rgb(69,170,246), rgb(30,40,209) 95%) !important; @@ -27,8 +27,8 @@ 0 0 3.5px hsl(190,90%,80%), 0 0 0 1px rgba(0,0,0,.8) inset !important; } -#nav-bar #PanelUI-menu-button:hover:active .toolbarbutton-badge-stack, -#nav-bar #PanelUI-menu-button[open] .toolbarbutton-badge-stack { +#nav-bar #PanelUI-menu-button:hover:active :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text), +#nav-bar #PanelUI-menu-button[open] :-moz-any(.toolbarbutton-badge-stack,.toolbarbutton-text) { background-image: linear-gradient(rgb(69,170,246), rgb(0,74,209) 95%) !important; box-shadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 2px rgba(0,0,0,.3) inset, diff --git a/classic/css/buttons/appbutton_on_navbar_icon_and_label.css b/classic/css/buttons/appbutton_on_navbar_icon_and_label.css new file mode 100644 index 00000000..37e6c671 --- /dev/null +++ b/classic/css/buttons/appbutton_on_navbar_icon_and_label.css @@ -0,0 +1,13 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +#nav-bar #PanelUI-menu-button .toolbarbutton-text { + display: block !important; + -moz-margin-start: -1px !important; +} diff --git a/classic/css/tabs/tab_title_in_firefox_titlebar.css b/classic/css/tabs/tab_title_in_firefox_titlebar.css new file mode 100644 index 00000000..bae504e4 --- /dev/null +++ b/classic/css/tabs/tab_title_in_firefox_titlebar.css @@ -0,0 +1,78 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +#main-window[tabsintitlebar][sizemode="normal"] #TabsToolbar, +#main-window[uidensity=compact][tabsintitlebar][sizemode="normal"] #TabsToolbar{ + -moz-padding-start: 2px !important; + margin-top: 3px !important; +} + +#main-window[tabsintitlebar][sizemode="maximized"] #TabsToolbar, +#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #TabsToolbar{ + -moz-padding-start: 0px !important; + margin-top: 0px !important; +} + +#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar, +#main-window[uidensity=compact][tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ + -moz-padding-start: 2px !important; + margin-top: 19px !important; +} + +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar, +#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ + -moz-padding-start: 0px !important; + margin-top: 24px !important; +} + +#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="false"], +#main-window[uidensity=compact][tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"]:not([inactive="true"]), +#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="false"], +#main-window[uidensity=compact][tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"]:not([inactive="true"]) { + -moz-padding-start: 0px !important; + margin-top: 24px !important; +} + +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="false"], +#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"]:not([inactive="true"]), +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="false"], +#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"]:not([inactive="true"]) { + -moz-padding-start: 0px !important; + margin-top: 24px !important; +} + +#main-window[tabsintitlebar] #TabsToolbar .titlebar-placeholder[type="caption-buttons"]{ + display: none !important; +} + + +#main-window[tabsintitlebar]::after { + -moz-appearance: none !important; + position: fixed !important; + display: block !important; + content: attr(title) !important; + padding: 0 2px !important; + top: 2px !important; + -moz-margin-end: 105px !important; + min-height: 16px !important; + height: 16px !important; + max-height: 16px !important; + text-overflow: ellipsis !important; + overflow: hidden !important; + color: CaptionText !important; + font-weight: bold !important; + text-shadow: rgba(255,255,255,0.99) 3px -1px 6px, rgba(255,255,255,0.5) 5px -1px 9px, + rgba(255,255,255,0.99) -3px -1px 6px, rgba(255,255,255,0.5) -5px -1px 9px !important; + /*white-space: nowrap !important;*/ + +} + +#main-window[tabsintitlebar][sizemode="maximized"]::after { + top: 10px !important; +} diff --git a/classic/css/toolbars/bookmarks_toolbar_autohide.css b/classic/css/toolbars/bookmarks_toolbar_autohide.css new file mode 100644 index 00000000..4ac81d43 --- /dev/null +++ b/classic/css/toolbars/bookmarks_toolbar_autohide.css @@ -0,0 +1,24 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +#PersonalToolbar { + opacity: 0 !important; + transition: all 0.5s ease 0s !important; + margin-top: -32px !important; +} + +#navigator-toolbox:hover #PersonalToolbar { + opacity: 1.0 !important; + transition-delay: 0s !important; + margin-top: inherit !important; +} + +#PersonalToolbar { + -moz-window-dragging: no-drag !important; +} diff --git a/classic/userChrome.css b/classic/userChrome.css index 4596e39b..51266a18 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.6.1 ********************************************************************************/ +/* version 1.6.2 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -188,6 +188,9 @@ /* @import url(./css/buttons/appbutton_on_navbar_icon_grey.css); /**/ /* @import url(./css/buttons/appbutton_on_navbar_icon_browser_logo.css); /**/ +/* button label (show label besides icon) *******************************************************/ +/* @import url(./css/buttons/appbutton_on_navbar_icon_and_label.css); /**/ + /************************************************************************************************/ /* button in Firefox titlebar - if menubar is disabled (Windows only) ***************************/ @@ -276,6 +279,11 @@ /* @import url(./css/tabs/tabs_multiple_lines.css); /**/ /* <--- EXPERIMENTAL */ /* @import url(./css/tabs/tabs_multiple_lines_v2.css); /**/ /* <--- EXPERIMENTAL */ +/* TAB TITLE IN FIREFOX TITLEBAR (Windows only) *************************************************/ +/* [!] some internal pages only show default browser title **************************************/ +/* [!] might not always work correctly **********************************************************/ +/* @import url(./css/tabs/tab_title_in_firefox_titlebar.css); /**/ /* <--- EXPERIMENTAL */ + /* restore empty/missing tab favicon - only use one at a time ***********************************/ @import url(./css/tabs/missing_tab_favicon_restored_default.css); /**/ /* @import url(./css/tabs/missing_tab_favicon_restored_globe_v2.css); /**/ @@ -386,7 +394,7 @@ /* @import url(./css/generalui/searchbar_popup_engines_hidden.css); /**/ /* @import url(./css/generalui/searchbar_popup_engines_show_labels.css); /**/ -/* MENUBAR - bookmarks popup (not compatible to macOS/Linux) ************************************/ +/* MENUBARS bookmarks popup (not compatible to macOS/Linux) *************************************/ /* @import url(./css/generalui/menubar_bookmarks_popup_bookmark_page_item_hidden.css); /**/ /* @import url(./css/generalui/menubar_bookmarks_popup_subscribe_item_hidden.css); /**/ /* @import url(./css/generalui/menubar_bookmarks_popup_toolbar_item_hidden.css); /**/ @@ -401,12 +409,13 @@ /* [!] move 'Bookmarks Toolbar Items' to navigation bar to get a top toolbar with bookmarks *****/ /* [!] not compatible to 'bookmarks toolbar - multiple lines' option ****************************/ /* [!] not compatible to 'tabs toolbar - below main content' option *****************************/ +/* [!] not compatible to 'bookmarks toolbar autohide' option ************************************/ /* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/73 ************************/ /* @import url(./css/toolbars/addonbar_move_bookmarks_toolbar_to_bottom.css); /**/ /* <--- EXPERIMENTAL */ /* @import url(./css/toolbars/addonbar_status_in_addonbar.css); /**/ /* <--- EXPERIMENTAL */ /* @import url(./css/toolbars/addonbar_content_on_the_right.css); /**/ /* <--- EXPERIMENTAL */ -/* general toolbar settings *********************************************************************/ +/* GENERAL TOOLBAR SETTINGS *********************************************************************/ @import url(./css/toolbars/toolbars_old_padding.css); /**/ @import url(./css/toolbars/tabs_toolbar_adjustments.css); /**/ /* @import url(./css/toolbars/tabs_toolbar_adjustments_macOS_fix.css); /**/ /* <-- macOS fix */ @@ -415,24 +424,26 @@ /* edit target file to select which items to hide ***********************************************/ /* @import url(./css/toolbars/toolbar_context_menuitems_visibility.css); /**/ -/* menubar **************************************************************************************/ +/* MENUBAR **************************************************************************************/ /* @import url(./css/toolbars/menubar_fog_hidden.css); /**/ /* @import url(./css/toolbars/menubar_in_fullscreen_mode.css); /**/ /* menubar color - ******************************************************************************/ /* @import url(./css/toolbars/menubar_color.css); /**/ -/* bookmarks toolbar ****************************************************************************/ +/* BOOKMARKS TOOLBAR ****************************************************************************/ @import url(./css/toolbars/bookmarks_toolbar_old_height.css); +/* @import url(./css/toolbars/bookmarks_toolbar_autohide.css); /* @import url(./css/toolbars/bookmarks_toolbar_in_fullscreen_mode.css); /**/ -/* bookmarks toolbar - multiple lines ***********************************************************/ -/* [!] Note: the amount of visible bookmark items is limited internally to ~90-110 bookmarks ****/ +/* BOOKMARKS TOOLBAR - MULTIPLE LINES ***********************************************************/ +/* [!] the amount of visible bookmark items is limited internally to ~90-110 bookmarks **********/ +/* [!] not compatible to 'bookmarks toolbar autohide' option ************************************/ /* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/99 ************************/ /* @import url(./css/toolbars/bookmarks_toolbar_multiple_lines.css); /**/ /* <--- EXPERIMENTAL */ -/* toolbar colors - *****************************************************************************/ +/* TOOLBAR COLORS *******************************************************************************/ @import url(./css/toolbars/general_toolbar_colors.css); /**/ -/* AeroGlass toolbars - separated - set per toolbar / WIN10 fix for GLASS8 **********************/ +/* AeroGlass TOOLBARS - separated - set per toolbar / WIN10 fix for GLASS8 **********************/ /* @import url(./css/toolbars/general_toolbar_colors_navigation_toolbar_aeroglass.css); /**/ /* @import url(./css/toolbars/general_toolbar_colors_bookmarks_toolbar_aeroglass.css); /**/ /* @import url(./css/toolbars/general_toolbar_colors_tabs_toolbar_aeroglass.css); /**/ From 903787ba8f5941ba37b25fdff76fe46a76167280 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Wed, 31 Jan 2018 11:31:44 +0100 Subject: [PATCH 10/47] 1.6.3 --- classic/config/general_variables.css | 5 +++- .../tabs/default_tabs_round_top_borders.css | 29 +++++++++++++++++-- classic/css/tabs/tabs_multiple_lines.css | 7 ++++- classic/css/tabs/tabs_multiple_lines_v2.css | 7 ++++- classic/userChrome.css | 4 +-- 5 files changed, 45 insertions(+), 7 deletions(-) diff --git a/classic/config/general_variables.css b/classic/config/general_variables.css index 559a5765..064780f1 100644 --- a/classic/config/general_variables.css +++ b/classic/config/general_variables.css @@ -12,8 +12,11 @@ /* custom height for 'classic squared tabs' only */ --classic_squared_tabs_tab_height: 26px !important; - /* set to '0px' for fully classic squared tabs */ + /* set to '0px' for fully classic squared tabs */ --classic_squared_tabs-border-radius: 3px !important; + + /* set to '0px' for fully squared tabs */ + --default_tab_border_roundness: 5px !important; /* for default icon only */ --classic_squared_tabs_tab_default_loading_icon_color: #0A84FF !important; diff --git a/classic/css/tabs/default_tabs_round_top_borders.css b/classic/css/tabs/default_tabs_round_top_borders.css index 40765f2b..7de7ab4c 100644 --- a/classic/css/tabs/default_tabs_round_top_borders.css +++ b/classic/css/tabs/default_tabs_round_top_borders.css @@ -7,12 +7,37 @@ /****************************************************************************************/ +:root { + --default_tab_border_roundness: 5px; +} + /* tab top border roundness */ #TabsToolbar .tabs-newtab-button, #TabsToolbar .tabbrowser-tab, #TabsToolbar .tabbrowser-tab .tab-stack, #TabsToolbar .tabbrowser-tab .tab-background, #TabsToolbar .tabbrowser-tab .tab-content { - border-top-left-radius: 5px !important; - border-top-right-radius: 5px !important; + border-top-left-radius: var(--default_tab_border_roundness) !important; + border-top-right-radius: var(--default_tab_border_roundness) !important; +} + +/* tab line */ +.tab-line { + margin-left: calc( var(--default_tab_border_roundness) - 3px ) !important; + margin-right: calc( var(--default_tab_border_roundness) - 3px ) !important; +} + +/* hide tab separators */ +.tabbrowser-tab::after, +.tabbrowser-tab::before { + opacity: 0 !important; + border-image: unset !important; + border-image-slice: unset !important; + width: unset !important; +} +#tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after, +.tabbrowser-tab:not([selected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before, +#tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after { + content: unset !important; + display: unset !important; } diff --git a/classic/css/tabs/tabs_multiple_lines.css b/classic/css/tabs/tabs_multiple_lines.css index d93f6997..fa377a4c 100644 --- a/classic/css/tabs/tabs_multiple_lines.css +++ b/classic/css/tabs/tabs_multiple_lines.css @@ -65,4 +65,9 @@ .scrollbutton-down, #TabsToolbar #alltabs-button{ display: none; -} \ No newline at end of file +} + +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]), +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) { + opacity: 0 !important; +} diff --git a/classic/css/tabs/tabs_multiple_lines_v2.css b/classic/css/tabs/tabs_multiple_lines_v2.css index beeb0ff4..0fe1d28e 100644 --- a/classic/css/tabs/tabs_multiple_lines_v2.css +++ b/classic/css/tabs/tabs_multiple_lines_v2.css @@ -56,4 +56,9 @@ #main-window[tabsintitlebar] #tabbrowser-tabs { -moz-window-dragging: no-drag; -} \ No newline at end of file +} + +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]), +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) { + opacity: 0 !important; +} diff --git a/classic/userChrome.css b/classic/userChrome.css index 51266a18..1132dbe7 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.6.2 ********************************************************************************/ +/* version 1.6.3 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -357,7 +357,7 @@ /* @import url(./css/generalui/sidebar_appearance_lwtheme_dark.css); /**/ /* findbar **************************************************************************************/ - @import url(./css/generalui/findbar_on_top.css); /**/ +/* @import url(./css/generalui/findbar_on_top.css); /**/ /* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS DEFAULT OS THEME ***************************************/ /* @import url(./css/generalui/findbar_on_top_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* @import url(./css/generalui/findbar_show_full_quickfindbar.css); /**/ From 0d4d16e75e4e475999d4732160909e4b3b28bb4a Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Thu, 1 Feb 2018 11:06:09 +0100 Subject: [PATCH 11/47] 1.6.4 --- classic/config/color_variables_aeroglass.css | 21 ++++++++++++++++ .../config/color_variables_transparent.css | 21 ++++++++++++++++ classic/css/buttons/appbutton_in_titlebar.css | 8 +++++- .../appbutton_in_titlebar_icon_only.css | 8 +++++- .../css/toolbars/general_toolbar_colors.css | 25 +++---------------- classic/userChrome.css | 3 ++- classic/userContent.css | 1 + 7 files changed, 62 insertions(+), 25 deletions(-) diff --git a/classic/config/color_variables_aeroglass.css b/classic/config/color_variables_aeroglass.css index ab11e29b..508ef2df 100644 --- a/classic/config/color_variables_aeroglass.css +++ b/classic/config/color_variables_aeroglass.css @@ -35,3 +35,24 @@ --classic_squared_tabs_lwt-bright_hovered_tabs: linear-gradient(hsla(0,0%,60%,.6), hsla(0,0%,45%,.6) 80%) !important; --classic_squared_tabs_lwt-bright_other_tabs: linear-gradient(hsla(0,0%,40%,.6), hsla(0,0%,30%,.6) 80%) !important; } + +/* navigation toolbar background */ +#nav-bar:not(:-moz-lwtheme) { + background: unset !important; + border: unset !important; + box-shadow: unset !important; +} + +/* toolbar background */ +toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) { + background: unset !important; + border: unset !important; + box-shadow: unset !important; +} + +/* hide toolbar shadow */ +#nav-bar:not(:-moz-lwtheme), +toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) { + -moz-appearance: none !important; + box-shadow: unset !important; +} diff --git a/classic/config/color_variables_transparent.css b/classic/config/color_variables_transparent.css index 0c438fe3..3cbce60e 100644 --- a/classic/config/color_variables_transparent.css +++ b/classic/config/color_variables_transparent.css @@ -35,3 +35,24 @@ --classic_squared_tabs_lwt-bright_hovered_tabs: linear-gradient(hsla(0,0%,60%,.6), hsla(0,0%,45%,.6) 80%) !important; --classic_squared_tabs_lwt-bright_other_tabs: linear-gradient(hsla(0,0%,40%,.6), hsla(0,0%,30%,.6) 80%) !important; } + +/* navigation toolbar background */ +#nav-bar:not(:-moz-lwtheme) { + background: unset !important; + border: unset !important; + box-shadow: unset !important; +} + +/* toolbar background */ +toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) { + background: unset !important; + border: unset !important; + box-shadow: unset !important; +} + +/* hide toolbar shadow */ +#nav-bar:not(:-moz-lwtheme), +toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) { + -moz-appearance: none !important; + box-shadow: unset !important; +} diff --git a/classic/css/buttons/appbutton_in_titlebar.css b/classic/css/buttons/appbutton_in_titlebar.css index c0320eaa..02a8117e 100644 --- a/classic/css/buttons/appbutton_in_titlebar.css +++ b/classic/css/buttons/appbutton_in_titlebar.css @@ -11,7 +11,7 @@ /* cheat main menu button into title bar ********/ /************************************************/ -/* gain space before tabs toolbar */ +/* tabs toolbar adjustments */ #main-window[tabsintitlebar] #toolbar-menubar, #main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ -moz-padding-start: 95px !important; @@ -32,6 +32,12 @@ -moz-padding-start: 92px !important; } +#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"]:not([inactive="true"]) ~ #TabsToolbar, +#main-window[tabsintitlebar] #toolbar-menubar[autohide="false"] ~ #TabsToolbar{ + margin-top: 4px !important; +} + +/* appbutton */ #main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { -moz-appearance: none !important; -moz-box-ordinal-group: 0 !important; diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only.css b/classic/css/buttons/appbutton_in_titlebar_icon_only.css index 8d12164b..f553fac3 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only.css @@ -11,7 +11,7 @@ /* cheat main menu button into title bar ********/ /************************************************/ -/* gain space before tabs toolbar */ +/* tabs toolbar adjustments */ #main-window[tabsintitlebar] #toolbar-menubar, #main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ -moz-padding-start: 43px !important; @@ -37,6 +37,12 @@ -moz-padding-start: 47px !important; } +#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"]:not([inactive="true"]) ~ #TabsToolbar, +#main-window[tabsintitlebar] #toolbar-menubar[autohide="false"] ~ #TabsToolbar{ + margin-top: 4px !important; +} + +/* appbutton */ #main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { -moz-appearance: none !important; -moz-box-ordinal-group: 0 !important; diff --git a/classic/css/toolbars/general_toolbar_colors.css b/classic/css/toolbars/general_toolbar_colors.css index 0122824f..169fa7a9 100644 --- a/classic/css/toolbars/general_toolbar_colors.css +++ b/classic/css/toolbars/general_toolbar_colors.css @@ -14,33 +14,14 @@ --general_toolbar_text_shadow: transparent; } -/* navigation toolbar background */ #nav-bar:not(:-moz-lwtheme) { - background: unset !important; - border: unset !important; - box-shadow: unset !important; -} - -/* toolbar background */ -toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) { - background: unset !important; - border: unset !important; - box-shadow: unset !important; -} - -/* hide toolbar shadow */ -#nav-bar:not(:-moz-lwtheme), -toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) { -moz-appearance: none !important; - box-shadow: unset !important; -} - -#nav-bar:not(:-moz-lwtheme) { - background-image: var(--general_toolbar_color_navbar, inherit) !important; + background: var(--general_toolbar_color_navbar, inherit) !important; } toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) { - background-image: var(--general_toolbar_color_toolbars, inherit) !important; + -moz-appearance: none !important; + background: var(--general_toolbar_color_toolbars, inherit) !important; } #main-window:not(:-moz-lwtheme) #PersonalToolbar #bookmarks-menu-button::after, diff --git a/classic/userChrome.css b/classic/userChrome.css index 1132dbe7..dd6282f7 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.6.3 ********************************************************************************/ +/* version 1.6.4 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -30,6 +30,7 @@ FIREFOX BUGS (nothing CSS code can do about): - some '@import' features might not work properly on macOS and Linux - some '@import' features might not work properly, if multi-process mode (e10s) is disabled + - in both cases CSS code has to be added to userChrome.css file manually FIREFOX 58 BUG: bugzilla.mozilla.org/show_bug.cgi?id=1431933 - DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/101 diff --git a/classic/userContent.css b/classic/userContent.css index 9a428c12..9457a3b6 100644 --- a/classic/userContent.css +++ b/classic/userContent.css @@ -25,6 +25,7 @@ FIREFOX BUGS (nothing CSS code can do about): - some '@import' features might not work properly on macOS and Linux - some '@import' features might not work properly, if multi-process mode (e10s) is disabled + - in both cases CSS code has to be added to userContent.css file manually FIREFOX 58 BUG: bugzilla.mozilla.org/show_bug.cgi?id=1431933 - DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/101 From 8a63f3cea254abdfcfaf90de4684a33181775747 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Sun, 4 Feb 2018 11:08:42 +0100 Subject: [PATCH 12/47] 1.6.5 --- .../css/buttons/custom_backforward_large.css | 5 ++++ .../tabs/tab_title_in_firefox_titlebar.css | 1 - .../tabs/tabs_below_navigation_toolbar.css | 26 ++++++++++++++++--- classic/userChrome.css | 2 +- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/classic/css/buttons/custom_backforward_large.css b/classic/css/buttons/custom_backforward_large.css index 3ec67b39..89e9ba82 100644 --- a/classic/css/buttons/custom_backforward_large.css +++ b/classic/css/buttons/custom_backforward_large.css @@ -76,6 +76,11 @@ padding: unset !important; } +#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #nav-bar-customization-target > #forward-button, +#main-window[uidensity=touch] #nav-bar #nav-bar-customization-target > #forward-button { + -moz-margin-start: -2px !important; +} + #main-window #navigator-toolbox #nav-bar :-moz-any(#back-button, #forward-button):not([disabled]):hover .toolbarbutton-icon { filter: brightness(1.3) !important; } diff --git a/classic/css/tabs/tab_title_in_firefox_titlebar.css b/classic/css/tabs/tab_title_in_firefox_titlebar.css index bae504e4..6d388ada 100644 --- a/classic/css/tabs/tab_title_in_firefox_titlebar.css +++ b/classic/css/tabs/tab_title_in_firefox_titlebar.css @@ -51,7 +51,6 @@ display: none !important; } - #main-window[tabsintitlebar]::after { -moz-appearance: none !important; position: fixed !important; diff --git a/classic/css/tabs/tabs_below_navigation_toolbar.css b/classic/css/tabs/tabs_below_navigation_toolbar.css index dd38458a..d5e45f21 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar.css @@ -51,6 +51,28 @@ padding-top: 0px !important; } +#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"]:not([inactive="true"]) ~ #TabsToolbar, +#main-window[tabsintitlebar] #toolbar-menubar[autohide="false"] ~ #TabsToolbar{ + margin-top: 0px !important; +} + +/* tab title in titlebar support */ +#main-window[tabsintitlebar][sizemode="normal"] #navigator-toolbox #TabsToolbar, +#main-window[uidensity=compact][tabsintitlebar][sizemode="normal"] #navigator-toolbox #TabsToolbar, +#main-window[tabsintitlebar][sizemode="maximized"] #navigator-toolbox #TabsToolbar, +#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #navigator-toolbox #TabsToolbar, +#main-window[tabsintitlebar][sizemode="normal"] #navigator-toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar, +#main-window[uidensity=compact][tabsintitlebar][sizemode="normal"] #navigator-toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar, +#main-window[tabsintitlebar][sizemode="maximized"] #navigator-toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar, +#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #navigator-toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ + margin-top: 0px !important; +} + +/* titlebar button support */ +#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar{ + margin-top: 2px !important; +} + /* fix for application/hamburger button in titlebar */ #main-window[tabsintitlebar][inFullscreen] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-button { visibility: collapse !important; @@ -128,10 +150,6 @@ opacity: 0 !important; } -#nav-bar { - border-top: 1px solid var(--tabs-border-color) !important; -} - #TabsToolbar{ margin-bottom: 0px !important; border-bottom: 1px solid #5f7181 !important; diff --git a/classic/userChrome.css b/classic/userChrome.css index dd6282f7..e9c354d7 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.6.4 ********************************************************************************/ +/* version 1.6.5 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* From 95fc9b4acbc8ac46277c6f33daf3356d3f4ec57c Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Sun, 4 Feb 2018 11:54:26 +0100 Subject: [PATCH 13/47] 1.6.5.1 --- .../addonlists_show_addon_version_number.css | 13 +- classic/xml/addonversion_fx57.xml | 312 ++++++++++++++++-- 2 files changed, 304 insertions(+), 21 deletions(-) diff --git a/classic/css/aboutaddons/addonlists_show_addon_version_number.css b/classic/css/aboutaddons/addonlists_show_addon_version_number.css index e8754b48..b42f74fe 100644 --- a/classic/css/aboutaddons/addonlists_show_addon_version_number.css +++ b/classic/css/aboutaddons/addonlists_show_addon_version_number.css @@ -6,14 +6,23 @@ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ + @-moz-document url-prefix(chrome://mozapps/content/extensions/extensions.xul), url-prefix(about:addons) { /* addonversion.xml contains a copy of the 'addon-generic' binding Mozilla removed from Fx40+ builds!*/ - .addon:not([type="userstyle"]):not([pending="uninstall"])[status="installed"] { + .addon:not([pending="uninstall"])[status="installed"] { -moz-binding: url("./../../xml/addonversion_fx57.xml#addon-generic") !important; } - .addon:not([type="userstyle"]):not([pending="uninstall"])[status="installed"] .name-container .version { + .addon:not([pending="uninstall"])[status="installed"] .name-container .version { + visibility: visible !important; + } + + .addon:not([pending="uninstall"])[status="installing"] { + -moz-binding: url("./../../xml/addonversion_fx57.xml#addon-installing"); + } + + .addon:not([pending="uninstall"])[status="installing"] .name-container .version { visibility: visible !important; } diff --git a/classic/xml/addonversion_fx57.xml b/classic/xml/addonversion_fx57.xml index 191a2444..29441188 100644 --- a/classic/xml/addonversion_fx57.xml +++ b/classic/xml/addonversion_fx57.xml @@ -16,7 +16,6 @@ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xbl="http://www.mozilla.org/xbl"> - @@ -58,8 +57,8 @@ - + tooltip="addonitem-tooltip" xbl:inherits="value=name"/> + @@ -239,7 +238,7 @@ document.getAnonymousElementByAttribute(this, "anonid", "version"); - + document.getAnonymousElementByAttribute(this, "anonid", "experiment-state"); @@ -382,6 +381,7 @@ this._version.value = this.mAddon.version; else this._version.hidden = true; + if (this.mAddon.description) this._description.value = this.mAddon.description; else @@ -523,6 +523,7 @@ this._warningLink.hidden = true; this._warningBtn.hidden = true; } else if (!isUpgrade && this.mAddon.appDisabled && + this.mAddon.type == "extension" && !this.mAddon.multiprocessCompatible && !Services.prefs.getBoolPref("extensions.allow-non-mpc-extensions", true)) { this.setAttribute("notification", "error"); @@ -589,8 +590,7 @@ } } - this._preferencesBtn.hidden = (!this.mAddon.optionsURL) || - this.mAddon.optionsType == AddonManager.OPTIONS_TYPE_INLINE_INFO; + this._preferencesBtn.hidden = !this.mAddon.optionsType && this.mAddon.type != "plugin"; if (this.typeHasFlag("SUPPORTS_ASK_TO_ACTIVATE")) { this._enableBtn.disabled = true; @@ -679,6 +679,14 @@ } ]]> + + + + @@ -698,7 +706,7 @@ var event = document.createEvent("Events"); event.initEvent("RelNotesToggle", true, true); this.dispatchEvent(event); - } + }; let showRelNotes = () => { if (!relNotesData || !transformData) @@ -718,7 +726,7 @@ container.style.height = container.scrollHeight + "px"; } sendToggleEvent(); - } + }; let handleError = () => { dataReq.abort(); @@ -727,15 +735,13 @@ this._relNotesError.hidden = false; this._relNotesLoaded = false; // allow loading to be re-tried sendToggleEvent(); - } + }; function handleResponse(aEvent) { - - var XMLURI_PARSE_ERROR = "http://www.mozilla.org/newlayout/xml/parsererror.xml"; - + var XMLURI_PARSE_ERROR = "http://www.mozilla.org/newlayout/xml/parsererror.xml"; var req = aEvent.target; var ct = req.getResponseHeader("content-type"); - if ((!ct || ct.indexOf("text/html") < 0) && + if ((!ct || !ct.includes("text/html")) && req.responseXML && req.responseXML.documentElement.namespaceURI != XMLURI_PARSE_ERROR) { if (req == dataReq) @@ -755,8 +761,7 @@ dataReq.addEventListener("load", handleResponse); dataReq.addEventListener("error", handleError); dataReq.send(null); - - var UPDATES_RELEASENOTES_TRANSFORMFILE = "chrome://mozapps/content/extensions/updateinfo.xsl"; + var UPDATES_RELEASENOTES_TRANSFORMFILE = "chrome://mozapps/content/extensions/updateinfo.xsl"; var styleReq = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] .createInstance(Components.interfaces.nsIXMLHttpRequest); @@ -872,7 +877,10 @@ @@ -924,9 +932,9 @@ @@ -977,6 +985,7 @@ this.mManualUpdate = aInstall; this._showStatus("update-available"); + this._updateUpgradeInfo(); ]]> @@ -1049,4 +1058,269 @@ + + + + + + + + + + + + + + + + + + + + document.getAnonymousElementByAttribute(this, "anonid", "notice"); + + + document.getAnonymousElementByAttribute(this, "anonid", "restart-btn"); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + document.getAnonymousElementByAttribute(this, "anonid", "icon"); + + + document.getAnonymousElementByAttribute(this, "anonid", "name"); + + + document.getAnonymousElementByAttribute(this, "anonid", "version"); + + + document.getAnonymousElementByAttribute(this, "anonid", "warning"); + + + document.getAnonymousElementByAttribute(this, "anonid", "warning-link"); + + + document.getAnonymousElementByAttribute(this, "anonid", + "install-status"); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bfdf817c96fd7bfb202a3b436fc9095a74e2807f Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Mon, 5 Feb 2018 16:56:44 +0100 Subject: [PATCH 14/47] 1.6.6 --- classic/css/generalui/oldsearch.css | 128 +++ classic/image/search-glass.png | Bin 0 -> 637 bytes classic/image/search-glass32.png | Bin 0 -> 1330 bytes classic/image/searchbar-dropdown-arrow.png | Bin 0 -> 447 bytes classic/userChrome.css | 12 +- classic/xml/ctr_oldsearch57.xml | 932 +++++++++++++++++++++ 6 files changed, 1071 insertions(+), 1 deletion(-) create mode 100644 classic/css/generalui/oldsearch.css create mode 100644 classic/image/search-glass.png create mode 100644 classic/image/search-glass32.png create mode 100644 classic/image/searchbar-dropdown-arrow.png create mode 100644 classic/xml/ctr_oldsearch57.xml diff --git a/classic/css/generalui/oldsearch.css b/classic/css/generalui/oldsearch.css new file mode 100644 index 00000000..e12833f5 --- /dev/null +++ b/classic/css/generalui/oldsearch.css @@ -0,0 +1,128 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ************************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **********/ +/* by Aris (aris-addons@gmx.net)*****************************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ********************************************/ +/************************************************************************************************/ + + +searchbar { + -moz-binding: url("./../../xml/ctr_oldsearch57.xml#searchbar") !important; +} + +searchbar .searchbar-textbox { + -moz-binding: url("./../../xml/ctr_oldsearch57.xml#searchbar-textbox") !important; +} + +.searchbar-engine-button { + -moz-appearance: none !important; + min-width: 0 !important; + margin: 0 !important; + padding: 0 !important; + -moz-padding-start: 4px !important; + -moz-padding-end: 2px !important; + -moz-box-align: center !important; + background: none !important; + border: none !important; +} + +.searchbar-engine-image { + list-style-image: unset !important; +} + +#navigator-toolbox #nav-bar .searchbar-engine-button { + min-height: unset !important; +} + +.searchbar-engine-button > .button-box { + -moz-appearance: none !important; + padding: 0 !important; + border: 0 !important; +} + +.searchbar-dropmarker-image { + list-style-image: url("./../../image/searchbar-dropdown-arrow.png") !important; + -moz-image-region: rect(0, 13px, 11px, 0) !important; +} + +.searchbar-engine-button[open="true"] > .searchbar-dropmarker-image { + -moz-image-region: rect(0, 26px, 11px, 13px) !important; +} + +.search-go-button { + display: block !important; + list-style-image: url("./../../image/search-glass.png") !important; + -moz-image-region: rect(0px, 16px, 16px, 0) !important; + margin: 4px 0px !important; + min-width: 0 !important; + min-height: 0 !important; + width: 16px !important; + height: 16px !important; +} + +.search-go-button:hover { + -moz-image-region: rect(0px, 32px, 16px, 16px) !important; +} + +.search-go-button:active { + -moz-image-region: rect(0px, 48px, 16px, 32px) !important; +} + +.search-go-button:-moz-locale-dir(rtl) { + transform: scaleX(-1); +} + +@media (min-resolution: 1.1dppx) { + .search-go-button { + list-style-image: url("./../../image/search-glass32.png") !important; + -moz-image-region: rect(0px, 32px, 32px, 0) !important; + } + + .search-go-button:hover { + -moz-image-region: rect(0px, 64px, 32px, 32px) !important; + } + + .search-go-button:active { + -moz-image-region: rect(0px, 96px, 32px, 64px) !important; + } +} + +.searchbar-engine-menuitem[selected="true"] > .menu-iconic-text { + font-weight: bold !important; +} + +.searchbar-popup { + -moz-margin-start: -1px !important; +} + +/* location bars footer */ +#urlbar-search-footer{ + display: none !important; +} + +#PopupSearchAutoComplete .tree-scrollbar, +#PopupSearchAutoComplete .search-one-offs, +#PopupSearchAutoComplete .search-panel-header{ + display: none !important; +} + +#PopupSearchAutoComplete { + min-width: unset !important; + margin-inline-start: unset !important; +} + +#PopupSearchAutoComplete .search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory), +#PopupSearchAutoComplete .search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory, selected) { + list-style-image: unset !important; +} + +#PopupSearchAutoComplete .search-panel-tree > .autocomplete-treebody::-moz-tree-image { + padding-inline-start: unset !important; + width: unset !important; + height: unset !important;; +} + +#PopupSearchAutoComplete .search-panel-tree > .autocomplete-treebody { + margin-bottom: -4px !important; +} diff --git a/classic/image/search-glass.png b/classic/image/search-glass.png new file mode 100644 index 0000000000000000000000000000000000000000..9ec2fa3cfe6b9a5ad12e0c24f849328448afa134 GIT binary patch literal 637 zcmeAS@N?(olHy`uVBq!ia0vp^20$#p!3-qR3wWA=)ZPG}5Lchf!vA2vAe;XW!a^ng z{sRf`y7)MxdBf2gFD^ZN%b;ChkTTQ0Y}LmvKlY!!=a4h^=&hGq&plpx^j^e-{Uu9J zYlU>)efplky7A(jmwE})+E<>8oN<&PWOnzC>qSdX`%FBjUa=WyrhW5{OLtz}e)b;7 z&Y7~?y>{Kqbtf*|d674D7emUbfU4z16SgX(FOd!GG0ItNTD8%vc^8BI6b9oCxtLiD zoUzibb?*OCegHjUS`y?J%pfNDSBG7J*+VcmPkPR~xpRNK`)J(twVa~v_mj>&XePLi=wDNRu45^4)dhuq^Ap;542MN(HX61R9 z>uf6#6csVK`|+>*X_NXJdoD_z58ZcirsZVLq?wwF)|^^oKL$29quyyQF$ID@gK<(BxYxdf#`MujsAgb<4V(Av9^rvcQ8W3343e_l>{XN}N=T z=kVudj+QvbZ5F-3pL@OM*?R%%N)^$Gzu02l?ksO|zW;#3`omrBve$;u{*2cBS0&yQ zAKzwhjPn5hjxynx$1VSuHwWu(@6Ouz{ov||4R<3t${F|nuZY=m`orW4|D%dN|GQ|W zH?QaKbIqEEFGSzokH2llm2l$Ewtklv@qZTgFU!BMU*cDK{k?A!znEOF|8D<@cfv)D VTQm80Fae{1!PC{xWt~$(698=!Nsa&j literal 0 HcmV?d00001 diff --git a/classic/image/search-glass32.png b/classic/image/search-glass32.png new file mode 100644 index 0000000000000000000000000000000000000000..21402cab90420e1900c70f557abc2edabb55bbf4 GIT binary patch literal 1330 zcmV-21;||NZ{{|NsC0|Ns5||NsC0|NsC0|Nr>?{{R2~|NsC0|Nrs#`~Ls`CSRD{>hr6` z-2VUnlD*eGbE!~|zLK@l6H=7-`uv2e%5bdC-|+Wgl)tOV-yLwSN|eDzezFclgfD%y z%i-=BWv9g4>vo&L)Z^|0@i!60000pbW%=J0DLP=NF87V z6bq3sJtB*4_h!dA%<<~9^`g+adE~18!r}JrndNrZu*byl-09Wy*WkIEskX5I00Ztx zL_t(|UftDMcd|$j24ELt5kW+@fFKCQ-I(;kZvOwjn!;paW8};^GjsLTjTg`1t+HC1 z9$S*A$P;cjsYSKD9Kw8BLlpMu3i6dv7+3tZ-TMVFTS`ozO^l@mnrlCHf+ z?}_t;Z7u79Qd$)C(hnAMvF)$knpRZ_1vA9<>n{%-=uV*WvRa4W663;P*5oha)9D1C z_0kGv1EJ-Rk70J-Hw)Z!c=XVz%E~b#6F#AXHyf}MNL=DW{%QXLr8lik2`8~0#FW;S z4!kvDiVN$(?R8nw*l7IhK!-Tt6!shP`m%uhG0$=QcyHB3yyr#M?I!fw^_W(*-uAG} ztJt`?>N$B{7`)6hP^Lyf)Yof$<~B7&r60?Thy-@qb*sAav{x*#`Yz4bH8AzDY7B;8_C{{dn@L0j!8pYkOZ2 zZmp;XE6OtS#{(_T&MjZ85z_8{cvuk}l3vsMAsRKV9}dyQ+5HeVI8WWShdD~!Z%=k_ zC=b~~hNgS7xc>|zicOst8K3G}nwt8}RaeWhmECgQgP|Sc=1F)!DD`-mUC~rGwW79+ z?RdO3q5?acgp*jeHJoD21rIh_n&BvDyLTXntTtO!4R(-E)&cuR6S=XgX--jSW)ztY zrJB!P72xV_g>eckjzS<4|G#ydpthT)Xq3DGU-`l_7iULwZSp(){VSh) z?mcB_ud*d_R5nheO6juacwQ z6{n)3qf>jYr+1yn$;rvj&o7w$YVzdCQ>IK=xpL*L-!hIsH|vxH`2{mDFfuW-u(GkU zb8vET^YZZvi-=1|N=eBoD5+}d7#Lbw+c`Km1_uXUynN-s&Koy@`eu2$IEF|_h8{2s zV{#N=xv**-+mSm5e&6poa-cx|-3gy^&6}S*Wg>c1-d>G#wv-!<79a>KLkGu&8rEi!hSYr@|c{oA<=3dTof z6rXYLX1MnEt=WeoDbmSjOrwwNFO{!QI+53ZeAa0dJ{iT%b*u7(*xeeI browser.search.openintab': open search in current or new tab *************/ +/* [!] 'about:config > browser.search.suggest.enabled': search suggestions visibility ***********/ +/* [!] Shift + click on search glass: search opens in a new window ******************************/ +/* [!] Ctrl/Cmd + click on search glass: search opens in a new tab ******************************/ +/* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/104 ***********************/ +/* @import url(./css/generalui/oldsearch.css); /**/ /* <--- EXPERIMENTAL */ + /************************************************************************************************/ /* TOOLBARS *************************************************************************************/ diff --git a/classic/xml/ctr_oldsearch57.xml b/classic/xml/ctr_oldsearch57.xml new file mode 100644 index 00000000..020d9161 --- /dev/null +++ b/classic/xml/ctr_oldsearch57.xml @@ -0,0 +1,932 @@ + + + + + +%browserDTD; +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + document.getAnonymousElementByAttribute(this, "anonid", "searchbar-stringbundle"); + false + document.getAnonymousElementByAttribute(this, "anonid", "searchbar-textbox"); + document.getAnonymousElementByAttribute(this, "anonid", "searchbar-popup"); + null + null + + (Components.utils.import("resource://gre/modules/FormHistory.jsm", {})).FormHistory; + + + (Components.utils.import("resource://gre/modules/PlacesUtils.jsm", {})).PlacesUtils; + + + + + + + document.getAnonymousElementByAttribute(this, "anonid", "searchbar-engine-button"); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = 0; i--) { + if (items[i].classList.contains("addengine-item") || + items[i].classList.contains("addengine-separator")) + popup.removeChild(items[i]); + } + + var searchtextbox = document.getAnonymousElementByAttribute(document.getElementById("searchbar"), "anonid", "searchbar-textbox"); + var isRTL = getComputedStyle(searchtextbox, "").direction == "rtl"; + var outerRect = searchtextbox.getBoundingClientRect(); + var innerRect = searchtextbox.inputField.getBoundingClientRect(); + + + var width = 100; + width = isRTL ? Math.round(outerRect.left - outerRect.right) : Math.round(outerRect.right - outerRect.left); + popup.setAttribute("width", width > 100 ? width : 100); + + + var addengines = gBrowser.selectedBrowser.engines; + + if (addengines && addengines.length > 0) { + const kXULNS = + "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; + + // Find the (first) separator in the remaining menu, or the first item + // if no separators are present. + var insertLocation = popup.firstChild; + while (insertLocation.nextSibling && + insertLocation.localName != "menuseparator") { + insertLocation = insertLocation.nextSibling; + } + if (insertLocation.localName != "menuseparator") + insertLocation = popup.firstChild; + + var separator = document.createElementNS(kXULNS, "menuseparator"); + separator.setAttribute("class", "addengine-separator"); + popup.insertBefore(separator, insertLocation); + + // Insert the "add this engine" items. + for (var i = 0; i < addengines.length; i++) { + var menuitem = document.createElement("menuitem"); + var engineInfo = addengines[i]; + var labelStr = + this._stringBundle.getFormattedString("cmd_addFoundEngine", + [engineInfo.title]); + menuitem = document.createElementNS(kXULNS, "menuitem"); + menuitem.setAttribute("class", "menuitem-iconic addengine-item"); + menuitem.setAttribute("label", labelStr); + menuitem.setAttribute("tooltiptext", engineInfo.uri); + menuitem.setAttribute("uri", engineInfo.uri); + if (engineInfo.icon) + this.setIcon(menuitem, engineInfo.icon); + menuitem.setAttribute("title", engineInfo.title); + popup.insertBefore(menuitem, insertLocation); + } + } + ]]> + + + + hiddenList.indexOf(e.name) == -1); + } catch(e){} + + var engines = this.engines; + for (var i = engines.length - 1; i >= 0; --i) { + var menuitem = document.createElementNS(kXULNS, "menuitem"); + var name = engines[i].name; + menuitem.setAttribute("label", name); + menuitem.setAttribute("class", "menuitem-iconic searchbar-engine-menuitem menuitem-with-favicon"); + + if (engines[i] == this.currentEngine) + menuitem.setAttribute("selected", "true"); + var tooltip = this._stringBundle.getFormattedString("searchtip", [name]); + menuitem.setAttribute("tooltiptext", tooltip); + if (engines[i].iconURI) + this.setIcon(menuitem, engines[i].iconURI.spec); + popup.insertBefore(menuitem, popup.firstChild); + menuitem.engine = engines[i]; + } + + this._needToBuildPopup = false; + ]]> + + + + + + + + + + + = 0 && newIndex < this.engines.length) { + this.currentEngine = this.engines[newIndex]; + } + + aEvent.preventDefault(); + aEvent.stopPropagation(); + + + ]]> + + + + + + + + + + + + + + + + + + this.currentEngine = engine + } + searchService.addEngine(target.getAttribute("uri"), type, + target.getAttribute("src"), false, + installCallback); + } + else + return; + + this.focus(); + this.select(); + this.updateDisplay(); + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + 100 ? width : 100); + + popup.openPopup(this, "after_start", 0, -1, false, false); + } + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 72c9b72c08c49906884ca3038207c2971dfcdfcd Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Tue, 6 Feb 2018 17:15:45 +0100 Subject: [PATCH 15/47] 1.6.6.1 --- classic/css/generalui/oldsearch.css | 4 ++-- classic/xml/{ctr_oldsearch57.xml => oldsearch_fx57.xml} | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) rename classic/xml/{ctr_oldsearch57.xml => oldsearch_fx57.xml} (99%) diff --git a/classic/css/generalui/oldsearch.css b/classic/css/generalui/oldsearch.css index e12833f5..439dc748 100644 --- a/classic/css/generalui/oldsearch.css +++ b/classic/css/generalui/oldsearch.css @@ -8,11 +8,11 @@ searchbar { - -moz-binding: url("./../../xml/ctr_oldsearch57.xml#searchbar") !important; + -moz-binding: url("./../../xml/oldsearch_fx57.xml#searchbar") !important; } searchbar .searchbar-textbox { - -moz-binding: url("./../../xml/ctr_oldsearch57.xml#searchbar-textbox") !important; + -moz-binding: url("./../../xml/oldsearch_fx57.xml#searchbar-textbox") !important; } .searchbar-engine-button { diff --git a/classic/xml/ctr_oldsearch57.xml b/classic/xml/oldsearch_fx57.xml similarity index 99% rename from classic/xml/ctr_oldsearch57.xml rename to classic/xml/oldsearch_fx57.xml index 020d9161..f503f0d7 100644 --- a/classic/xml/ctr_oldsearch57.xml +++ b/classic/xml/oldsearch_fx57.xml @@ -1,14 +1,5 @@ - - %browserDTD; From edbfdb4571d47a24305df0b661beb832be240cb6 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Thu, 8 Feb 2018 14:03:23 +0100 Subject: [PATCH 16/47] 1.6.7 --- classic/css/generalui/oldsearch.css | 13 +++- .../ac_popup_classic_with_two_lines.css | 27 +++---- ...ac_popup_title_and_url_50percent_width.css | 5 ++ ...ac_popup_url_and_title_50percent_width.css | 4 + classic/userChrome.css | 19 ++--- classic/xml/urlbarBindings_fx57.xml | 70 ++++++++---------- previews/classic_ui_2.png | Bin 0 -> 170480 bytes 7 files changed, 72 insertions(+), 66 deletions(-) create mode 100644 previews/classic_ui_2.png diff --git a/classic/css/generalui/oldsearch.css b/classic/css/generalui/oldsearch.css index 439dc748..6f98cdd7 100644 --- a/classic/css/generalui/oldsearch.css +++ b/classic/css/generalui/oldsearch.css @@ -54,13 +54,24 @@ searchbar .searchbar-textbox { display: block !important; list-style-image: url("./../../image/search-glass.png") !important; -moz-image-region: rect(0px, 16px, 16px, 0) !important; - margin: 4px 0px !important; min-width: 0 !important; min-height: 0 !important; width: 16px !important; height: 16px !important; } +#main-window[uidensity=compact] .search-go-button { + margin: 4px 0px !important; +} + +#main-window:not([uidensity=compact]):not([uidensity=touch]) .search-go-button { + margin: 6px 0px !important; +} + +#main-window[uidensity=touch] .search-go-button { + margin: 8px 0px !important; +} + .search-go-button:hover { -moz-image-region: rect(0px, 32px, 16px, 16px) !important; } diff --git a/classic/css/locationbar/ac_popup_classic_with_two_lines.css b/classic/css/locationbar/ac_popup_classic_with_two_lines.css index 649fc59b..c2215856 100644 --- a/classic/css/locationbar/ac_popup_classic_with_two_lines.css +++ b/classic/css/locationbar/ac_popup_classic_with_two_lines.css @@ -8,12 +8,10 @@ @-moz-document url(chrome://browser/content/browser.xul) { - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete), #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] { -moz-binding: url("./../../xml/urlbarBindings_fx57.xml#urlbar-rich-result-popup") !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { -moz-binding: url("./../../xml/urlbarBindings_fx57.xml#autocomplete-richlistitem") !important; } @@ -24,7 +22,6 @@ } /* restyle popup items */ - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { -moz-box-orient: vertical !important; min-height: unset !important; @@ -34,13 +31,11 @@ border-radius: 0 !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem .ac-separator, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-separator { display:none !important; visibility: collapse !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem :-moz-any(.ac-site-icon,.ac-title,.ac-action,.ac-url), #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem :-moz-any(.ac-site-icon,.ac-title,.ac-action,.ac-url){ -moz-margin-start: unset !important; -moz-margin-end: unset !important; @@ -48,68 +43,66 @@ -moz-padding-end: unset !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem .ac-type-icon, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-type-icon { margin-inline-start: 4px !important; margin-inline-end: 4px !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem .ac-site-icon, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-site-icon { -moz-margin-start: 4px !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem .ac-title, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-title{ -moz-margin-start: 5px !important; margin-top: -3px !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem :-moz-any(.ac-url, .ac-action), #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem :-moz-any(.ac-url, .ac-action){ -moz-margin-start: 25px !important; margin-top: 1px !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem .ac-url, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-url{ padding-bottom: 1px !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem .ac-action[actiontype=searchengine]:not([selected]), #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-action[actiontype=searchengine]:not([selected]) { display: block !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem #ibox-spacer, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem #ibox-spacer { width: 100000px !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) hbox[anonid="search-suggestions-notification"], #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] hbox[anonid="search-suggestions-notification"] { display: none !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) deck[search-suggestions-notification], #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] deck[search-suggestions-notification] { display: none !important; } + /* fix large space issue at items end */ + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { + border-inline-end: 0px solid transparent !important; + } + + /* remove search box at poups button */ + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .search-one-offs { + display: none !important; + } + /* show scrollbar */ - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) scrollbox, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] scrollbox{ overflow-y: auto !important; } /* for Windows Classic theme *//* - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem .ac-title, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-title { padding-top: 2px !important; padding-bottom: 2px !important; } - panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistbox, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox { padding: 0 !important; } diff --git a/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css b/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css index 08f0c495..ee04af93 100644 --- a/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css +++ b/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css @@ -39,3 +39,8 @@ } /**/ + +/* fix large space issue at items end */ +#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { + border-inline-end: 0px solid transparent !important; +} diff --git a/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css b/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css index de25a966..0cbbf7be 100644 --- a/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css +++ b/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css @@ -61,3 +61,7 @@ /**/ +/* fix large space issue at items end */ +#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { + border-inline-end: 0px solid transparent !important; +} diff --git a/classic/userChrome.css b/classic/userChrome.css index 0ce1bc5c..52eca140 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.6.6 ********************************************************************************/ +/* version 1.6.7 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -395,12 +395,6 @@ /* @import url(./css/generalui/searchbar_popup_engines_hidden.css); /**/ /* @import url(./css/generalui/searchbar_popup_engines_show_labels.css); /**/ -/* MENUBARS bookmarks popup (not compatible to macOS/Linux) *************************************/ -/* @import url(./css/generalui/menubar_bookmarks_popup_bookmark_page_item_hidden.css); /**/ -/* @import url(./css/generalui/menubar_bookmarks_popup_subscribe_item_hidden.css); /**/ -/* @import url(./css/generalui/menubar_bookmarks_popup_toolbar_item_hidden.css); /**/ -/* @import url(./css/generalui/menubar_bookmarks_popup_other_item_hidden.css); /**/ - /* OLD SEARCH ***********************************************************************************/ /* NOTE: 'Old search' will stop working soon when Mozilla drops XBL support. ********************* See https://bugzilla.mozilla.org/show_bug.cgi?id=1397874 ******************************/ @@ -411,6 +405,12 @@ /* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/104 ***********************/ /* @import url(./css/generalui/oldsearch.css); /**/ /* <--- EXPERIMENTAL */ +/* MENUBARS bookmarks popup (not compatible to macOS/Linux) *************************************/ +/* @import url(./css/generalui/menubar_bookmarks_popup_bookmark_page_item_hidden.css); /**/ +/* @import url(./css/generalui/menubar_bookmarks_popup_subscribe_item_hidden.css); /**/ +/* @import url(./css/generalui/menubar_bookmarks_popup_toolbar_item_hidden.css); /**/ +/* @import url(./css/generalui/menubar_bookmarks_popup_other_item_hidden.css); /**/ + /************************************************************************************************/ /* TOOLBARS *************************************************************************************/ @@ -518,14 +518,15 @@ /* NOTE: 'Classic popup with two lined results' will stop working soon when Mozilla drops XBL **** support. See https://bugzilla.mozilla.org/show_bug.cgi?id=1397874 **********************/ - + +/* [!] 'Classic popup with two lined results' removes 'oneoff' searches at popups bottom ********/ /* popup content order/appearance - only use one at a time **************************************/ @import url(./css/locationbar/ac_popup_classic_with_two_lines.css); /**/ /* @import url(./css/locationbar/ac_popup_title_and_url_50percent_width.css); /**/ /* @import url(./css/locationbar/ac_popup_url_and_title_50percent_width.css); /**/ /* @import url(./css/locationbar/ac_popup_item_title_hidden.css); /**/ /* @import url(./css/locationbar/ac_popup_item_title_visible_on_hover_only.css); /**/ - + /* result settings/appearance *******************************************************************/ /* @import url(./css/locationbar/ac_popup_result_highlighting_aero.css); /**/ /* @import url(./css/locationbar/ac_popup_keysearch_bold.css); /**/ diff --git a/classic/xml/urlbarBindings_fx57.xml b/classic/xml/urlbarBindings_fx57.xml index 3cb85484..7238e06a 100644 --- a/classic/xml/urlbarBindings_fx57.xml +++ b/classic/xml/urlbarBindings_fx57.xml @@ -37,7 +37,6 @@ align="center" role="alert" selectedIndex="0"> - @@ -54,7 +53,7 @@ role="link" value="&urlbar.searchSuggestionsNotification.changeSettingsWin;" accesskey="&urlbar.searchSuggestionsNotification.changeSettingsWin.accesskey;" - onclick="openPreferences('paneSearch');" + onclick="openPreferences('paneSearch', {origin: 'searchChangeSettings'});" control="search-suggestions-change-settings"/> @@ -243,14 +242,19 @@ return; } - var width = 300; - + let width = 300; + try{ width = Math.round(document.getElementById("urlbar").getBoundingClientRect().width); } catch(e){} - + this.setAttribute("width", width); + this.mInput = aInput; + aInput.controller.setInitiallySelectedIndex(this._isFirstResultHeuristic ? 0 : -1); + this.view = aInput.controller.QueryInterface(Components.interfaces.nsITreeView); + this._invalidate(); + try { let whichNotification = aInput.whichSearchSuggestionsNotification; if (whichNotification != "none") { @@ -264,12 +268,15 @@ this._hideSearchSuggestionsNotification(); } } catch (ex) { + Components.utils.reportError(ex); } - this._invalidate(); + var x_position = document.getElementById("urlbar").getBoundingClientRect().x; + var y_position = -1; + + this.openPopup(aElement, "after_start", x_position, y_position, false, false); - this.openPopup(aElement, "after_start", 0, -1, false, false); ]]> @@ -299,8 +306,8 @@ this.setAttribute("dontanimate", "true"); this.classList.add("showSearchSuggestionsNotification"); - this.footer.collapsed = this._matchCount == 0; - this.input.tabScrolling = this._matchCount != 0; + this.footer.collapsed = this.matchCount == 0; + this.input.tabScrolling = this.matchCount != 0; if (!this.popupOpen) { let event = document.createEvent("Events"); @@ -318,7 +325,7 @@ this.richlistbox.flex = 1; this.removeAttribute("dontanimate"); this.searchSuggestionsNotification.removeAttribute("animate"); - if (this._matchCount) { + if (this.matchCount) { this._invalidate(); } else { this.closePopup(); @@ -347,7 +354,7 @@ @@ -486,7 +495,6 @@ if (this._addonIframeOwner) { return null; } - for (let name of this._addonIframeOverrideFunctionNames) { if (typeof(overrides[name]) != "function") { throw new Error( @@ -494,7 +502,6 @@ ); } } - this._addonIframeOwner = owner; this._addonIframe = this._makeAddonIframe(); this._addonIframeOverriddenFunctionsByName = {}; @@ -559,17 +566,14 @@ ]]> 0) { this.maybeSetupSpeculativeConnect(url); } else if (url.startsWith("moz-action:remotetab")) { - const MOZ_ACTION_REGEX = /^moz-action:([^,]+),(.*)$/; if (!MOZ_ACTION_REGEX.test(url)) return; @@ -603,13 +605,14 @@ - + + @@ -621,6 +624,7 @@ class="ac-title-text" xbl:inherits="selected"/> + str).join(" ") + let label = parts.filter(str => str).join(" "); let panel = this.parentNode.parentNode; if (panel.createResultLabel) { @@ -1023,7 +1028,6 @@ - t.substr(0, popup.textRunsMaxLen)); } this._setUpEmphasisedSections(this._titleText, title); } else { - if (popup.textRunsMaxLen) { title = title.substr(0, popup.textRunsMaxLen); } @@ -1286,7 +1281,10 @@ : titleRect.left - itemRect.left; let popup = this.parentNode.parentNode; - let itemWidth = itemRect.width - titleStart - popup.overflowPadding; + /*let itemWidth = itemRect.width - titleStart - popup.overflowPadding - + (popup.margins ? popup.margins.end : 0);*/ + /*let itemWidth = itemRect.width - titleStart - popup.overflowPadding;*/ + let itemWidth = itemRect.width; if (this._tags.hasAttribute("empty")) { tagsRect.width = 0; @@ -1294,7 +1292,6 @@ let titleTagsWidth = titleRect.width + tagsRect.width; if (titleTagsWidth + separatorURLActionWidth > itemWidth) { - let titleTagsPct = 0.66; let titleTagsAvailable = itemWidth - separatorURLActionWidth; @@ -1303,7 +1300,6 @@ itemWidth * titleTagsPct ); if (titleTagsWidth > titleTagsMaxWidth) { - let titlePct = 0.33; let titleAvailable = titleTagsMaxWidth - tagsRect.width; @@ -1358,10 +1354,9 @@ action.params[key] = decodeURIComponent(action.params[key]); } } catch (e) { - action.params = { url: params, - } + }; } return action; @@ -1370,9 +1365,7 @@ - AalgCQ+N-gu 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 Date: Thu, 8 Feb 2018 16:23:29 +0100 Subject: [PATCH 17/47] 1.6.7.1 --- .../bookmarks_toolbar_bookmark_labels_hidden.css | 16 ++++++++++++++++ classic/userChrome.css | 6 ++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 classic/css/toolbars/bookmarks_toolbar_bookmark_labels_hidden.css diff --git a/classic/css/toolbars/bookmarks_toolbar_bookmark_labels_hidden.css b/classic/css/toolbars/bookmarks_toolbar_bookmark_labels_hidden.css new file mode 100644 index 00000000..7decdf4f --- /dev/null +++ b/classic/css/toolbars/bookmarks_toolbar_bookmark_labels_hidden.css @@ -0,0 +1,16 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +#PlacesToolbarItems > .bookmark-item > .toolbarbutton-icon[label]:not([label=""]) { + margin-inline-end: 0px !important; +} + +#PlacesToolbarItems > .bookmark-item > label { + display: none !important; +} \ No newline at end of file diff --git a/classic/userChrome.css b/classic/userChrome.css index 52eca140..7c59a39c 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -442,9 +442,11 @@ /* @import url(./css/toolbars/menubar_color.css); /**/ /* BOOKMARKS TOOLBAR ****************************************************************************/ -@import url(./css/toolbars/bookmarks_toolbar_old_height.css); -/* @import url(./css/toolbars/bookmarks_toolbar_autohide.css); +@import url(./css/toolbars/bookmarks_toolbar_old_height.css); /**/ +/* @import url(./css/toolbars/bookmarks_toolbar_autohide.css); /**/ +/* @import url(./css/toolbars/bookmarks_toolbar_bookmark_labels_hidden.css); /**/ /* @import url(./css/toolbars/bookmarks_toolbar_in_fullscreen_mode.css); /**/ + /* BOOKMARKS TOOLBAR - MULTIPLE LINES ***********************************************************/ /* [!] the amount of visible bookmark items is limited internally to ~90-110 bookmarks **********/ /* [!] not compatible to 'bookmarks toolbar autohide' option ************************************/ From 34636f0eabf8e5c159286e196c877e5a8cf7842f Mon Sep 17 00:00:00 2001 From: stonecrusher Date: Sat, 10 Feb 2018 11:53:51 +0100 Subject: [PATCH 18/47] language fix "by the way" makes no sense here --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85754020..9b78ba92 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Hidden files must be visible to see `.mozilla` folder. ## How to use custom user styles? The _userChrome.css_ and _userContent.css_ files works like an options\configurations file. All main "features" can be enabled and disabled there. -Edit _userChrome.css_ and _userContent.css_ with any text editor (**[Notepad++](https://notepad-plus-plus.org/download/)** recommended on Windows) and enable btw. disable any feature you like by modifying, removing or outcommenting available `@import` strings. +Edit _userChrome.css_ and _userContent.css_ with any text editor (**[Notepad++](https://notepad-plus-plus.org/download/)** recommended on Windows) and enable or disable any feature you like by modifying, removing or outcommenting available `@import` strings. Restart Firefox after every modification for changes to take effect. **Example** From 19b4d1d6731abc67a428db584a8bea424980e292 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Thu, 15 Feb 2018 09:32:09 +0100 Subject: [PATCH 19/47] 1.6.8 --- classic/config/general_variables.css | 2 +- classic/css/generalui/oldsearch.css | 14 +++++++ classic/css/tabs/classic_squared_tabs.css | 2 + .../tabs/classic_squared_tabs_australized.css | 2 + .../tabs/tab_title_in_firefox_titlebar.css | 38 +++++++++---------- classic/css/tabs/tabs_multiple_lines.css | 8 ++-- classic/css/tabs/tabs_multiple_lines_v2.css | 13 ++++--- classic/userChrome.css | 3 +- 8 files changed, 52 insertions(+), 30 deletions(-) diff --git a/classic/config/general_variables.css b/classic/config/general_variables.css index 064780f1..850d0623 100644 --- a/classic/config/general_variables.css +++ b/classic/config/general_variables.css @@ -29,7 +29,7 @@ --tab_max_width: 120px !important; /* for tabs_multiple_lines.css and tabs_multiple_lines_v2.css */ - --tab_min_width_mlt: 60px !important; + --tab_min_width_mlt: 100px !important; --tab_max_width_mlt: 200px !important; /* for 'tabs_multiple_lines_v2.css' only */ diff --git a/classic/css/generalui/oldsearch.css b/classic/css/generalui/oldsearch.css index 6f98cdd7..d8592246 100644 --- a/classic/css/generalui/oldsearch.css +++ b/classic/css/generalui/oldsearch.css @@ -137,3 +137,17 @@ searchbar .searchbar-textbox { #PopupSearchAutoComplete .search-panel-tree > .autocomplete-treebody { margin-bottom: -4px !important; } + +/* custom width for engines popup *//* +#searchbar .searchbar-popup { + min-width: 300px !important; + max-width: 300px !important; +} + +/* custom width for suggestions popup *//* +#PopupSearchAutoComplete { + min-width: 300px !important; + max-width: 300px !important; +} + +/**/ diff --git a/classic/css/tabs/classic_squared_tabs.css b/classic/css/tabs/classic_squared_tabs.css index 3d5cbe57..94c15b5f 100644 --- a/classic/css/tabs/classic_squared_tabs.css +++ b/classic/css/tabs/classic_squared_tabs.css @@ -365,4 +365,6 @@ #TabsToolbar > toolbarbutton .toolbarbutton-icon{ min-width: unset !important; width: 24px !important; + min-height: unset !important; + height: 24px !important; } diff --git a/classic/css/tabs/classic_squared_tabs_australized.css b/classic/css/tabs/classic_squared_tabs_australized.css index 7edd8e4f..01c8c5ef 100644 --- a/classic/css/tabs/classic_squared_tabs_australized.css +++ b/classic/css/tabs/classic_squared_tabs_australized.css @@ -338,4 +338,6 @@ #TabsToolbar > toolbarbutton .toolbarbutton-icon{ min-width: unset !important; width: 24px !important; + min-height: unset !important; + height: 24px !important; } diff --git a/classic/css/tabs/tab_title_in_firefox_titlebar.css b/classic/css/tabs/tab_title_in_firefox_titlebar.css index 6d388ada..388ddce8 100644 --- a/classic/css/tabs/tab_title_in_firefox_titlebar.css +++ b/classic/css/tabs/tab_title_in_firefox_titlebar.css @@ -7,51 +7,51 @@ /****************************************************************************************/ -#main-window[tabsintitlebar][sizemode="normal"] #TabsToolbar, -#main-window[uidensity=compact][tabsintitlebar][sizemode="normal"] #TabsToolbar{ +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar][sizemode="normal"] #TabsToolbar, +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[uidensity=compact][tabsintitlebar][sizemode="normal"] #TabsToolbar{ -moz-padding-start: 2px !important; margin-top: 3px !important; } -#main-window[tabsintitlebar][sizemode="maximized"] #TabsToolbar, -#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #TabsToolbar{ +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar][sizemode="maximized"] #TabsToolbar, +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[uidensity=compact][tabsintitlebar][sizemode="maximized"] #TabsToolbar{ -moz-padding-start: 0px !important; margin-top: 0px !important; } -#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar, -#main-window[uidensity=compact][tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar, +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[uidensity=compact][tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ -moz-padding-start: 2px !important; margin-top: 19px !important; } -#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar, -#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar, +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{ -moz-padding-start: 0px !important; margin-top: 24px !important; } -#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="false"], -#main-window[uidensity=compact][tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"]:not([inactive="true"]), -#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="false"], -#main-window[uidensity=compact][tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"]:not([inactive="true"]) { +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="false"], +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[uidensity=compact][tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"]:not([inactive="true"]), +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="false"], +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[uidensity=compact][tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"]:not([inactive="true"]) { -moz-padding-start: 0px !important; margin-top: 24px !important; } -#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="false"], -#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"]:not([inactive="true"]), -#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="false"], -#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"]:not([inactive="true"]) { +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="false"], +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"]:not([inactive="true"]), +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="false"], +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"]:not([inactive="true"]) { -moz-padding-start: 0px !important; margin-top: 24px !important; } -#main-window[tabsintitlebar] #TabsToolbar .titlebar-placeholder[type="caption-buttons"]{ +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar] #TabsToolbar .titlebar-placeholder[type="caption-buttons"]{ display: none !important; } -#main-window[tabsintitlebar]::after { +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar]::after { -moz-appearance: none !important; position: fixed !important; display: block !important; @@ -72,6 +72,6 @@ } -#main-window[tabsintitlebar][sizemode="maximized"]::after { +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar][sizemode="maximized"]::after { top: 10px !important; } diff --git a/classic/css/tabs/tabs_multiple_lines.css b/classic/css/tabs/tabs_multiple_lines.css index fa377a4c..e092c9fa 100644 --- a/classic/css/tabs/tabs_multiple_lines.css +++ b/classic/css/tabs/tabs_multiple_lines.css @@ -14,8 +14,8 @@ :root { --tabs-end-position: 50px; - --tab-min-height: var(--tab-min-height); - --mltabs-newtab-height: var(--tab-min-height); + --tab-min-height_mlt: var(--tab-min-height,32px); + --mltabs-newtab-height: var(--tab-min-height,32px); --tab_min_width_mlt: 60px; --tab_max_width_mlt: 100px; } @@ -43,8 +43,8 @@ /* tab size */ .tabbrowser-tab { - min-height: var(--tab-min-height) !important; - max-height: var(--tab-min-height) !important; + min-height: var(--tab-min-height_mlt) !important; + max-height: var(--tab-min-height_mlt) !important; vertical-align: top !important; -moz-box-sizing: border-box !important; } diff --git a/classic/css/tabs/tabs_multiple_lines_v2.css b/classic/css/tabs/tabs_multiple_lines_v2.css index 0fe1d28e..910327bd 100644 --- a/classic/css/tabs/tabs_multiple_lines_v2.css +++ b/classic/css/tabs/tabs_multiple_lines_v2.css @@ -18,6 +18,7 @@ --tabs-lines: 3; /* 3 rows, increase for more */ --tab_min_width_mlt: 80px; --tab_max_width_mlt: 200px; + --tab-min-height_mlt: var(--tab-min-height,32px); } .tabbrowser-tab:not([pinned]) { @@ -27,7 +28,7 @@ } .tabbrowser-tab,.tab-background { - min-height: var(--tab-min-height); + min-height: var(--tab-min-height_mlt); } .tab-stack { @@ -37,25 +38,27 @@ #tabbrowser-tabs .scrollbox-innerbox { display: flex; flex-wrap: wrap; + overflow-x: collapse !important; overflow-y: auto !important; - min-height: var(--tab-min-height); - max-height: calc( var(--tabs-lines) * var(--tab-min-height) ) !important; + min-height: var(--tab-min-height_mlt); + max-height: calc( var(--tabs-lines) * var(--tab-min-height_mlt) ) !important; } #tabbrowser-tabs .arrowscrollbox-scrollbox { + overflow-x: collapse; overflow: visible; display: block; } #tabbrowser-tabs .scrollbutton-up, #tabbrowser-tabs .scrollbutton-down, -#alltabs-button, +#TabsToolbar #alltabs-button, .tabbrowser-tab:not([fadein]){ display: none; } #main-window[tabsintitlebar] #tabbrowser-tabs { - -moz-window-dragging: no-drag; + -moz-window-dragging: no-drag !important; } .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]), diff --git a/classic/userChrome.css b/classic/userChrome.css index 7c59a39c..8fcbb6b4 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.6.7 ********************************************************************************/ +/* version 1.6.8 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -277,6 +277,7 @@ /* - BUG: dragging tabs does not work properly with multi lined tabs ****************************/ /* - for v1 see https://00.bulog.jp/archives/1476 ***********************************************/ /* - for v2 see https://www.reddit.com/r/FirefoxCSS/comments/7dclp7/multirow_tabs_in_ff57/ ******/ +/* Recommendation: use v2 instead of v1. v1 has too many issues and glitches ********************/ /* @import url(./css/tabs/tabs_multiple_lines.css); /**/ /* <--- EXPERIMENTAL */ /* @import url(./css/tabs/tabs_multiple_lines_v2.css); /**/ /* <--- EXPERIMENTAL */ From c50e6cca6e05ede1ca748a82f4b73968ce13c344 Mon Sep 17 00:00:00 2001 From: krystian3w <35370833+krystian3w@users.noreply.github.com> Date: Thu, 15 Feb 2018 12:36:11 +0100 Subject: [PATCH 20/47] activity-stream telemetry --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9b78ba92..c7e3ecfe 100644 --- a/README.md +++ b/README.md @@ -231,3 +231,5 @@ _experiments.supported_ _datareporting.healthreport.uploadEnabled_ _nsITelemetry.canRecordBase_ _nsITelemetry.canRecordExtended_ +_browser.newtabpage.activity-stream.feeds.telemetry_ +_browser.newtabpage.activity-stream.telemetry_ From 03ecddf4f92cfb0b72e2008e63b65dac78fae2a0 Mon Sep 17 00:00:00 2001 From: krystian3w <35370833+krystian3w@users.noreply.github.com> Date: Thu, 15 Feb 2018 12:39:13 +0100 Subject: [PATCH 21/47] Update README.md spaces --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c7e3ecfe..42de3a48 100644 --- a/README.md +++ b/README.md @@ -230,6 +230,6 @@ _experiments.activeExperiment_ _experiments.supported_ _datareporting.healthreport.uploadEnabled_ _nsITelemetry.canRecordBase_ -_nsITelemetry.canRecordExtended_ -_browser.newtabpage.activity-stream.feeds.telemetry_ +_nsITelemetry.canRecordExtended_ +_browser.newtabpage.activity-stream.feeds.telemetry_ _browser.newtabpage.activity-stream.telemetry_ From c76ba7d5efdeba5c13c4ddd0e68ae74f75b425dd Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Sun, 18 Feb 2018 12:13:38 +0100 Subject: [PATCH 22/47] 1.6.9 --- classic/css/tabs/classic_squared_tabs.css | 24 +++++++----- .../tabs/classic_squared_tabs_australized.css | 37 +++++++++++-------- classic/css/tabs/tabs_below_main_content.css | 23 ++++++++---- classic/css/tabs/tabs_multiple_lines.css | 2 +- classic/css/tabs/tabs_multiple_lines_v2.css | 2 +- classic/userChrome.css | 2 +- 6 files changed, 54 insertions(+), 36 deletions(-) diff --git a/classic/css/tabs/classic_squared_tabs.css b/classic/css/tabs/classic_squared_tabs.css index 94c15b5f..a95accf3 100644 --- a/classic/css/tabs/classic_squared_tabs.css +++ b/classic/css/tabs/classic_squared_tabs.css @@ -33,13 +33,13 @@ --tab-min-height: var(--classic_squared_tabs_tab_height) !important; } -/* adjust tab toolbars buttons for squared tabs */ +/* adjust tab toolbars buttons for squared tabs *//* #TabsToolbar #alltabs-button .toolbarbutton-icon, #TabsToolbar > #new-tab-button .toolbarbutton-icon, #TabsToolbar > toolbarpaletteitem > #new-tab-button .toolbarbutton-icon { padding: 3px !important; } - +*/ /* remove default tab colors */ #TabsToolbar:not(:-moz-lwtheme) .tabbrowser-tab[visuallyselected="true"], #TabsToolbar:not(:-moz-lwtheme) .tabbrowser-tab, @@ -355,16 +355,20 @@ } /* make sure toolbar buttons do not increase toolbar height */ +#TabsToolbar toolbarbutton .toolbarbutton-badge-stack, #TabsToolbar > toolbarpaletteitem, #TabsToolbar > toolbarbutton { min-height: unset !important; padding: unset !important; - margin: unset !important; -} -#TabsToolbar > toolbarpaletteitem .toolbarbutton-icon, -#TabsToolbar > toolbarbutton .toolbarbutton-icon{ - min-width: unset !important; - width: 24px !important; - min-height: unset !important; - height: 24px !important; + margin: 0 2px !important; } + +#TabsToolbar > toolbarpaletteitem .toolbarbutton-icon, +#TabsToolbar > toolbarbutton .toolbarbutton-icon { + min-width: 18px !important; + width: 18px !important; + min-height: 18px !important; + height: 18px !important; + padding: unset !important; + margin: unset !important; +} \ No newline at end of file diff --git a/classic/css/tabs/classic_squared_tabs_australized.css b/classic/css/tabs/classic_squared_tabs_australized.css index 01c8c5ef..ffddaff0 100644 --- a/classic/css/tabs/classic_squared_tabs_australized.css +++ b/classic/css/tabs/classic_squared_tabs_australized.css @@ -20,13 +20,13 @@ --tab-min-height: var(--classic_squared_tabs_tab_height) !important; } -/* adjust tab toolbars buttons for squared tabs */ +/* adjust tab toolbars buttons for squared tabs *//* #TabsToolbar #alltabs-button .toolbarbutton-icon, #TabsToolbar > #new-tab-button .toolbarbutton-icon, #TabsToolbar > toolbarpaletteitem > #new-tab-button .toolbarbutton-icon { padding: 3px !important; } - +*/ /*******************************************/ /**** default themes tab colors [start] ****/ /*******************************************/ @@ -176,10 +176,11 @@ } /* tab top border roundness */ -.tabs-newtab-button,.tabbrowser-tab, -.tab-stack, -.tab-background, -.tabbrowser-tab .tab-content { +#TabsToolbar .tabs-newtab-button, +#TabsToolbar .tabbrowser-tab, +#TabsToolbar .tabbrowser-tab .tab-stack, +#TabsToolbar .tabbrowser-tab .tab-background, +#TabsToolbar .tabbrowser-tab .tab-content { border-top-left-radius: var(--classic_squared_tabs-border-radius) !important; border-top-right-radius: var(--classic_squared_tabs-border-radius) !important; } @@ -254,11 +255,11 @@ #tabbrowser-tabs, #tabbrowser-tabs > .tabbrowser-arrowscrollbox, .tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned] { - min-height: var(--tab-min-height) !important; + min-height: var(--classic_squared_tabs_tab_height) !important; } #TabsToolbar #tabbrowser-tabs[overflow="true"] .tabbrowser-tab[pinned] { - min-height: calc( var(--tab-min-height) - 1px ) !important; - max-height: calc( var(--tab-min-height) - 1px ) !important; + min-height: calc( var(--classic_squared_tabs_tab_height) - 1px ) !important; + max-height: calc( var(--classic_squared_tabs_tab_height) - 1px ) !important; } /* Windows 10 fix */ @@ -328,16 +329,20 @@ } /* make sure toolbar buttons do not increase toolbar height */ +#TabsToolbar toolbarbutton .toolbarbutton-badge-stack, #TabsToolbar > toolbarpaletteitem, #TabsToolbar > toolbarbutton { min-height: unset !important; padding: unset !important; - margin: unset !important; + margin: 0 2px !important; } -#TabsToolbar > toolbarpaletteitem .toolbarbutton-icon, -#TabsToolbar > toolbarbutton .toolbarbutton-icon{ - min-width: unset !important; - width: 24px !important; - min-height: unset !important; - height: 24px !important; + +#TabsToolbar > toolbarpaletteitem .toolbarbutton-icon, +#TabsToolbar > toolbarbutton .toolbarbutton-icon { + min-width: 18px !important; + width: 18px !important; + min-height: 18px !important; + height: 18px !important; + padding: unset !important; + margin: unset !important; } diff --git a/classic/css/tabs/tabs_below_main_content.css b/classic/css/tabs/tabs_below_main_content.css index 15693408..c216a788 100644 --- a/classic/css/tabs/tabs_below_main_content.css +++ b/classic/css/tabs/tabs_below_main_content.css @@ -21,6 +21,7 @@ bottom: 0px !important; width: 100% !important; } + #TabsToolbar #tabbrowser-tabs:not([overflow="true"]) { width: 90% !important; } @@ -29,11 +30,11 @@ } #main-window:not([customizing]) #TabsToolbar[currentset*="tabbrowser-tabs,new-tab-button,alltabs-button"] #tabbrowser-tabs:not([overflow="true"]){ - width: calc(100% - 2px) !important; + width: calc(100% - 60px) !important; } #main-window:not([customizing]) #TabsToolbar[currentset*="tabbrowser-tabs,new-tab-button,alltabs-button"] #tabbrowser-tabs[overflow="true"] { - width: calc(100% - 50px) !important; + width: calc(100% - 60px) !important; } #main-window #navigator-toolbox #TabsToolbar > toolbarpaletteitem, @@ -52,6 +53,7 @@ width: 18px !important; height: 18px !important; } + #TabsToolbar #window-controls { position: fixed !important; bottom: 4px !important; @@ -73,6 +75,7 @@ } /* Fx58+ titlebar placeholders */ +#TabsToolbar .titlebar-placeholder[type="caption-buttons"], #TabsToolbar .titlebar-placeholder[type="pre-tabs"], #TabsToolbar .titlebar-placeholder[type="post-tabs"]{ display: none !important; @@ -87,16 +90,22 @@ } /* make sure toolbar buttons do not increase toolbar height */ +#TabsToolbar toolbarbutton .toolbarbutton-badge-stack, #TabsToolbar > toolbarpaletteitem, #TabsToolbar > toolbarbutton { min-height: unset !important; padding: unset !important; - margin: unset !important; + margin: 0 2px !important; } -#TabsToolbar > toolbarpaletteitem .toolbarbutton-icon, -#TabsToolbar > toolbarbutton .toolbarbutton-icon{ - min-width: unset !important; - width: 24px !important; + +#TabsToolbar > toolbarpaletteitem .toolbarbutton-icon, +#TabsToolbar > toolbarbutton .toolbarbutton-icon { + min-width: 18px !important; + width: 18px !important; + min-height: 18px !important; + height: 18px !important; + padding: unset !important; + margin: unset !important; } /* width of new tab tab */ diff --git a/classic/css/tabs/tabs_multiple_lines.css b/classic/css/tabs/tabs_multiple_lines.css index e092c9fa..97e55476 100644 --- a/classic/css/tabs/tabs_multiple_lines.css +++ b/classic/css/tabs/tabs_multiple_lines.css @@ -49,7 +49,7 @@ -moz-box-sizing: border-box !important; } -.tabbrowser-tab:not([pinned]) { +.tabbrowser-tab[fadein]:not([pinned]) { min-width: var(--tab_min_width_mlt) !important; max-width: var(--tab_max_width_mlt) !important; } diff --git a/classic/css/tabs/tabs_multiple_lines_v2.css b/classic/css/tabs/tabs_multiple_lines_v2.css index 910327bd..2ded9ca7 100644 --- a/classic/css/tabs/tabs_multiple_lines_v2.css +++ b/classic/css/tabs/tabs_multiple_lines_v2.css @@ -21,7 +21,7 @@ --tab-min-height_mlt: var(--tab-min-height,32px); } -.tabbrowser-tab:not([pinned]) { +.tabbrowser-tab[fadein]:not([pinned]) { flex-grow: 1; min-width: var(--tab_min_width_mlt) !important; max-width: var(--tab_max_width_mlt) !important; diff --git a/classic/userChrome.css b/classic/userChrome.css index 8fcbb6b4..17df5156 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.6.8 ********************************************************************************/ +/* version 1.6.9 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* From 7d2307c58f58f1a288e2af9d5a4b419ae4f8f0d2 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Wed, 21 Feb 2018 17:32:52 +0100 Subject: [PATCH 23/47] 1.7.0 --- ... ac_popup_classic_with_two_lines_fx57.css} | 0 .../ac_popup_classic_with_two_lines_fx60.css | 108 ++ ...ac_popup_title_and_url_50percent_width.css | 6 +- ...ac_popup_url_and_title_50percent_width.css | 9 +- classic/css/tabs/classic_squared_tabs.css | 15 +- .../tabs/classic_squared_tabs_australized.css | 13 +- classic/userChrome.css | 7 +- classic/xml/oldsearch_fx57.xml | 34 +- classic/xml/urlbarBindings_fx60.xml | 1710 +++++++++++++++++ 9 files changed, 1865 insertions(+), 37 deletions(-) rename classic/css/locationbar/{ac_popup_classic_with_two_lines.css => ac_popup_classic_with_two_lines_fx57.css} (100%) create mode 100644 classic/css/locationbar/ac_popup_classic_with_two_lines_fx60.css create mode 100644 classic/xml/urlbarBindings_fx60.xml diff --git a/classic/css/locationbar/ac_popup_classic_with_two_lines.css b/classic/css/locationbar/ac_popup_classic_with_two_lines_fx57.css similarity index 100% rename from classic/css/locationbar/ac_popup_classic_with_two_lines.css rename to classic/css/locationbar/ac_popup_classic_with_two_lines_fx57.css diff --git a/classic/css/locationbar/ac_popup_classic_with_two_lines_fx60.css b/classic/css/locationbar/ac_popup_classic_with_two_lines_fx60.css new file mode 100644 index 00000000..597a48c2 --- /dev/null +++ b/classic/css/locationbar/ac_popup_classic_with_two_lines_fx60.css @@ -0,0 +1,108 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + +@-moz-document url(chrome://browser/content/browser.xul) { + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] { + -moz-binding: url("./../../xml/urlbarBindings_fx60.xml#urlbar-rich-result-popup") !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { + -moz-binding: url("./../../xml/urlbarBindings_fx60.xml#autocomplete-richlistitem") !important; + } + + /* remove space around box */ + #PopupAutoCompleteRichResult .autocomplete-richlistbox { + padding: 0 !important; + } + + /* restyle popup items */ + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { + -moz-box-orient: vertical !important; + min-height: unset !important; + height: unset !important; + max-height: unset !important; + padding: 8px 0px !important; + border-radius: 0 !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-separator { + display:none !important; + visibility: collapse !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem :-moz-any(.ac-site-icon,.ac-title,.ac-action,.ac-url){ + -moz-margin-start: unset !important; + -moz-margin-end: unset !important; + -moz-padding-start: unset !important; + -moz-padding-end: unset !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-type-icon { + margin-inline-start: 4px !important; + margin-inline-end: 4px !important; + -moz-box-ordinal-group: 1 !important; + margin-bottom: -40px !important; + margin-top: 4px !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-site-icon { + -moz-margin-start: 4px !important; + -moz-box-ordinal-group: 0 !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-title{ + -moz-margin-start: 25px !important; + -moz-margin-end: 25px !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem :-moz-any(.ac-url, .ac-action){ + -moz-margin-start: 25px !important; + -moz-margin-end: 25px !important; + margin-top: 1px !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-url{ + padding-top: 2px !important; + padding-bottom: 2px !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-action[actiontype=searchengine]:not([selected]) { + display: block !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem #ibox-spacer { + width: 100000px !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] hbox[anonid="search-suggestions-notification"] { + display: none !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] deck[search-suggestions-notification] { + display: none !important; + } + + /* fix large space issue at items end */ + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { + border-inline-end: 0px solid transparent !important; + } + + /* remove search box at poups button */ + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .search-one-offs { + display: none !important; + } + + /* show scrollbar */ + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] scrollbox{ + overflow-y: auto !important; + } + + /**/ + +} \ No newline at end of file diff --git a/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css b/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css index ee04af93..4fcc649b 100644 --- a/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css +++ b/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css @@ -7,7 +7,7 @@ /****************************************************************************************/ -/* To hide seach engines at popups bottom open 'about:config' and set ************ +/* To hide search engines at popups bottom open 'about:config' and set ************ ** browser.urlbar.oneOffSearches to 'false' *************************************/ /* remove unneeded padding around results */ @@ -21,7 +21,7 @@ -moz-padding-start: 0 !important; } -/* make sure there is not unneded space before results (Fx57+) */ +/* make sure there is no unneeded space before results (Fx57+) */ #PopupAutoCompleteRichResult .autocomplete-richlistitem spacer{ display: none !important; } @@ -38,8 +38,6 @@ width: calc((100vw - 100px)/2) !important; } -/**/ - /* fix large space issue at items end */ #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { border-inline-end: 0px solid transparent !important; diff --git a/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css b/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css index 0cbbf7be..e01307f4 100644 --- a/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css +++ b/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css @@ -8,11 +8,11 @@ @import url(./ac_popup_title_and_url_50percent_width.css); -/* To hide seach engines at popups bottom open 'about:config' and set ************ +/* To hide search engines at popups bottom open 'about:config' and set ************ ** browser.urlbar.oneOffSearches to 'false' *************************************/ -/* reorder content to switch title and url posions */ +/* reorder content to switch title and url positions */ .ac-type-icon{ -moz-box-ordinal-group: 0 !important; @@ -60,8 +60,3 @@ } /**/ - -/* fix large space issue at items end */ -#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { - border-inline-end: 0px solid transparent !important; -} diff --git a/classic/css/tabs/classic_squared_tabs.css b/classic/css/tabs/classic_squared_tabs.css index a95accf3..e3e8d80c 100644 --- a/classic/css/tabs/classic_squared_tabs.css +++ b/classic/css/tabs/classic_squared_tabs.css @@ -365,10 +365,15 @@ #TabsToolbar > toolbarpaletteitem .toolbarbutton-icon, #TabsToolbar > toolbarbutton .toolbarbutton-icon { - min-width: 18px !important; - width: 18px !important; - min-height: 18px !important; - height: 18px !important; + min-width: 16px !important; + width: unset !important; + min-height: 16px !important; + height: unset !important; padding: unset !important; margin: unset !important; -} \ No newline at end of file +} + +#TabsToolbar toolbarbutton .toolbarbutton-badge-stack .toolbarbutton-icon { + width: 16px !important; + height: 16px !important; +} diff --git a/classic/css/tabs/classic_squared_tabs_australized.css b/classic/css/tabs/classic_squared_tabs_australized.css index ffddaff0..458e7b3b 100644 --- a/classic/css/tabs/classic_squared_tabs_australized.css +++ b/classic/css/tabs/classic_squared_tabs_australized.css @@ -339,10 +339,15 @@ #TabsToolbar > toolbarpaletteitem .toolbarbutton-icon, #TabsToolbar > toolbarbutton .toolbarbutton-icon { - min-width: 18px !important; - width: 18px !important; - min-height: 18px !important; - height: 18px !important; + min-width: 16px !important; + width: unset !important; + min-height: 16px !important; + height: unset !important; padding: unset !important; margin: unset !important; } + +#TabsToolbar toolbarbutton .toolbarbutton-badge-stack .toolbarbutton-icon { + width: 16px !important; + height: 16px !important; +} diff --git a/classic/userChrome.css b/classic/userChrome.css index 17df5156..2bd205aa 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.6.9 ********************************************************************************/ +/* version 1.7.0 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -524,9 +524,10 @@ /* [!] 'Classic popup with two lined results' removes 'oneoff' searches at popups bottom ********/ /* popup content order/appearance - only use one at a time **************************************/ -@import url(./css/locationbar/ac_popup_classic_with_two_lines.css); /**/ +/* @import url(./css/locationbar/ac_popup_classic_with_two_lines_fx57.css); /**/ +/* @import url(./css/locationbar/ac_popup_classic_with_two_lines_fx60.css); /**/ /* @import url(./css/locationbar/ac_popup_title_and_url_50percent_width.css); /**/ -/* @import url(./css/locationbar/ac_popup_url_and_title_50percent_width.css); /**/ +@import url(./css/locationbar/ac_popup_url_and_title_50percent_width.css); /**/ /* @import url(./css/locationbar/ac_popup_item_title_hidden.css); /**/ /* @import url(./css/locationbar/ac_popup_item_title_visible_on_hover_only.css); /**/ diff --git a/classic/xml/oldsearch_fx57.xml b/classic/xml/oldsearch_fx57.xml index f503f0d7..3d9118ea 100644 --- a/classic/xml/oldsearch_fx57.xml +++ b/classic/xml/oldsearch_fx57.xml @@ -72,10 +72,25 @@ if (Components.isSuccessCode(aStatus)) { this.updateDisplay(); - } else { + + /* check, if current search engine changes and update searchbars search engine */ + + var current_search_engine = Services.search.defaultEngine.name; + + setInterval(function() { + var current_search_engine2 = Services.search.defaultEngine.name; + if(current_search_engine != current_search_engine2) { + current_search_engine = current_search_engine2; + document.getElementById("searchbar").updateDisplay(); + } + }, 1000); + + + } else { Components.utils.reportError("Cannot initialize search service, bailing out: " + aStatus); } }).bind(this)); + ]]> + + + + +%notificationDTD; + +%browserDTD; + +%brandDTD; +]> + + + + + + + + + + + + + + + + + &brandShortName; + + + + 💡 &urlbar.searchSuggestionsNotification.hintPrefix; + &urlbar.searchSuggestionsNotification.hint; + + + + + + + + + + + + + + + window.QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils); + + + 0 + + + Cc["@mozilla.org/intl/stringbundle;1"]. + getService(Ci.nsIStringBundleService). + createBundle("chrome://browser/locale/places/places.properties"); + + + + document.getAnonymousElementByAttribute( + this, "anonid", "search-suggestions-notification" + ); + + + + document.getAnonymousElementByAttribute(this, "anonid", "footer"); + + + + document.getAnonymousElementByAttribute(this, "anonid", + "one-off-search-buttons"); + + + false + + null + + + + + + + + + + + + + + + + + + + maxRow && index != maxRow) + newIndex = maxRow; + else if (!reverse && index == -1 || newIndex < 0 && index != 0) + newIndex = 0; + + if (newIndex < 0 && index == 0 || newIndex > maxRow && index == maxRow) + newIndex = -1; + + return newIndex; + } + + // Otherwise do not allow the selection to be removed. + if (newIndex < 0) { + newIndex = index > 0 ? 0 : maxRow; + } else if (newIndex > maxRow) { + newIndex = index < maxRow ? maxRow : 0; + } + return newIndex; + ]]> + + + + + 0 && + this.input.mController + .getStyleAt(0) + .split(/\s+/).indexOf("heuristic") > 0; + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + startOffset * 2) { + // Provide more space when aligning would result in an unbalanced + // margin. This allows the location bar to be moved to the start + // of the navigation toolbar to reclaim space for results. + endOffset = startOffset; + } + let identityIcon = document.getElementById("identity-icon"); + let identityRect = + this.DOMWindowUtils.getBoundsWithoutFlushing(identityIcon); + let start = popupDirection == "rtl" ? + documentRect.right - identityRect.right : + identityRect.left; + if (!this.margins || start != this.margins.start || + endOffset != this.margins.end || + width != this.margins.width) { + this.margins = { start, end: endOffset, width }; + needsHandleOverUnderflow = true; + } + } else if (this.margins) { + // Reset the alignment so that the site icons are positioned + // according to whatever's in the CSS. + this.margins = undefined; + needsHandleOverUnderflow = true; + } + + // Now that the margins have been set, start adding items (via + // _invalidate). + this.mInput = aInput; + aInput.controller.setInitiallySelectedIndex(this._isFirstResultHeuristic ? 0 : -1); + this.view = aInput.controller.QueryInterface(Components.interfaces.nsITreeView); + this._invalidate(); + + try { + let whichNotification = aInput.whichSearchSuggestionsNotification; + if (whichNotification != "none") { + // Update the impressions count on real popupshown, since there's + // no guarantee openPopup will be respected by the platform. + // Though, we must ensure the handled event is the expected one. + let impressionId = this._searchSuggestionsImpressionId = {}; + this.addEventListener("popupshown", () => { + if (this._searchSuggestionsImpressionId == impressionId) + aInput.updateSearchSuggestionsNotificationImpressions(whichNotification); + }, {once: true}); + this._showSearchSuggestionsNotification(whichNotification, popupDirection); + } else if (this.classList.contains("showSearchSuggestionsNotification")) { + this._hideSearchSuggestionsNotification(); + } + } catch (ex) { + // Not critical for the urlbar functionality, just report the error. + Components.utils.reportError(ex); + } + + // Position the popup below the navbar. To get the y-coordinate, + // which is an offset from the bottom of the input, subtract the + // bottom of the navbar from the buttom of the input. + let yOffset = Math.round( + this.DOMWindowUtils.getBoundsWithoutFlushing(document.getElementById("nav-bar")).bottom - + this.DOMWindowUtils.getBoundsWithoutFlushing(aInput).bottom); + + var x_position = document.getElementById("urlbar").getBoundingClientRect().x; + var y_position = -1; + + this.openPopup(aElement, "after_start", x_position, y_position, false, false); + + // Do this immediately after we've requested the popup to open. This + // will cause sync reflows but prevents flickering. + if (needsHandleOverUnderflow) { + for (let item of this.richlistbox.childNodes) { + item.handleOverUnderflow(); + } + } + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + t != "action" && t != "heuristic"); + try { + // Some types intentionally do not map to strings, which is not + // an error. + parts.push(this._bundle.GetStringFromName(type + "ResultLabel")); + } catch (e) {} + + return parts.filter(str => str).join(" "); + ]]> + + + + + + + + + + + 0) { + let firstStyle = this.input.mController.getStyleAt(0); + if (firstStyle.includes("autofill")) { + let uri = this.input.mController.getFinalCompleteValueAt(0); + // "http" will be stripped out, but other scheme won't. + if (!uri.includes("://")) { + uri = "http://" + uri; + } + this.maybeSetupSpeculativeConnect(uri); + } else if (firstStyle.includes("searchengine") && + this.input.browserSearchSuggestEnabled && + this.input.urlbarSearchSuggestEnabled) { + // Preconnect to the current search engine only if the search + // suggestions are enabled. + let engine = Services.search.currentEngine; + engine.speculativeConnect({window, + originAttributes: gBrowser.contentPrincipal.originAttributes}); + } + } + + // When a result is present the footer should always be visible. + this.footer.collapsed = false; + this.input.tabScrolling = true; + + this.input.gotResultForCurrentQuery = true; + this.input.replaySafeDeferredKeyEvents(); + ]]> + + + + + + + + null + null + {} + + + [ + "_invalidate", + ] + + [ + "search-suggestions-notification", + "richlistbox", + "one-off-search-buttons", + ] + {} + + + + + + + + + + + + + + + + + + + + + + 0) { + this.maybeSetupSpeculativeConnect(url); + } else if (url.startsWith("moz-action:remotetab")) { + // URL is in the format moz-action:ACTION,PARAMS + // Where PARAMS is a JSON encoded object. + const MOZ_ACTION_REGEX = /^moz-action:([^,]+),(.*)$/; + if (!MOZ_ACTION_REGEX.test(url)) + return; + + let params = JSON.parse(url.match(MOZ_ACTION_REGEX)[2]); + if (params.url) { + this.maybeSetupSpeculativeConnect(decodeURIComponent(params.url)); + } + } + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + — + + + + + + + + + + + + + + + + + + + + + + + + + + + + str).join(" "); + + // allow consumers that have extended popups to override + // the label values for the richlistitems + let panel = this.parentNode.parentNode; + if (panel.createResultLabel) { + return panel.createResultLabel(this, label); + } + + return label; + ]]> + + + + + + + + null + + + + + + + + false + + + + + + + + + + + + + + + + + + = 0) { + regions.push([matchIndex, matchIndex + searchLen]); + } + } + + // Sort the regions by start position then end position + regions = regions.sort((a, b) => { + let start = a[0] - b[0]; + return (start == 0) ? a[1] - b[1] : start; + }); + + // Generate the boundary indices from each region + let start = 0; + let end = 0; + let boundaries = []; + let len = regions.length; + for (let i = 0; i < len; i++) { + // We have a new boundary if the start of the next is past the end + let region = regions[i]; + if (region[0] > end) { + // First index is the beginning of match + boundaries.push(start); + // Second index is the beginning of non-match + boundaries.push(end); + + // Track the new region now that we've stored the previous one + start = region[0]; + } + + // Push back the end index for the current or new region + end = Math.max(end, region[1]); + } + + // Add the last region + boundaries.push(start); + boundaries.push(end); + + // Put on the end boundary if necessary + if (end < aText.length) + boundaries.push(aText.length); + + // Skip the first item because it's always 0 + return boundaries.slice(1); + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = 0 && index < aReplacements.length) { + pairs.push([...aReplacements[index]]); + } + } else { + pairs.push([part]); + } + } + + return pairs; + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = 0) { + pairs = [ + [searchSuggestion.substring(0, idx), ""], + [searchQuery, "match"], + [searchSuggestion.substring(idx + searchQuery.length), ""], + ]; + } else { + pairs = [ + [searchSuggestion, ""], + ]; + } + } else { + pairs = [ + [searchQuery, ""], + ]; + } + let interpStr = pairs.map((pair, i) => `%${i + 1}$S`).join(""); + title = this._generateEmphasisPairs(interpStr, pairs); + + // If this is a default search match, we remove the image so we + // can style it ourselves with a generic search icon. + // We don't do this when matching an aliased search engine, + // because the icon helps with recognising which engine will be + // used (when using the default engine, we don't need that + // recognition). + if (!action.params.alias && !initialTypes.has("favicon")) { + this.removeAttribute("image"); + } + } else if (action.type == "visiturl") { + emphasiseUrl = false; + displayUrl = this._unescapeUrl(action.params.url); + title = displayUrl; + titleLooksLikeUrl = true; + let visitStr = this._stringBundle.GetStringFromName("visit"); + this._setUpDescription(this._actionText, visitStr, true); + } else if (action.type == "extension") { + let content = action.params.content; + displayUrl = content; + this._setUpDescription(this._actionText, content, true); + } + } + + if (!displayUrl) { + let input = popup.input; + let url = typeof(input.trimValue) == "function" ? + input.trimValue(originalUrl) : + originalUrl; + displayUrl = this._unescapeUrl(url); + } + // For performance reasons we may want to limit the displayUrl size. + if (popup.textRunsMaxLen) { + displayUrl = displayUrl.substr(0, popup.textRunsMaxLen); + } + this.setAttribute("displayurl", displayUrl); + + // Show the domain as the title if we don't have a title. + if (!title) { + title = displayUrl; + titleLooksLikeUrl = true; + try { + let uri = Services.io.newURI(originalUrl); + // Not all valid URLs have a domain. + if (uri.host) + title = uri.host; + } catch (e) {} + } + + this._tags.setAttribute("empty", "true"); + + if (type == "tag" || type == "bookmark-tag") { + // The title is separated from the tags by an endash + let tags; + [, title, tags] = title.match(/^(.+) \u2013 (.+)$/); + + // Each tag is split by a comma in an undefined order, so sort it + let sortedTags = tags.split(/\s*,\s*/).sort((a, b) => { + return a.localeCompare(a); + }); + + let anyTagsMatch = this._setUpTags(sortedTags); + if (anyTagsMatch) { + this._tags.removeAttribute("empty"); + } + if (type == "bookmark-tag") { + type = "bookmark"; + } + } else if (type == "keyword") { + // Note that this is a moz-action with action.type == keyword. + emphasiseUrl = false; + let keywordArg = this.getAttribute("text").replace(/^[^\s]+\s*/, ""); + if (!keywordArg) { + // Treat keyword searches without arguments as visiturl actions. + type = "visiturl"; + this.setAttribute("actiontype", "visiturl"); + let visitStr = this._stringBundle.GetStringFromName("visit"); + this._setUpDescription(this._actionText, visitStr, true); + } else { + let pairs = [[title, ""], [keywordArg, "match"]]; + let interpStr = + this._stringBundle.GetStringFromName("bookmarkKeywordSearch"); + title = this._generateEmphasisPairs(interpStr, pairs); + // The action box will be visible since this is a moz-action, but + // we want it to appear as if it were not visible, so set its text + // to the empty string. + this._setUpDescription(this._actionText, "", false); + } + } + + this.setAttribute("type", type); + + if (titleLooksLikeUrl) { + this._titleText.setAttribute("lookslikeurl", "true"); + } else { + this._titleText.removeAttribute("lookslikeurl"); + } + + if (Array.isArray(title)) { + // For performance reasons we may want to limit the title size. + if (popup.textRunsMaxLen) { + title = title.map(t => t.substr(0, popup.textRunsMaxLen)); + } + this._setUpEmphasisedSections(this._titleText, title); + } else { + // For performance reasons we may want to limit the title size. + if (popup.textRunsMaxLen) { + title = title.substr(0, popup.textRunsMaxLen); + } + this._setUpDescription(this._titleText, title, false); + } + this._setUpDescription(this._urlText, displayUrl, !emphasiseUrl); + + // Removing the max-width may be jarring when the item is visible, but + // we have no other choice to properly crop the text. + // Removing max-widths may cause overflow or underflow events, that + // will set the _inOverflow property. In case both the old and the new + // text are overflowing, the overflow event won't happen, and we must + // enforce an _handleOverflow() call to update the max-widths. + let wasInOverflow = this._inOverflow; + this._removeMaxWidths(); + if (wasInOverflow && this._inOverflow) { + this._handleOverflow(); + } + ]]> + + + + + + + + + + + + itemWidth) { + // Title + tags + URL/action overflows the item width. + + // The percentage of the item width allocated to the title and tags. + let titleTagsPct = 0.66; + + let titleTagsAvailable = itemWidth - separatorURLActionWidth; + let titleTagsMaxWidth = Math.max( + titleTagsAvailable, + itemWidth * titleTagsPct + ); + if (titleTagsWidth > titleTagsMaxWidth) { + // Title + tags overflows the max title + tags width. + + // The percentage of the title + tags width allocated to the + // title. + let titlePct = 0.33; + + let titleAvailable = titleTagsMaxWidth - tagsRect.width; + let titleMaxWidth = Math.max( + titleAvailable, + titleTagsMaxWidth * titlePct + ); + let tagsAvailable = titleTagsMaxWidth - titleRect.width; + let tagsMaxWidth = Math.max( + tagsAvailable, + titleTagsMaxWidth * (1 - titlePct) + ); + this._titleText.style.maxWidth = titleMaxWidth + "px"; + this._tagsText.style.maxWidth = tagsMaxWidth + "px"; + } + let urlActionMaxWidth = Math.max( + itemWidth - titleTagsWidth, + itemWidth * (1 - titleTagsPct) + ); + urlActionMaxWidth -= separatorRect.width; + this._urlText.style.maxWidth = urlActionMaxWidth + "px"; + this._actionText.style.maxWidth = urlActionMaxWidth + "px"; + this._hasMaxWidths = true; + } + ]]> + + + + + + + + + + + + + + + + + + + + + + + From d56260279694e2570f21d8c3ad0c5ca3f7c731c7 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Sun, 25 Feb 2018 13:41:23 +0100 Subject: [PATCH 24/47] 1.7.1 --- classic/css/buttons/appbutton_in_titlebar.css | 18 + .../appbutton_in_titlebar_icon_only.css | 18 + ...s_menu_button_popup_classic_appearance.css | 19 + ...bels_with_and_without_icons_Lin_macOS.css} | 0 ...els_with_and_without_icons_Lin_macOSv2.css | 13 + .../context_bfrsb_labels_with_icons.css | 10 + ...ss => ac_popup_classic_with_two_lines.css} | 17 + .../ac_popup_classic_with_two_lines_fx60.css | 108 -- classic/userChrome.css | 10 +- classic/xml/addonversion_fx57.xml | 983 +--------- classic/xml/oldsearch_fx57.xml | 429 +---- classic/xml/urlbarBindings_fx57.xml | 1274 +----------- classic/xml/urlbarBindings_fx60.xml | 1710 ----------------- 13 files changed, 245 insertions(+), 4364 deletions(-) rename classic/css/generalui/{context_bfrsb_labels_with_and_without_icons_macOS_fix.css => context_bfrsb_labels_with_and_without_icons_Lin_macOS.css} (100%) create mode 100644 classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOSv2.css rename classic/css/locationbar/{ac_popup_classic_with_two_lines_fx57.css => ac_popup_classic_with_two_lines.css} (81%) delete mode 100644 classic/css/locationbar/ac_popup_classic_with_two_lines_fx60.css delete mode 100644 classic/xml/urlbarBindings_fx60.xml diff --git a/classic/css/buttons/appbutton_in_titlebar.css b/classic/css/buttons/appbutton_in_titlebar.css index 02a8117e..dddccc65 100644 --- a/classic/css/buttons/appbutton_in_titlebar.css +++ b/classic/css/buttons/appbutton_in_titlebar.css @@ -96,6 +96,15 @@ } } +/* code for Linux/macOS */ +@media not all and (-moz-os-version: windows-win7) { +@media not all and (-moz-os-version: windows-win8) { +@media not all and (-moz-os-version: windows-win10) { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { + top: 0px !important; + } +}}} + #main-window[tabsintitlebar][inFullscreen] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 0px !important; } @@ -115,6 +124,15 @@ border-bottom: 1px solid !important; } +/* code for Linux/macOS */ +@media not all and (-moz-os-version: windows-win7) { +@media not all and (-moz-os-version: windows-win8) { +@media not all and (-moz-os-version: windows-win10) { + #main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { + max-width: 90px !important; + } +}}} + /* hide button in fullscreen mode, if toolbars get automatically hidden */ #main-window[tabsintitlebar] #navigator-toolbox[inFullscreen="true"][style*="margin-top: -"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { visibility: collapse !important; diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only.css b/classic/css/buttons/appbutton_in_titlebar_icon_only.css index f553fac3..4eca0e7a 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only.css @@ -101,6 +101,15 @@ } } +/* code for Linux/macOS */ +@media not all and (-moz-os-version: windows-win7) { +@media not all and (-moz-os-version: windows-win8) { +@media not all and (-moz-os-version: windows-win10) { + #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { + top: 0px !important; + } +}}} + #main-window[tabsintitlebar][inFullscreen] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { top: 0px !important; } @@ -120,6 +129,15 @@ border-bottom: 1px solid !important; } +/* code for Linux/macOS */ +@media not all and (-moz-os-version: windows-win7) { +@media not all and (-moz-os-version: windows-win8) { +@media not all and (-moz-os-version: windows-win10) { + #main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button { + max-width: 40px !important; + } +}}} + /* hide button in fullscreen mode, if toolbars get automatically hidden */ #main-window[tabsintitlebar] #navigator-toolbox[inFullscreen="true"][style*="margin-top: -"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { visibility: collapse !important; diff --git a/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance.css b/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance.css index 56488dc3..d0e64905 100644 --- a/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance.css +++ b/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance.css @@ -38,6 +38,11 @@ box-shadow: unset !important; } +#BMB_bookmarksPopup menupopup { + background: -moz-Dialog !important; + color: -moz-DialogText !important; +} + #BMB_bookmarksPopup menupopup > hbox { background: unset !important; border: unset !important; @@ -89,3 +94,17 @@ } +/* code for Linux/macOS */ +@media not all and (-moz-os-version: windows-win7) { +@media not all and (-moz-os-version: windows-win8) { +@media not all and (-moz-os-version: windows-win10) { + #BMB_bookmarksPopup menupopup, + #BMB_bookmarksPopup .panel-arrowcontent { + background: -moz-Dialog !important; + color: inherit !important; + } + #BMB_bookmarksPopup menu:-moz-any(:hover,:active,[_moz-menuactive],[open]) > label, + #BMB_bookmarksPopup menuitem:-moz-any(:hover,:active) > label { + color: HighlightText !important; + } +}}} diff --git a/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_macOS_fix.css b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOS.css similarity index 100% rename from classic/css/generalui/context_bfrsb_labels_with_and_without_icons_macOS_fix.css rename to classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOS.css diff --git a/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOSv2.css b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOSv2.css new file mode 100644 index 00000000..b36a500a --- /dev/null +++ b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOSv2.css @@ -0,0 +1,13 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +:-moz-any(#context-back,#context-forward,#context-reload,#context-stop,#context-bookmarkpage) image { + -moz-margin-start: 2px !important; + -moz-margin-end: -2px !important; +} diff --git a/classic/css/generalui/context_bfrsb_labels_with_icons.css b/classic/css/generalui/context_bfrsb_labels_with_icons.css index 3139a53e..e2d268de 100644 --- a/classic/css/generalui/context_bfrsb_labels_with_icons.css +++ b/classic/css/generalui/context_bfrsb_labels_with_icons.css @@ -66,3 +66,13 @@ } } + +/* code for Linux/macOS */ +@media not all and (-moz-os-version: windows-win7) { +@media not all and (-moz-os-version: windows-win8) { +@media not all and (-moz-os-version: windows-win10) { + :-moz-any(#context-back,#context-forward,#context-reload,#context-stop,#context-bookmarkpage) image { + -moz-margin-start: 2px !important; + -moz-margin-end: 3px !important; + } +}}} diff --git a/classic/css/locationbar/ac_popup_classic_with_two_lines_fx57.css b/classic/css/locationbar/ac_popup_classic_with_two_lines.css similarity index 81% rename from classic/css/locationbar/ac_popup_classic_with_two_lines_fx57.css rename to classic/css/locationbar/ac_popup_classic_with_two_lines.css index c2215856..515a2185 100644 --- a/classic/css/locationbar/ac_popup_classic_with_two_lines_fx57.css +++ b/classic/css/locationbar/ac_popup_classic_with_two_lines.css @@ -16,6 +16,17 @@ -moz-binding: url("./../../xml/urlbarBindings_fx57.xml#autocomplete-richlistitem") !important; } + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem *:not(.ac-url), + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not(:-moz-any([type*="heuristic"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="keyword"],[actiontype="switchtab"])) .ac-url { + visibility: visible !important; + display: inherit !important; + } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not(:-moz-any([type*="heuristic"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="keyword"],[actiontype="switchtab"])) .ac-action { + visibility: collapse !important; + display: none !important; + } + /* remove space around box */ #PopupAutoCompleteRichResult .autocomplete-richlistbox { padding: 0 !important; @@ -42,6 +53,12 @@ -moz-padding-start: unset !important; -moz-padding-end: unset !important; } + + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem :-moz-any(.ac-title,.ac-url){ + min-width: unset !important; + width: unset !important; + max-width: unset !important; + } #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-type-icon { margin-inline-start: 4px !important; diff --git a/classic/css/locationbar/ac_popup_classic_with_two_lines_fx60.css b/classic/css/locationbar/ac_popup_classic_with_two_lines_fx60.css deleted file mode 100644 index 597a48c2..00000000 --- a/classic/css/locationbar/ac_popup_classic_with_two_lines_fx60.css +++ /dev/null @@ -1,108 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - -@-moz-document url(chrome://browser/content/browser.xul) { - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] { - -moz-binding: url("./../../xml/urlbarBindings_fx60.xml#urlbar-rich-result-popup") !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { - -moz-binding: url("./../../xml/urlbarBindings_fx60.xml#autocomplete-richlistitem") !important; - } - - /* remove space around box */ - #PopupAutoCompleteRichResult .autocomplete-richlistbox { - padding: 0 !important; - } - - /* restyle popup items */ - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { - -moz-box-orient: vertical !important; - min-height: unset !important; - height: unset !important; - max-height: unset !important; - padding: 8px 0px !important; - border-radius: 0 !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-separator { - display:none !important; - visibility: collapse !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem :-moz-any(.ac-site-icon,.ac-title,.ac-action,.ac-url){ - -moz-margin-start: unset !important; - -moz-margin-end: unset !important; - -moz-padding-start: unset !important; - -moz-padding-end: unset !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-type-icon { - margin-inline-start: 4px !important; - margin-inline-end: 4px !important; - -moz-box-ordinal-group: 1 !important; - margin-bottom: -40px !important; - margin-top: 4px !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-site-icon { - -moz-margin-start: 4px !important; - -moz-box-ordinal-group: 0 !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-title{ - -moz-margin-start: 25px !important; - -moz-margin-end: 25px !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem :-moz-any(.ac-url, .ac-action){ - -moz-margin-start: 25px !important; - -moz-margin-end: 25px !important; - margin-top: 1px !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-url{ - padding-top: 2px !important; - padding-bottom: 2px !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-action[actiontype=searchengine]:not([selected]) { - display: block !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem #ibox-spacer { - width: 100000px !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] hbox[anonid="search-suggestions-notification"] { - display: none !important; - } - - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] deck[search-suggestions-notification] { - display: none !important; - } - - /* fix large space issue at items end */ - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { - border-inline-end: 0px solid transparent !important; - } - - /* remove search box at poups button */ - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .search-one-offs { - display: none !important; - } - - /* show scrollbar */ - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] scrollbox{ - overflow-y: auto !important; - } - - /**/ - -} \ No newline at end of file diff --git a/classic/userChrome.css b/classic/userChrome.css index 2bd205aa..bd7f7071 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.7.0 ********************************************************************************/ +/* version 1.7.1 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -372,7 +372,8 @@ /* menuitem labels - only use one at a time *****************************************************/ @import url(./css/generalui/context_bfrsb_labels_without_icons.css); /**/ /* @import url(./css/generalui/context_bfrsb_labels_with_icons.css); /**/ -/* @import url(./css/generalui/context_bfrsb_labels_with_and_without_icons_macOS_fix.css); /**/ /* <-- macOS fix */ +/* @import url(./css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOS.css); /**/ /* <-- Lin/macOS fix v1 */ +/* @import url(./css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOSv2.css); /**/ /* <-- Lin/macOS fix v2 */ /* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ /* @import url(./css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ @@ -524,10 +525,9 @@ /* [!] 'Classic popup with two lined results' removes 'oneoff' searches at popups bottom ********/ /* popup content order/appearance - only use one at a time **************************************/ -/* @import url(./css/locationbar/ac_popup_classic_with_two_lines_fx57.css); /**/ -/* @import url(./css/locationbar/ac_popup_classic_with_two_lines_fx60.css); /**/ +@import url(./css/locationbar/ac_popup_classic_with_two_lines.css); /**/ /* @import url(./css/locationbar/ac_popup_title_and_url_50percent_width.css); /**/ -@import url(./css/locationbar/ac_popup_url_and_title_50percent_width.css); /**/ +/* @import url(./css/locationbar/ac_popup_url_and_title_50percent_width.css); /**/ /* @import url(./css/locationbar/ac_popup_item_title_hidden.css); /**/ /* @import url(./css/locationbar/ac_popup_item_title_visible_on_hover_only.css); /**/ diff --git a/classic/xml/addonversion_fx57.xml b/classic/xml/addonversion_fx57.xml index 29441188..38908cba 100644 --- a/classic/xml/addonversion_fx57.xml +++ b/classic/xml/addonversion_fx57.xml @@ -1,8 +1,4 @@ - - @@ -18,7 +14,7 @@ + extends="chrome://mozapps/content/extensions/extensions.xml#addon-generic"> @@ -175,190 +171,10 @@ - - - - - document.getAnonymousElementByAttribute(this, "anonid", - "warning-container"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "warning"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "warning-link"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "warning-btn"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "error-container"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "error"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "error-link"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "pending-container"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "pending"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "info-container"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "info"); - document.getAnonymousElementByAttribute(this, "anonid", "version"); - - document.getAnonymousElementByAttribute(this, "anonid", "experiment-state"); - - - document.getAnonymousElementByAttribute(this, "anonid", "experiment-time"); - - - document.getAnonymousElementByAttribute(this, "anonid", "icon"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "date-updated"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "description"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "state-menulist"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "ask-to-activate-menuitem"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "always-activate-menuitem"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "never-activate-menuitem"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "preferences-btn"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "enable-btn"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "disable-btn"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "remove-btn"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "update-btn"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "control-container"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "install-status"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "checking-update"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "update-available"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "include-update"); - - false - - document.getAnonymousElementByAttribute(this, "anonid", - "relnotes-toggle-btn"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "relnotes-loading"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "relnotes-error"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "relnotes-container"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "relnotes"); - - - - - - - - - - - @@ -413,567 +229,7 @@ } ]]> - - - - - - - - - - - - this.hasPermission(perm)); - this._stateMenulist.disabled = !hasActivatePermission; - this._stateMenulist.hidden = false; - this._stateMenulist.classList.add("no-auto-hide"); - } else { - this._stateMenulist.hidden = true; - - let enableTooltip = gViewController.commands.cmd_enableItem - .getTooltip(this.mAddon); - this._enableBtn.setAttribute("tooltiptext", enableTooltip); - if (this.hasPermission("enable")) { - this._enableBtn.hidden = false; - } else { - this._enableBtn.hidden = true; - } - - let disableTooltip = gViewController.commands.cmd_disableItem - .getTooltip(this.mAddon); - this._disableBtn.setAttribute("tooltiptext", disableTooltip); - if (this.hasPermission("disable")) { - this._disableBtn.hidden = false; - } else { - this._disableBtn.hidden = true; - } - } - - let uninstallTooltip = gViewController.commands.cmd_uninstallItem - .getTooltip(this.mAddon); - this._removeBtn.setAttribute("tooltiptext", uninstallTooltip); - if (this.hasPermission("uninstall")) { - this._removeBtn.hidden = false; - } else { - this._removeBtn.hidden = true; - } - - this.setAttribute("active", this.mAddon.isActive); - - var showProgress = this.mAddon.purchaseURL || (this.mAddon.install && - this.mAddon.install.state != AddonManager.STATE_INSTALLED); - this._showStatus(showProgress ? "progress" : "none"); - - if (this.mAddon.type == "experiment") { - this.removeAttribute("notification"); - let prefix = "experiment."; - let active = this.mAddon.isActive; - - if (!showProgress) { - let stateKey = prefix + "state." + (active ? "active" : "complete"); - this._experimentState.value = gStrings.ext.GetStringFromName(stateKey); - - let now = Date.now(); - let end = this.endDate; - let days = Math.abs(end - now) / (24 * 60 * 60 * 1000); - - let timeKey = prefix + "time."; - let timeMessage; - - if (days < 1) { - timeKey += (active ? "endsToday" : "endedToday"); - timeMessage = gStrings.ext.GetStringFromName(timeKey); - } else { - timeKey += (active ? "daysRemaining" : "daysPassed"); - days = Math.round(days); - let timeString = gStrings.ext.GetStringFromName(timeKey); - timeMessage = PluralForm.get(days, timeString) - .replace("#1", days); - } - - this._experimentTime.value = timeMessage; - } - } - ]]> - - - - - - - - { - var event = document.createEvent("Events"); - event.initEvent("RelNotesToggle", true, true); - this.dispatchEvent(event); - }; - - let showRelNotes = () => { - if (!relNotesData || !transformData) - return; - - this._relNotesLoading.hidden = true; - - var processor = Components.classes["@mozilla.org/document-transformer;1?type=xslt"] - .createInstance(Components.interfaces.nsIXSLTProcessor); - processor.flags |= Components.interfaces.nsIXSLTProcessorPrivate.DISABLE_ALL_LOADS; - - processor.importStylesheet(transformData); - var fragment = processor.transformToFragment(relNotesData, document); - this._relNotes.appendChild(fragment); - if (this.hasAttribute("show-relnotes")) { - var container = this._relNotesContainer; - container.style.height = container.scrollHeight + "px"; - } - sendToggleEvent(); - }; - - let handleError = () => { - dataReq.abort(); - styleReq.abort(); - this._relNotesLoading.hidden = true; - this._relNotesError.hidden = false; - this._relNotesLoaded = false; // allow loading to be re-tried - sendToggleEvent(); - }; - - function handleResponse(aEvent) { - var XMLURI_PARSE_ERROR = "http://www.mozilla.org/newlayout/xml/parsererror.xml"; - var req = aEvent.target; - var ct = req.getResponseHeader("content-type"); - if ((!ct || !ct.includes("text/html")) && - req.responseXML && - req.responseXML.documentElement.namespaceURI != XMLURI_PARSE_ERROR) { - if (req == dataReq) - relNotesData = req.responseXML; - else - transformData = req.responseXML; - showRelNotes(); - } else { - handleError(); - } - } - - var dataReq = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(Components.interfaces.nsIXMLHttpRequest); - dataReq.open("GET", aURI.spec, true); - dataReq.responseType = "document"; - dataReq.addEventListener("load", handleResponse); - dataReq.addEventListener("error", handleError); - dataReq.send(null); - var UPDATES_RELEASENOTES_TRANSFORMFILE = "chrome://mozapps/content/extensions/updateinfo.xsl"; - - var styleReq = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(Components.interfaces.nsIXMLHttpRequest); - styleReq.open("GET", UPDATES_RELEASENOTES_TRANSFORMFILE, true); - styleReq.responseType = "document"; - styleReq.addEventListener("load", handleResponse); - styleReq.addEventListener("error", handleError); - styleReq.send(null); - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - document.getAnonymousElementByAttribute(this, "anonid", "notice"); - - - document.getAnonymousElementByAttribute(this, "anonid", "restart-btn"); - - - - - - - - - - - - - - - - - - - + + + - - - - - - - + extends="chrome://mozapps/content/extensions/extensions.xml#addon-installing"> @@ -1198,40 +287,10 @@ - - - document.getAnonymousElementByAttribute(this, "anonid", "icon"); - - - document.getAnonymousElementByAttribute(this, "anonid", "name"); - document.getAnonymousElementByAttribute(this, "anonid", "version"); - - document.getAnonymousElementByAttribute(this, "anonid", "warning"); - - - document.getAnonymousElementByAttribute(this, "anonid", "warning-link"); - - - document.getAnonymousElementByAttribute(this, "anonid", - "install-status"); - - - - - - - - - - - - - - - - - - - - - - diff --git a/classic/xml/oldsearch_fx57.xml b/classic/xml/oldsearch_fx57.xml index 3d9118ea..eccb8a1e 100644 --- a/classic/xml/oldsearch_fx57.xml +++ b/classic/xml/oldsearch_fx57.xml @@ -139,7 +139,6 @@ ]]> @@ -188,20 +187,14 @@ this.hideNewEngine(aEngine); break; case "engine-current": - // The current engine was changed. Rebuilding the menu appears to - // confuse its idea of whether it should be open when it's just - // been clicked, so we force it to close now. this._popup.hidePopup(); break; case "engine-changed": - // An engine was removed (or hidden) or added, or an icon was - // changed. Do nothing special. + } - // Make sure the engine list is refetched next time it's needed this._engines = null; - // Rebuild the popup and update the display after any modification. this.rebuildPopup(); this.updateDisplay(); @@ -308,8 +301,6 @@ const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; - // Find the (first) separator in the remaining menu, or the first item - // if no separators are present. var insertLocation = popup.firstChild; while (insertLocation.nextSibling && insertLocation.localName != "menuseparator") { @@ -322,7 +313,6 @@ separator.setAttribute("class", "addengine-separator"); popup.insertBefore(separator, insertLocation); - // Insert the "add this engine" items. for (var i = 0; i < addengines.length; i++) { var menuitem = document.createElement("menuitem"); var engineInfo = addengines[i]; @@ -347,7 +337,6 @@ - - + - if (document.getBindingParent(this).parentNode.parentNode.localName == - "toolbarpaletteitem") - return; + + - - - - - - - - - + } - - =60) { - popup.mInput = this; - popup.view = this.controller.QueryInterface(Components.interfaces.nsITreeView); - popup.invalidate(); + if (popup.id == "PopupSearchAutoComplete") { + popup.setAttribute("norolluponanchor", "true"); + } - popup.showCommentColumn = this.showCommentColumn; - popup.showImageColumn = this.showImageColumn; + popup.mInput = this; - document.popupNode = null; - - var isRTL = getComputedStyle(this, "").direction == "rtl"; - var outerRect = this.getBoundingClientRect(); - var innerRect = this.inputField.getBoundingClientRect(); - - - var width = 100; - - width = isRTL ? Math.round(outerRect.left - outerRect.right) : Math.round(outerRect.right - outerRect.left); + popup.selectedIndex = -1; - if(Services.appinfo.OS=="Darwin") { - width = width - 1; // MacOSX - } - - popup.setAttribute("width", width > 100 ? width : 100); + document.popupNode = null; - popup.openPopup(this, "after_start", 0, -1, false, false); - } - ]]> - + const isRTL = getComputedStyle(this, "").direction == "rtl"; - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100 ? width : 100);*/ + + if(Services.appinfo.OS=="Darwin") { + width = width - 1; // MacOSX + } + + popup.setAttribute("width", outerRect.width); + + popup._invalidate(); + + var y_position = -1; + + } else { + popup.mInput = this; + popup.view = this.controller.QueryInterface(Components.interfaces.nsITreeView); + popup.invalidate(); - 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) - return; + popup.showCommentColumn = this.showCommentColumn; + popup.showImageColumn = this.showImageColumn; - let stopEvent = false; + document.popupNode = null; + + var isRTL = getComputedStyle(this, "").direction == "rtl"; + var outerRect = this.getBoundingClientRect(); + var innerRect = this.inputField.getBoundingClientRect(); + + var width = 100; + + width = isRTL ? Math.round(outerRect.left - outerRect.right) : Math.round(outerRect.right - outerRect.left); + + if(Services.appinfo.OS=="Darwin") { + width = width - 1; // MacOSX + } + + popup.setAttribute("width", width > 100 ? width : 100); + + var y_position = 0; + + } - // Alt + up/down is very similar to (shift +) tab but differs in that - // it loops through the list, whereas tab will move the focus out. - if (aEvent.altKey && - (aEvent.keyCode == KeyEvent.DOM_VK_DOWN || - aEvent.keyCode == KeyEvent.DOM_VK_UP)) { - stopEvent = - this.advanceSelection(aEvent.keyCode == KeyEvent.DOM_VK_DOWN, - true, true); - } - else if (aEvent.keyCode == KeyEvent.DOM_VK_DOWN || - aEvent.keyCode == KeyEvent.DOM_VK_UP) { - stopEvent = this.advanceSelection(aEvent.keyCode == KeyEvent.DOM_VK_DOWN); - } - else if (aEvent.keyCode == KeyEvent.DOM_VK_TAB) { - stopEvent = this.advanceSelection(!aEvent.shiftKey, true); + var x_position = outerRect.x - innerRect.x; + + + popup.openPopup(this.inputField, "after_start", x_position, y_position, false, false); } - if (stopEvent) { - aEvent.preventDefault(); - aEvent.stopPropagation(); - } ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - let searchbar = document.getElementById("searchbar"); - searchbar.searchButton.open = false; - searchbar.handleSearchCommand(event, engine); - } - ]]> - - diff --git a/classic/xml/urlbarBindings_fx57.xml b/classic/xml/urlbarBindings_fx57.xml index 7238e06a..4c75980e 100644 --- a/classic/xml/urlbarBindings_fx57.xml +++ b/classic/xml/urlbarBindings_fx57.xml @@ -24,235 +24,71 @@ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xbl="http://www.mozilla.org/xbl"> - - - - - - - - - - - - - &brandShortName; - - - - 💡 &urlbar.searchSuggestionsNotification.hintPrefix; - &urlbar.searchSuggestionsNotification.hint; - - - - - - - - - - - + - - window.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindowUtils); - - - 0 - - - Cc["@mozilla.org/intl/stringbundle;1"]. - getService(Ci.nsIStringBundleService). - createBundle("chrome://browser/locale/places/places.properties"); - - - - document.getAnonymousElementByAttribute( - this, "anonid", "search-suggestions-notification" - ); - - - - document.getAnonymousElementByAttribute(this, "anonid", "footer"); - - - - document.getAnonymousElementByAttribute(this, "anonid", - "one-off-search-buttons"); - - - false - - null - - - - + + + - - - - - - - - - - - - - maxRow && index != maxRow) - newIndex = maxRow; - else if (!reverse && index == -1 || newIndex < 0 && index != 0) - newIndex = 0; - - if (newIndex < 0 && index == 0 || newIndex > maxRow && index == maxRow) - newIndex = -1; - return newIndex; + if (!this.style.direction) { + this.style.direction = + aElement.ownerGlobal.getComputedStyle(aElement).direction; } + let popupDirection = this.style.direction; - if (newIndex < 0) { - newIndex = index > 0 ? 0 : maxRow; - } else if (newIndex > maxRow) { - newIndex = index < maxRow ? maxRow : 0; - } - return newIndex; - ]]> - + let documentRect = + this.DOMWindowUtils + .getBoundsWithoutFlushing(window.document.documentElement); + let width = documentRect.right - documentRect.left; + this.setAttribute("width", Math.round(document.getElementById("urlbar").getBoundingClientRect().width)); - - - 0 && - this.input.mController - .getStyleAt(0) - .split(/\s+/).indexOf("heuristic") > 0; - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - startOffset * 2) { + endOffset = startOffset; + } + let identityIcon = document.getElementById("identity-icon"); + let identityRect = + this.DOMWindowUtils.getBoundsWithoutFlushing(identityIcon); + let start = popupDirection == "rtl" ? + documentRect.right - identityRect.right : + identityRect.left; + if (!this.margins || start != this.margins.start || + endOffset != this.margins.end || + width != this.margins.width) { + this.margins = { start, end: endOffset, width }; + needsHandleOverUnderflow = true; + } + } else if (this.margins) { + this.margins = undefined; + needsHandleOverUnderflow = true; } - let width = 300; - - try{ - width = Math.round(document.getElementById("urlbar").getBoundingClientRect().width); - } catch(e){} - - this.setAttribute("width", width); - this.mInput = aInput; aInput.controller.setInitiallySelectedIndex(this._isFirstResultHeuristic ? 0 : -1); - this.view = aInput.controller.QueryInterface(Components.interfaces.nsITreeView); this._invalidate(); try { @@ -268,344 +104,31 @@ this._hideSearchSuggestionsNotification(); } } catch (ex) { - Components.utils.reportError(ex); } - + + let yOffset = Math.round( + this.DOMWindowUtils.getBoundsWithoutFlushing(document.getElementById("nav-bar")).bottom - + this.DOMWindowUtils.getBoundsWithoutFlushing(aInput).bottom); + var x_position = document.getElementById("urlbar").getBoundingClientRect().x; var y_position = -1; - + this.openPopup(aElement, "after_start", x_position, y_position, false, false); - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - t != "action" && t != "heuristic"); - try { - parts.push(this._bundle.GetStringFromName(type + "ResultLabel")); - } catch (e) {} - - return parts.filter(str => str).join(" "); - ]]> - - - - - - - - - - - 0) { - let firstStyle = this.input.mController.getStyleAt(0); - if (firstStyle.includes("autofill")) { - let uri = this.input.mController.getFinalCompleteValueAt(0); - if (!uri.includes("://")) { - uri = "http://" + uri; - } - this.maybeSetupSpeculativeConnect(uri); - } else if (firstStyle.includes("searchengine") && - this.input.browserSearchSuggestEnabled && - this.input.urlbarSearchSuggestEnabled) { - let engine = Services.search.currentEngine; - engine.speculativeConnect({window, - originAttributes: gBrowser.contentPrincipal.originAttributes}); - } - } - - this.footer.collapsed = false; - this.input.tabScrolling = true; - - this.input.gotResultForCurrentQuery = true; - this.input.maybeReplayDeferredKeyEvents(); - ]]> - - - - - - - - null - null - {} - - [ - "_invalidate", - ] - - [ - "search-suggestions-notification", - "richlistbox", - "one-off-search-buttons", - ] - {} - - - - - - - - - - - - - - - - - - - 0) { - this.maybeSetupSpeculativeConnect(url); - } else if (url.startsWith("moz-action:remotetab")) { - const MOZ_ACTION_REGEX = /^moz-action:([^,]+),(.*)$/; - if (!MOZ_ACTION_REGEX.test(url)) - return; - - let params = JSON.parse(url.match(MOZ_ACTION_REGEX)[2]); - if (params.url) { - this.maybeSetupSpeculativeConnect(decodeURIComponent(params.url)); - } - } - - ]]> - - - + - - - - - - - - - - - - - - - str).join(" "); - - let panel = this.parentNode.parentNode; - if (panel.createResultLabel) { - return panel.createResultLabel(this, label); - } - - return label; - ]]> - - - - - - - - null - - - - - - - - false - - - - - - - - - - - - - - - - - - = 0) { - regions.push([matchIndex, matchIndex + searchLen]); - } - } - - regions = regions.sort((a, b) => { - let start = a[0] - b[0]; - return (start == 0) ? a[1] - b[1] : start; - }); - - let start = 0; - let end = 0; - let boundaries = []; - let len = regions.length; - for (let i = 0; i < len; i++) { - let region = regions[i]; - if (region[0] > end) { - boundaries.push(start); - boundaries.push(end); - - start = region[0]; - } - - end = Math.max(end, region[1]); - } - - boundaries.push(start); - boundaries.push(end); - - if (end < aText.length) - boundaries.push(aText.length); - - return boundaries.slice(1); - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = 0 && index < aReplacements.length) { - pairs.push([...aReplacements[index]]); - } - } else { - pairs.push([part]); - } - } - - return pairs; - ]]> - - - - - - - - - - - - null - - - - - - - - - - - - - - - - - = 0) { - pairs = [ - [searchSuggestion.substring(0, idx), ""], - [searchQuery, "match"], - [searchSuggestion.substring(idx + searchQuery.length), ""], - ]; - } else { - pairs = [ - [searchSuggestion, ""], - ]; - } - } else { - pairs = [ - [searchQuery, ""], - ]; - } - let interpStr = pairs.map((pair, i) => `%${i + 1}$S`).join(""); - title = this._generateEmphasisPairs(interpStr, pairs); - - if (!action.params.alias && !initialTypes.has("favicon")) { - this.removeAttribute("image"); - } - } else if (action.type == "visiturl") { - emphasiseUrl = false; - displayUrl = this._unescapeUrl(action.params.url); - title = displayUrl; - titleLooksLikeUrl = true; - let visitStr = this._stringBundle.GetStringFromName("visit"); - this._setUpDescription(this._actionText, visitStr, true); - } else if (action.type == "extension") { - let content = action.params.content; - displayUrl = content; - this._setUpDescription(this._actionText, content, true); - } - } - - if (!displayUrl) { - let input = popup.input; - let url = typeof(input.trimValue) == "function" ? - input.trimValue(originalUrl) : - originalUrl; - displayUrl = this._unescapeUrl(url); - } - if (popup.textRunsMaxLen) { - displayUrl = displayUrl.substr(0, popup.textRunsMaxLen); - } - this.setAttribute("displayurl", displayUrl); - - if (!title) { - title = displayUrl; - titleLooksLikeUrl = true; - try { - let uri = Services.io.newURI(originalUrl); - if (uri.host) - title = uri.host; - } catch (e) {} - } - - this._tags.setAttribute("empty", "true"); - - if (type == "tag" || type == "bookmark-tag") { - let tags; - [, title, tags] = title.match(/^(.+) \u2013 (.+)$/); - - let sortedTags = tags.split(/\s*,\s*/).sort((a, b) => { - return a.localeCompare(a); - }); - - let anyTagsMatch = this._setUpTags(sortedTags); - if (anyTagsMatch) { - this._tags.removeAttribute("empty"); - } - if (type == "bookmark-tag") { - type = "bookmark"; - } - } else if (type == "keyword") { - emphasiseUrl = false; - let keywordArg = this.getAttribute("text").replace(/^[^\s]+\s*/, ""); - if (!keywordArg) { - type = "visiturl"; - this.setAttribute("actiontype", "visiturl"); - let visitStr = this._stringBundle.GetStringFromName("visit"); - this._setUpDescription(this._actionText, visitStr, true); - } else { - let pairs = [[title, ""], [keywordArg, "match"]]; - let interpStr = - this._stringBundle.GetStringFromName("bookmarkKeywordSearch"); - title = this._generateEmphasisPairs(interpStr, pairs); - this._setUpDescription(this._actionText, "", false); - } - } - - this.setAttribute("type", type); - - if (titleLooksLikeUrl) { - this._titleText.setAttribute("lookslikeurl", "true"); - } else { - this._titleText.removeAttribute("lookslikeurl"); - } - - if (Array.isArray(title)) { - if (popup.textRunsMaxLen) { - title = title.map(t => t.substr(0, popup.textRunsMaxLen)); - } - this._setUpEmphasisedSections(this._titleText, title); - } else { - if (popup.textRunsMaxLen) { - title = title.substr(0, popup.textRunsMaxLen); - } - this._setUpDescription(this._titleText, title, false); - } - this._setUpDescription(this._urlText, displayUrl, !emphasiseUrl); - - let wasInOverflow = this._inOverflow; - this._removeMaxWidths(); - if (wasInOverflow && this._inOverflow) { - this._handleOverflow(); - } - ]]> - - - - - - - - - + + + itemWidth) { - let titleTagsPct = 0.66; + + let titleTagsPct = 0.66; let titleTagsAvailable = itemWidth - separatorURLActionWidth; let titleTagsMaxWidth = Math.max( @@ -1300,6 +232,7 @@ itemWidth * titleTagsPct ); if (titleTagsWidth > titleTagsMaxWidth) { + let titlePct = 0.33; let titleAvailable = titleTagsMaxWidth - tagsRect.width; @@ -1320,77 +253,20 @@ itemWidth * (1 - titleTagsPct) ); urlActionMaxWidth -= separatorRect.width; - this._urlText.style.maxWidth = urlActionMaxWidth + "px"; + /*this._urlText.style.maxWidth = urlActionMaxWidth + "px";*/ this._actionText.style.maxWidth = urlActionMaxWidth + "px"; + + var new_max_width = itemRect.width - 80; + + this._titleText.style.maxWidth = new_max_width + "px"; + this._urlText.style.maxWidth = new_max_width + "px"; + this._hasMaxWidths = true; } ]]> + - - - - - - - - - - - - - - - - - diff --git a/classic/xml/urlbarBindings_fx60.xml b/classic/xml/urlbarBindings_fx60.xml deleted file mode 100644 index f0808ea2..00000000 --- a/classic/xml/urlbarBindings_fx60.xml +++ /dev/null @@ -1,1710 +0,0 @@ - - - - - -%notificationDTD; - -%browserDTD; - -%brandDTD; -]> - - - - - - - - - - - - - - - - - &brandShortName; - - - - 💡 &urlbar.searchSuggestionsNotification.hintPrefix; - &urlbar.searchSuggestionsNotification.hint; - - - - - - - - - - - - - - - window.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindowUtils); - - - 0 - - - Cc["@mozilla.org/intl/stringbundle;1"]. - getService(Ci.nsIStringBundleService). - createBundle("chrome://browser/locale/places/places.properties"); - - - - document.getAnonymousElementByAttribute( - this, "anonid", "search-suggestions-notification" - ); - - - - document.getAnonymousElementByAttribute(this, "anonid", "footer"); - - - - document.getAnonymousElementByAttribute(this, "anonid", - "one-off-search-buttons"); - - - false - - null - - - - - - - - - - - - - - - - - - - maxRow && index != maxRow) - newIndex = maxRow; - else if (!reverse && index == -1 || newIndex < 0 && index != 0) - newIndex = 0; - - if (newIndex < 0 && index == 0 || newIndex > maxRow && index == maxRow) - newIndex = -1; - - return newIndex; - } - - // Otherwise do not allow the selection to be removed. - if (newIndex < 0) { - newIndex = index > 0 ? 0 : maxRow; - } else if (newIndex > maxRow) { - newIndex = index < maxRow ? maxRow : 0; - } - return newIndex; - ]]> - - - - - 0 && - this.input.mController - .getStyleAt(0) - .split(/\s+/).indexOf("heuristic") > 0; - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - startOffset * 2) { - // Provide more space when aligning would result in an unbalanced - // margin. This allows the location bar to be moved to the start - // of the navigation toolbar to reclaim space for results. - endOffset = startOffset; - } - let identityIcon = document.getElementById("identity-icon"); - let identityRect = - this.DOMWindowUtils.getBoundsWithoutFlushing(identityIcon); - let start = popupDirection == "rtl" ? - documentRect.right - identityRect.right : - identityRect.left; - if (!this.margins || start != this.margins.start || - endOffset != this.margins.end || - width != this.margins.width) { - this.margins = { start, end: endOffset, width }; - needsHandleOverUnderflow = true; - } - } else if (this.margins) { - // Reset the alignment so that the site icons are positioned - // according to whatever's in the CSS. - this.margins = undefined; - needsHandleOverUnderflow = true; - } - - // Now that the margins have been set, start adding items (via - // _invalidate). - this.mInput = aInput; - aInput.controller.setInitiallySelectedIndex(this._isFirstResultHeuristic ? 0 : -1); - this.view = aInput.controller.QueryInterface(Components.interfaces.nsITreeView); - this._invalidate(); - - try { - let whichNotification = aInput.whichSearchSuggestionsNotification; - if (whichNotification != "none") { - // Update the impressions count on real popupshown, since there's - // no guarantee openPopup will be respected by the platform. - // Though, we must ensure the handled event is the expected one. - let impressionId = this._searchSuggestionsImpressionId = {}; - this.addEventListener("popupshown", () => { - if (this._searchSuggestionsImpressionId == impressionId) - aInput.updateSearchSuggestionsNotificationImpressions(whichNotification); - }, {once: true}); - this._showSearchSuggestionsNotification(whichNotification, popupDirection); - } else if (this.classList.contains("showSearchSuggestionsNotification")) { - this._hideSearchSuggestionsNotification(); - } - } catch (ex) { - // Not critical for the urlbar functionality, just report the error. - Components.utils.reportError(ex); - } - - // Position the popup below the navbar. To get the y-coordinate, - // which is an offset from the bottom of the input, subtract the - // bottom of the navbar from the buttom of the input. - let yOffset = Math.round( - this.DOMWindowUtils.getBoundsWithoutFlushing(document.getElementById("nav-bar")).bottom - - this.DOMWindowUtils.getBoundsWithoutFlushing(aInput).bottom); - - var x_position = document.getElementById("urlbar").getBoundingClientRect().x; - var y_position = -1; - - this.openPopup(aElement, "after_start", x_position, y_position, false, false); - - // Do this immediately after we've requested the popup to open. This - // will cause sync reflows but prevents flickering. - if (needsHandleOverUnderflow) { - for (let item of this.richlistbox.childNodes) { - item.handleOverUnderflow(); - } - } - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - t != "action" && t != "heuristic"); - try { - // Some types intentionally do not map to strings, which is not - // an error. - parts.push(this._bundle.GetStringFromName(type + "ResultLabel")); - } catch (e) {} - - return parts.filter(str => str).join(" "); - ]]> - - - - - - - - - - - 0) { - let firstStyle = this.input.mController.getStyleAt(0); - if (firstStyle.includes("autofill")) { - let uri = this.input.mController.getFinalCompleteValueAt(0); - // "http" will be stripped out, but other scheme won't. - if (!uri.includes("://")) { - uri = "http://" + uri; - } - this.maybeSetupSpeculativeConnect(uri); - } else if (firstStyle.includes("searchengine") && - this.input.browserSearchSuggestEnabled && - this.input.urlbarSearchSuggestEnabled) { - // Preconnect to the current search engine only if the search - // suggestions are enabled. - let engine = Services.search.currentEngine; - engine.speculativeConnect({window, - originAttributes: gBrowser.contentPrincipal.originAttributes}); - } - } - - // When a result is present the footer should always be visible. - this.footer.collapsed = false; - this.input.tabScrolling = true; - - this.input.gotResultForCurrentQuery = true; - this.input.replaySafeDeferredKeyEvents(); - ]]> - - - - - - - - null - null - {} - - - [ - "_invalidate", - ] - - [ - "search-suggestions-notification", - "richlistbox", - "one-off-search-buttons", - ] - {} - - - - - - - - - - - - - - - - - - - - - - 0) { - this.maybeSetupSpeculativeConnect(url); - } else if (url.startsWith("moz-action:remotetab")) { - // URL is in the format moz-action:ACTION,PARAMS - // Where PARAMS is a JSON encoded object. - const MOZ_ACTION_REGEX = /^moz-action:([^,]+),(.*)$/; - if (!MOZ_ACTION_REGEX.test(url)) - return; - - let params = JSON.parse(url.match(MOZ_ACTION_REGEX)[2]); - if (params.url) { - this.maybeSetupSpeculativeConnect(decodeURIComponent(params.url)); - } - } - - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - — - - - - - - - - - - - - - - - - - - - - - - - - - - - - str).join(" "); - - // allow consumers that have extended popups to override - // the label values for the richlistitems - let panel = this.parentNode.parentNode; - if (panel.createResultLabel) { - return panel.createResultLabel(this, label); - } - - return label; - ]]> - - - - - - - - null - - - - - - - - false - - - - - - - - - - - - - - - - - - = 0) { - regions.push([matchIndex, matchIndex + searchLen]); - } - } - - // Sort the regions by start position then end position - regions = regions.sort((a, b) => { - let start = a[0] - b[0]; - return (start == 0) ? a[1] - b[1] : start; - }); - - // Generate the boundary indices from each region - let start = 0; - let end = 0; - let boundaries = []; - let len = regions.length; - for (let i = 0; i < len; i++) { - // We have a new boundary if the start of the next is past the end - let region = regions[i]; - if (region[0] > end) { - // First index is the beginning of match - boundaries.push(start); - // Second index is the beginning of non-match - boundaries.push(end); - - // Track the new region now that we've stored the previous one - start = region[0]; - } - - // Push back the end index for the current or new region - end = Math.max(end, region[1]); - } - - // Add the last region - boundaries.push(start); - boundaries.push(end); - - // Put on the end boundary if necessary - if (end < aText.length) - boundaries.push(aText.length); - - // Skip the first item because it's always 0 - return boundaries.slice(1); - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = 0 && index < aReplacements.length) { - pairs.push([...aReplacements[index]]); - } - } else { - pairs.push([part]); - } - } - - return pairs; - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = 0) { - pairs = [ - [searchSuggestion.substring(0, idx), ""], - [searchQuery, "match"], - [searchSuggestion.substring(idx + searchQuery.length), ""], - ]; - } else { - pairs = [ - [searchSuggestion, ""], - ]; - } - } else { - pairs = [ - [searchQuery, ""], - ]; - } - let interpStr = pairs.map((pair, i) => `%${i + 1}$S`).join(""); - title = this._generateEmphasisPairs(interpStr, pairs); - - // If this is a default search match, we remove the image so we - // can style it ourselves with a generic search icon. - // We don't do this when matching an aliased search engine, - // because the icon helps with recognising which engine will be - // used (when using the default engine, we don't need that - // recognition). - if (!action.params.alias && !initialTypes.has("favicon")) { - this.removeAttribute("image"); - } - } else if (action.type == "visiturl") { - emphasiseUrl = false; - displayUrl = this._unescapeUrl(action.params.url); - title = displayUrl; - titleLooksLikeUrl = true; - let visitStr = this._stringBundle.GetStringFromName("visit"); - this._setUpDescription(this._actionText, visitStr, true); - } else if (action.type == "extension") { - let content = action.params.content; - displayUrl = content; - this._setUpDescription(this._actionText, content, true); - } - } - - if (!displayUrl) { - let input = popup.input; - let url = typeof(input.trimValue) == "function" ? - input.trimValue(originalUrl) : - originalUrl; - displayUrl = this._unescapeUrl(url); - } - // For performance reasons we may want to limit the displayUrl size. - if (popup.textRunsMaxLen) { - displayUrl = displayUrl.substr(0, popup.textRunsMaxLen); - } - this.setAttribute("displayurl", displayUrl); - - // Show the domain as the title if we don't have a title. - if (!title) { - title = displayUrl; - titleLooksLikeUrl = true; - try { - let uri = Services.io.newURI(originalUrl); - // Not all valid URLs have a domain. - if (uri.host) - title = uri.host; - } catch (e) {} - } - - this._tags.setAttribute("empty", "true"); - - if (type == "tag" || type == "bookmark-tag") { - // The title is separated from the tags by an endash - let tags; - [, title, tags] = title.match(/^(.+) \u2013 (.+)$/); - - // Each tag is split by a comma in an undefined order, so sort it - let sortedTags = tags.split(/\s*,\s*/).sort((a, b) => { - return a.localeCompare(a); - }); - - let anyTagsMatch = this._setUpTags(sortedTags); - if (anyTagsMatch) { - this._tags.removeAttribute("empty"); - } - if (type == "bookmark-tag") { - type = "bookmark"; - } - } else if (type == "keyword") { - // Note that this is a moz-action with action.type == keyword. - emphasiseUrl = false; - let keywordArg = this.getAttribute("text").replace(/^[^\s]+\s*/, ""); - if (!keywordArg) { - // Treat keyword searches without arguments as visiturl actions. - type = "visiturl"; - this.setAttribute("actiontype", "visiturl"); - let visitStr = this._stringBundle.GetStringFromName("visit"); - this._setUpDescription(this._actionText, visitStr, true); - } else { - let pairs = [[title, ""], [keywordArg, "match"]]; - let interpStr = - this._stringBundle.GetStringFromName("bookmarkKeywordSearch"); - title = this._generateEmphasisPairs(interpStr, pairs); - // The action box will be visible since this is a moz-action, but - // we want it to appear as if it were not visible, so set its text - // to the empty string. - this._setUpDescription(this._actionText, "", false); - } - } - - this.setAttribute("type", type); - - if (titleLooksLikeUrl) { - this._titleText.setAttribute("lookslikeurl", "true"); - } else { - this._titleText.removeAttribute("lookslikeurl"); - } - - if (Array.isArray(title)) { - // For performance reasons we may want to limit the title size. - if (popup.textRunsMaxLen) { - title = title.map(t => t.substr(0, popup.textRunsMaxLen)); - } - this._setUpEmphasisedSections(this._titleText, title); - } else { - // For performance reasons we may want to limit the title size. - if (popup.textRunsMaxLen) { - title = title.substr(0, popup.textRunsMaxLen); - } - this._setUpDescription(this._titleText, title, false); - } - this._setUpDescription(this._urlText, displayUrl, !emphasiseUrl); - - // Removing the max-width may be jarring when the item is visible, but - // we have no other choice to properly crop the text. - // Removing max-widths may cause overflow or underflow events, that - // will set the _inOverflow property. In case both the old and the new - // text are overflowing, the overflow event won't happen, and we must - // enforce an _handleOverflow() call to update the max-widths. - let wasInOverflow = this._inOverflow; - this._removeMaxWidths(); - if (wasInOverflow && this._inOverflow) { - this._handleOverflow(); - } - ]]> - - - - - - - - - - - - itemWidth) { - // Title + tags + URL/action overflows the item width. - - // The percentage of the item width allocated to the title and tags. - let titleTagsPct = 0.66; - - let titleTagsAvailable = itemWidth - separatorURLActionWidth; - let titleTagsMaxWidth = Math.max( - titleTagsAvailable, - itemWidth * titleTagsPct - ); - if (titleTagsWidth > titleTagsMaxWidth) { - // Title + tags overflows the max title + tags width. - - // The percentage of the title + tags width allocated to the - // title. - let titlePct = 0.33; - - let titleAvailable = titleTagsMaxWidth - tagsRect.width; - let titleMaxWidth = Math.max( - titleAvailable, - titleTagsMaxWidth * titlePct - ); - let tagsAvailable = titleTagsMaxWidth - titleRect.width; - let tagsMaxWidth = Math.max( - tagsAvailable, - titleTagsMaxWidth * (1 - titlePct) - ); - this._titleText.style.maxWidth = titleMaxWidth + "px"; - this._tagsText.style.maxWidth = tagsMaxWidth + "px"; - } - let urlActionMaxWidth = Math.max( - itemWidth - titleTagsWidth, - itemWidth * (1 - titleTagsPct) - ); - urlActionMaxWidth -= separatorRect.width; - this._urlText.style.maxWidth = urlActionMaxWidth + "px"; - this._actionText.style.maxWidth = urlActionMaxWidth + "px"; - this._hasMaxWidths = true; - } - ]]> - - - - - - - - - - - - - - - - - - - - - - - From f4d04b44fa157bf63fd9f97547524a11b372fba1 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Mon, 26 Feb 2018 13:20:02 +0100 Subject: [PATCH 25/47] 1.7.2 --- classic/css/generalui/oldsearch.css | 92 +++++++----------- .../css/toolbars/tabs_toolbar_adjustments.css | 10 ++ classic/image/search-glass.png | Bin 637 -> 0 bytes classic/image/search-glass32.png | Bin 1330 -> 0 bytes classic/image/search_searchglass.svg | 6 ++ classic/image/search_searchglass_dropdown.svg | 6 ++ classic/image/searchbar-dropdown-arrow.png | Bin 447 -> 0 bytes classic/userChrome.css | 10 +- classic/xml/oldsearch_fx57.xml | 87 ++++++++--------- 9 files changed, 100 insertions(+), 111 deletions(-) delete mode 100644 classic/image/search-glass.png delete mode 100644 classic/image/search-glass32.png create mode 100644 classic/image/search_searchglass.svg create mode 100644 classic/image/search_searchglass_dropdown.svg delete mode 100644 classic/image/searchbar-dropdown-arrow.png diff --git a/classic/css/generalui/oldsearch.css b/classic/css/generalui/oldsearch.css index d8592246..d359a1af 100644 --- a/classic/css/generalui/oldsearch.css +++ b/classic/css/generalui/oldsearch.css @@ -7,6 +7,22 @@ /************************************************************************************************/ +/* custom settings for 'old search' + Open about:config, right-click on any item, select New > Boolean or Integer > + browser.oldsearch.customwidth > true (enables custom popup width) + browser.oldsearch.customwidthvalue > 300 (example width value) + browser.oldsearch.clearinput > true (clear textbox after search) + browser.oldsearch.reverttodefault > true (revert to first engine after search) +*/ + +:root { + --search_dropdown: url(chrome://global/skin/icons/arrow-dropdown-12.svg); + --search_searchglass: url(chrome://browser/skin/search-glass.svg); + /* fallback variables */ + --search_dropdown_fb: url("../../image/search_searchglass_dropdown.svg"); + --search_searchglass_fb: url("../../image/search_searchglass.svg"); +} + searchbar { -moz-binding: url("./../../xml/oldsearch_fx57.xml#searchbar") !important; } @@ -42,61 +58,36 @@ searchbar .searchbar-textbox { } .searchbar-dropmarker-image { - list-style-image: url("./../../image/searchbar-dropdown-arrow.png") !important; - -moz-image-region: rect(0, 13px, 11px, 0) !important; + list-style-image: var(--search_dropdown,var(--search_dropdown_fb)) !important; + -moz-context-properties: fill, fill-opacity !important; + width: 8px !important; + height: 8px !important; + fill-opacity: 1.0 !important; + fill: #5b5b5b !important; } .searchbar-engine-button[open="true"] > .searchbar-dropmarker-image { - -moz-image-region: rect(0, 26px, 11px, 13px) !important; + fill: #658dd7 !important; + background: radial-gradient(rgba(91,91,91,0.2), transparent, transparent) !important; } .search-go-button { - display: block !important; - list-style-image: url("./../../image/search-glass.png") !important; - -moz-image-region: rect(0px, 16px, 16px, 0) !important; - min-width: 0 !important; - min-height: 0 !important; + list-style-image: var(--search_searchglass,var(--search_searchglass_fb)) !important; + -moz-context-properties: fill, fill-opacity !important; + margin-inline-start: 8px !important; + margin-inline-end: 6px !important; width: 16px !important; - height: 16px !important; -} - -#main-window[uidensity=compact] .search-go-button { - margin: 4px 0px !important; -} - -#main-window:not([uidensity=compact]):not([uidensity=touch]) .search-go-button { - margin: 6px 0px !important; -} - -#main-window[uidensity=touch] .search-go-button { - margin: 8px 0px !important; + fill-opacity: 1.0 !important; + fill: #3683ba !important; + transform: scaleX(-1) !important; } .search-go-button:hover { - -moz-image-region: rect(0px, 32px, 16px, 16px) !important; + fill: #1d518c !important; } .search-go-button:active { - -moz-image-region: rect(0px, 48px, 16px, 32px) !important; -} - -.search-go-button:-moz-locale-dir(rtl) { - transform: scaleX(-1); -} - -@media (min-resolution: 1.1dppx) { - .search-go-button { - list-style-image: url("./../../image/search-glass32.png") !important; - -moz-image-region: rect(0px, 32px, 32px, 0) !important; - } - - .search-go-button:hover { - -moz-image-region: rect(0px, 64px, 32px, 32px) !important; - } - - .search-go-button:active { - -moz-image-region: rect(0px, 96px, 32px, 64px) !important; - } + fill: #00095d !important; } .searchbar-engine-menuitem[selected="true"] > .menu-iconic-text { @@ -107,11 +98,6 @@ searchbar .searchbar-textbox { -moz-margin-start: -1px !important; } -/* location bars footer */ -#urlbar-search-footer{ - display: none !important; -} - #PopupSearchAutoComplete .tree-scrollbar, #PopupSearchAutoComplete .search-one-offs, #PopupSearchAutoComplete .search-panel-header{ @@ -138,16 +124,4 @@ searchbar .searchbar-textbox { margin-bottom: -4px !important; } -/* custom width for engines popup *//* -#searchbar .searchbar-popup { - min-width: 300px !important; - max-width: 300px !important; -} - -/* custom width for suggestions popup *//* -#PopupSearchAutoComplete { - min-width: 300px !important; - max-width: 300px !important; -} - /**/ diff --git a/classic/css/toolbars/tabs_toolbar_adjustments.css b/classic/css/toolbars/tabs_toolbar_adjustments.css index 5a8c8e9c..1cc97675 100644 --- a/classic/css/toolbars/tabs_toolbar_adjustments.css +++ b/classic/css/toolbars/tabs_toolbar_adjustments.css @@ -26,3 +26,13 @@ padding-left: 2px !important; min-height: unset !important; } + +/* code for macOS */ +@media not all and (-moz-os-version: windows-win7) { +@media not all and (-moz-os-version: windows-win8) { +@media not all and (-moz-os-version: windows-win10) { + #TabsToolbar .titlebar-placeholder[type="caption-buttons"]:not([ordinal="1000"]) { + -moz-margin-start: 24px !important; + } +}}} + diff --git a/classic/image/search-glass.png b/classic/image/search-glass.png deleted file mode 100644 index 9ec2fa3cfe6b9a5ad12e0c24f849328448afa134..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 637 zcmeAS@N?(olHy`uVBq!ia0vp^20$#p!3-qR3wWA=)ZPG}5Lchf!vA2vAe;XW!a^ng z{sRf`y7)MxdBf2gFD^ZN%b;ChkTTQ0Y}LmvKlY!!=a4h^=&hGq&plpx^j^e-{Uu9J zYlU>)efplky7A(jmwE})+E<>8oN<&PWOnzC>qSdX`%FBjUa=WyrhW5{OLtz}e)b;7 z&Y7~?y>{Kqbtf*|d674D7emUbfU4z16SgX(FOd!GG0ItNTD8%vc^8BI6b9oCxtLiD zoUzibb?*OCegHjUS`y?J%pfNDSBG7J*+VcmPkPR~xpRNK`)J(twVa~v_mj>&XePLi=wDNRu45^4)dhuq^Ap;542MN(HX61R9 z>uf6#6csVK`|+>*X_NXJdoD_z58ZcirsZVLq?wwF)|^^oKL$29quyyQF$ID@gK<(BxYxdf#`MujsAgb<4V(Av9^rvcQ8W3343e_l>{XN}N=T z=kVudj+QvbZ5F-3pL@OM*?R%%N)^$Gzu02l?ksO|zW;#3`omrBve$;u{*2cBS0&yQ zAKzwhjPn5hjxynx$1VSuHwWu(@6Ouz{ov||4R<3t${F|nuZY=m`orW4|D%dN|GQ|W zH?QaKbIqEEFGSzokH2llm2l$Ewtklv@qZTgFU!BMU*cDK{k?A!znEOF|8D<@cfv)D VTQm80Fae{1!PC{xWt~$(698=!Nsa&j diff --git a/classic/image/search-glass32.png b/classic/image/search-glass32.png deleted file mode 100644 index 21402cab90420e1900c70f557abc2edabb55bbf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1330 zcmV-21;||NZ{{|NsC0|Ns5||NsC0|NsC0|Nr>?{{R2~|NsC0|Nrs#`~Ls`CSRD{>hr6` z-2VUnlD*eGbE!~|zLK@l6H=7-`uv2e%5bdC-|+Wgl)tOV-yLwSN|eDzezFclgfD%y z%i-=BWv9g4>vo&L)Z^|0@i!60000pbW%=J0DLP=NF87V z6bq3sJtB*4_h!dA%<<~9^`g+adE~18!r}JrndNrZu*byl-09Wy*WkIEskX5I00Ztx zL_t(|UftDMcd|$j24ELt5kW+@fFKCQ-I(;kZvOwjn!;paW8};^GjsLTjTg`1t+HC1 z9$S*A$P;cjsYSKD9Kw8BLlpMu3i6dv7+3tZ-TMVFTS`ozO^l@mnrlCHf+ z?}_t;Z7u79Qd$)C(hnAMvF)$knpRZ_1vA9<>n{%-=uV*WvRa4W663;P*5oha)9D1C z_0kGv1EJ-Rk70J-Hw)Z!c=XVz%E~b#6F#AXHyf}MNL=DW{%QXLr8lik2`8~0#FW;S z4!kvDiVN$(?R8nw*l7IhK!-Tt6!shP`m%uhG0$=QcyHB3yyr#M?I!fw^_W(*-uAG} ztJt`?>N$B{7`)6hP^Lyf)Yof$<~B7&r60?Thy-@qb*sAav{x*#`Yz4bH8AzDY7B;8_C{{dn@L0j!8pYkOZ2 zZmp;XE6OtS#{(_T&MjZ85z_8{cvuk}l3vsMAsRKV9}dyQ+5HeVI8WWShdD~!Z%=k_ zC=b~~hNgS7xc>|zicOst8K3G}nwt8}RaeWhmECgQgP|Sc=1F)!DD`-mUC~rGwW79+ z?RdO3q5?acgp*jeHJoD21rIh_n&BvDyLTXntTtO!4R(-E)&cuR6S=XgX--jSW)ztY zrJB!P72xV_g>eckjzS<4|G#ydpthT)Xq3DGU-`l_7iULwZSp(){VSh) z?mcB_ud + + + \ No newline at end of file diff --git a/classic/image/search_searchglass_dropdown.svg b/classic/image/search_searchglass_dropdown.svg new file mode 100644 index 00000000..72956fe7 --- /dev/null +++ b/classic/image/search_searchglass_dropdown.svg @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/classic/image/searchbar-dropdown-arrow.png b/classic/image/searchbar-dropdown-arrow.png deleted file mode 100644 index d26bae3f5dfa7baadd1e4877a154587bc0eba8b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^Qb5ej!3-qB*d_R5nheO6juacwQ z6{n)3qf>jYr+1yn$;rvj&o7w$YVzdCQ>IK=xpL*L-!hIsH|vxH`2{mDFfuW-u(GkU zb8vET^YZZvi-=1|N=eBoD5+}d7#Lbw+c`Km1_uXUynN-s&Koy@`eu2$IEF|_h8{2s zV{#N=xv**-+mSm5e&6poa-cx|-3gy^&6}S*Wg>c1-d>G#wv-!<79a>KLkGu&8rEi!hSYr@|c{oA<=3dTof z6rXYLX1MnEt=WeoDbmSjOrwwNFO{!QI+53ZeAa0dJ{iT%b*u7(*xeeI browser.search.openintab': open search in current or new tab *************/ /* [!] 'about:config > browser.search.suggest.enabled': search suggestions visibility ***********/ +/* [!] 'about:config > browser.oldsearch.customwidth': enables custom popup width ***************/ +/* [!] 'about:config > browser.oldsearch.customwidthvalue': custom popup width value ************/ +/* [!] 'about:config > browser.oldsearch.clearinput': clear searchbox after search **************/ +/* [!] 'about:config > browser.oldsearch.reverttodefault': revert to first engine after search **/ /* [!] Shift + click on search glass: search opens in a new window ******************************/ /* [!] Ctrl/Cmd + click on search glass: search opens in a new tab ******************************/ /* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/104 ***********************/ diff --git a/classic/xml/oldsearch_fx57.xml b/classic/xml/oldsearch_fx57.xml index eccb8a1e..84eb0e7b 100644 --- a/classic/xml/oldsearch_fx57.xml +++ b/classic/xml/oldsearch_fx57.xml @@ -285,13 +285,16 @@ } var searchtextbox = document.getAnonymousElementByAttribute(document.getElementById("searchbar"), "anonid", "searchbar-textbox"); - var isRTL = getComputedStyle(searchtextbox, "").direction == "rtl"; var outerRect = searchtextbox.getBoundingClientRect(); var innerRect = searchtextbox.inputField.getBoundingClientRect(); + var width = outerRect.width; + + try { + if(Services.prefs.getBranch("browser.oldsearch.").getBoolPref("customwidth")) + width = Services.prefs.getBranch("browser.oldsearch.").getIntPref("customwidthvalue"); + } catch(e) {} - var width = 100; - width = isRTL ? Math.round(outerRect.left - outerRect.right) : Math.round(outerRect.right - outerRect.left); popup.setAttribute("width", width > 100 ? width : 100); @@ -441,20 +444,25 @@ if (where == "tab-background") this.focus(); - + // clear input after search - /* - setTimeout(function(){ - textBox.value=""; - },200); - */ - + try { + if(Services.prefs.getBranch("browser.oldsearch.").getBoolPref("clearinput")) { + setTimeout(function(){ + textBox.value=""; + },200); + } + } catch(e) {} + + // revert to default engine after search - /* - Services.search.defaultEngine = Services.search.getVisibleEngines()[0]; - - this.updateDisplay(); - */ + try { + if(Services.prefs.getBranch("browser.oldsearch.").getBoolPref("reverttodefault")) { + Services.search.defaultEngine = Services.search.getVisibleEngines()[0]; + this.updateDisplay(); + } + + } catch(e) {} ]]> @@ -546,7 +554,8 @@ } var popup = this.popup; - if (!popup.mPopupOpen) { + + if (!popup.mPopupOpen) { popup.hidden = false; if(parseInt(Services.appinfo.version)>=60) { @@ -556,31 +565,15 @@ } popup.mInput = this; - popup.selectedIndex = -1; - document.popupNode = null; - const isRTL = getComputedStyle(this, "").direction == "rtl"; - - var outerRect = this.getBoundingClientRect(); - var innerRect = this.inputField.getBoundingClientRect(); - let width = isRTL ? - innerRect.right - outerRect.left : - outerRect.right - innerRect.left; - /*popup.setAttribute("width", width > 100 ? width : 100);*/ - - if(Services.appinfo.OS=="Darwin") { - width = width - 1; // MacOSX - } - - popup.setAttribute("width", outerRect.width); - popup._invalidate(); var y_position = -1; } else { + popup.mInput = this; popup.view = this.controller.QueryInterface(Components.interfaces.nsITreeView); popup.invalidate(); @@ -590,27 +583,23 @@ document.popupNode = null; - var isRTL = getComputedStyle(this, "").direction == "rtl"; - var outerRect = this.getBoundingClientRect(); - var innerRect = this.inputField.getBoundingClientRect(); - - var width = 100; - - width = isRTL ? Math.round(outerRect.left - outerRect.right) : Math.round(outerRect.right - outerRect.left); - - if(Services.appinfo.OS=="Darwin") { - width = width - 1; // MacOSX - } - - popup.setAttribute("width", width > 100 ? width : 100); - var y_position = 0; } - var x_position = outerRect.x - innerRect.x; + var outerRect = this.getBoundingClientRect(); + var innerRect = this.inputField.getBoundingClientRect(); + var width = outerRect.width; + + try { + if(Services.prefs.getBranch("browser.oldsearch.").getBoolPref("customwidth")) + width = Services.prefs.getBranch("browser.oldsearch.").getIntPref("customwidthvalue"); + } catch(e) {} + + popup.setAttribute("width", width > 100 ? width : 100); + + var x_position = outerRect.x - innerRect.x; - popup.openPopup(this.inputField, "after_start", x_position, y_position, false, false); } From 500defed343925c69c3638c54c02ca87f40a3c40 Mon Sep 17 00:00:00 2001 From: Aris Date: Tue, 27 Feb 2018 12:41:15 +0100 Subject: [PATCH 26/47] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 42de3a48..7d486907 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Keep in mind CSS code can not create entirely new items, buttons or toolbars. It **1.** Find your profile folder ('profile names are different for everyone'). `about:support > Profile Folder > Open Folder` or `about:profiles > Root Directory > Open Folder` -or `Shift+F2` to open Firefox's command line, then enter the command `folder openprofile` +or open command line with `Shift+F2` and enter`folder openprofile` **2.** User styles belong into `\chrome\` folder. Create it, if there is none yet. It should look like this afterwards: `\ PROFILE FOLDER NAME \chrome\` From dd0f6042d6b636cbd270cee1513ce9d30e717aaf Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Thu, 1 Mar 2018 17:52:50 +0100 Subject: [PATCH 27/47] 1.7.3 --- classic/css/tabs/classic_squared_tabs.css | 5 +- .../tabs/classic_squared_tabs_australized.css | 5 +- classic/css/tabs/tabs_below_main_content.css | 2 +- .../tabs/tabs_below_navigation_toolbar.css | 2 +- .../screenshots_alternative_save_ui.css | 121 ++++++++++++++++++ .../webcontent/toplevel_image_classic_v1.css | 9 ++ .../webcontent/toplevel_image_classic_v2.css | 9 ++ classic/userChrome.css | 4 +- classic/userContent.css | 3 + classic/xml/oldsearch_fx57.xml | 37 +++--- 10 files changed, 169 insertions(+), 28 deletions(-) create mode 100644 classic/css/webcontent/screenshots_alternative_save_ui.css diff --git a/classic/css/tabs/classic_squared_tabs.css b/classic/css/tabs/classic_squared_tabs.css index e3e8d80c..8b101638 100644 --- a/classic/css/tabs/classic_squared_tabs.css +++ b/classic/css/tabs/classic_squared_tabs.css @@ -28,9 +28,10 @@ --classic_squared_tabs_tab_text_color: black; --classic_squared_tabs_tab_text_shadow: transparent; - --mltabs-newtab-height: calc( var(--classic_squared_tabs_tab_height) + 1px ) !important; - --tab-min-height: var(--classic_squared_tabs_tab_height) !important; + --mltabs-newtab-height: calc( var(--classic_squared_tabs_tab_height) + 1px ) !important; + --tab-min-height_tnot: calc( var(--classic_squared_tabs_tab_height) - 1px ) !important; + --space_below_content: calc( var(--classic_squared_tabs_tab_height) + 1px ) !important; } /* adjust tab toolbars buttons for squared tabs *//* diff --git a/classic/css/tabs/classic_squared_tabs_australized.css b/classic/css/tabs/classic_squared_tabs_australized.css index 458e7b3b..a3fea6d1 100644 --- a/classic/css/tabs/classic_squared_tabs_australized.css +++ b/classic/css/tabs/classic_squared_tabs_australized.css @@ -15,9 +15,10 @@ --classic_squared_tabs-border1: #5f7181; --classic_squared_tabs-border-radius: 3px; - --mltabs-newtab-height: calc( var(--classic_squared_tabs_tab_height) + 1px ); - --tab-min-height: var(--classic_squared_tabs_tab_height) !important; + --mltabs-newtab-height: calc( var(--classic_squared_tabs_tab_height) + 1px ) !important; + --tab-min-height_tnot: calc( var(--classic_squared_tabs_tab_height) - 1px ) !important; + --space_below_content: calc( var(--classic_squared_tabs_tab_height) + 1px ) !important; } /* adjust tab toolbars buttons for squared tabs *//* diff --git a/classic/css/tabs/tabs_below_main_content.css b/classic/css/tabs/tabs_below_main_content.css index c216a788..9115687e 100644 --- a/classic/css/tabs/tabs_below_main_content.css +++ b/classic/css/tabs/tabs_below_main_content.css @@ -10,7 +10,7 @@ @import url(./tabs_below_navigation_toolbar.css); :root { - --space_below_content: calc( var(--tab-min-height) + 1px ); + --space_below_content: 33px; } /* this is an experiment not meant for every day use */ diff --git a/classic/css/tabs/tabs_below_navigation_toolbar.css b/classic/css/tabs/tabs_below_navigation_toolbar.css index d5e45f21..fee17ff9 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar.css @@ -12,7 +12,7 @@ --tabs_toolbar_border-tnot_normal_mode_size: 1px; --tabs_toolbar_border-tnot_normal_mode: var(--tabs-border-color); - --tab-min-height_tnot: calc( var(--tab-min-height) - 1px ); + --tab-min-height_tnot: 31px ; } /* tabs toolbar adjustment */ diff --git a/classic/css/webcontent/screenshots_alternative_save_ui.css b/classic/css/webcontent/screenshots_alternative_save_ui.css new file mode 100644 index 00000000..d476df5a --- /dev/null +++ b/classic/css/webcontent/screenshots_alternative_save_ui.css @@ -0,0 +1,121 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +/* rtl locales flip button boxes direction, so there is no need to use -moz-padding-start etc. */ + +html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download { + width: initial !important; + padding-left: 34px !important; + background-position: 8px center !important; + border: none !important; +} + +html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download img { + margin-bottom: -3px !important; + margin-left: -28px !important; + margin-right: 6px !important; + width: 18px !important; +} + +html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download { + background-color: #1a0 !important; +} + +html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download:hover { + background-color: #2b0 !important; +} + +html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save, +html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save { + background-color: #C00 !important; + color: #C00 !important; + font-size: 0 !important; +} + +html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save:hover, +html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save:hover { + background-color: #D22 !important; +} + +html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { + content: attr(title) !important; + font-weight: bold !important; +} + +html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { + content: "Cloud" !important; + font-size: medium !important; + color: white !important; + font-weight: bold !important; +} + +/* Language settings */ +/* English US*/ +html[dir="ltr"][lang="en-US"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { + content: "Save" !important; +} +html[dir="ltr"][lang="en-US"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="en-US"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { + content: "Upload" !important; +} + +/* German */ +html[dir="ltr"][lang="de"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { + content: "Speichern" !important; +} +html[dir="ltr"][lang="de"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="de"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { + content: "Hochladen" !important; +} + +/* French */ +html[dir="ltr"][lang="fr"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { + content: "Sauvegarder" !important; +} +html[dir="ltr"][lang="fr"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="fr"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { + content: "Télécharger" !important; +} + +/* Spanish */ +html[dir="ltr"][lang="es-ES"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { + content: "Salvar" !important; +} +html[dir="ltr"][lang="es-ES"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="es-ES"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { + content: "Subir" !important; +} + +/* Portuguese */ +html[dir="ltr"][lang="pt-PT"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { + content: "Salve" !important; +} +html[dir="ltr"][lang="pt-PT"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="pt-PT"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { + content: "Envio" !important; +} + +/* Italian */ +html[dir="ltr"][lang="it"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { + content: "Salvare" !important; +} +html[dir="ltr"][lang="it"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="it"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { + content: "Caricare" !important; +} + +/* Russian */ +html[dir="ltr"][lang="ru"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { + content: "Сохранить" !important; +} +html[dir="ltr"][lang="ru"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="ru"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { + content: "Загрузить" !important; +} diff --git a/classic/css/webcontent/toplevel_image_classic_v1.css b/classic/css/webcontent/toplevel_image_classic_v1.css index 8508ac31..0c8fdbb7 100644 --- a/classic/css/webcontent/toplevel_image_classic_v1.css +++ b/classic/css/webcontent/toplevel_image_classic_v1.css @@ -1,3 +1,12 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + @-moz-document regexp("((.*\\.(png|apng|jpg|jpeg|gif|tiff|bmp))|(^data:image\\/.*))(\\?([^#]*))?(#(.*))?") { @media not print { diff --git a/classic/css/webcontent/toplevel_image_classic_v2.css b/classic/css/webcontent/toplevel_image_classic_v2.css index 6df85b42..330af0c2 100644 --- a/classic/css/webcontent/toplevel_image_classic_v2.css +++ b/classic/css/webcontent/toplevel_image_classic_v2.css @@ -1,3 +1,12 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + @media not print { html > head:first-child + body:not([background]):not([background-image]):not([class]):not([style]):not([id]):last-child { diff --git a/classic/userChrome.css b/classic/userChrome.css index 9ba0aa30..4ed85009 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.7.2 ********************************************************************************/ +/* version 1.7.3 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -535,7 +535,7 @@ /* @import url(./css/locationbar/ac_popup_item_title_hidden.css); /**/ /* @import url(./css/locationbar/ac_popup_item_title_visible_on_hover_only.css); /**/ -/* result settings/appearance *******************************************************************/ +/* result menuitem settings/appearance **********************************************************/ /* @import url(./css/locationbar/ac_popup_result_highlighting_aero.css); /**/ /* @import url(./css/locationbar/ac_popup_keysearch_bold.css); /**/ /* @import url(./css/locationbar/ac_popup_keysearch_underline.css); /**/ diff --git a/classic/userContent.css b/classic/userContent.css index 9457a3b6..108e7b14 100644 --- a/classic/userContent.css +++ b/classic/userContent.css @@ -96,6 +96,9 @@ /* @import url(./css/webcontent/toplevel_image_classic_v1.css); /**/ /* @import url(./css/webcontent/toplevel_image_classic_v2.css); /**/ +/* Screenshots - internal add-on ****************************************************************/ +/* @import url(./css/webcontent/screenshots_alternative_save_ui.css); /**/ + /************************************************************************************************/ /************************************************************************************************/ diff --git a/classic/xml/oldsearch_fx57.xml b/classic/xml/oldsearch_fx57.xml index 84eb0e7b..4e7f9f37 100644 --- a/classic/xml/oldsearch_fx57.xml +++ b/classic/xml/oldsearch_fx57.xml @@ -85,7 +85,6 @@ } }, 1000); - } else { Components.utils.reportError("Cannot initialize search service, bailing out: " + aStatus); } @@ -444,25 +443,6 @@ if (where == "tab-background") this.focus(); - - // clear input after search - try { - if(Services.prefs.getBranch("browser.oldsearch.").getBoolPref("clearinput")) { - setTimeout(function(){ - textBox.value=""; - },200); - } - } catch(e) {} - - - // revert to default engine after search - try { - if(Services.prefs.getBranch("browser.oldsearch.").getBoolPref("reverttodefault")) { - Services.search.defaultEngine = Services.search.getVisibleEngines()[0]; - this.updateDisplay(); - } - - } catch(e) {} ]]> @@ -495,6 +475,23 @@ openUILinkIn(submission.uri.spec, aWhere == "tab-background" ? "tab" : aWhere, params); + + + // clear input after search + try { + if(Services.prefs.getBranch("browser.oldsearch.").getBoolPref("clearinput")) { + textBox.value=""; + } + } catch(e) {} + + // revert to default engine after search + try { + if(Services.prefs.getBranch("browser.oldsearch.").getBoolPref("reverttodefault")) { + Services.search.defaultEngine = Services.search.getVisibleEngines()[0]; + this.updateDisplay(); + } + + } catch(e) {} ]]> From c7eea0b68143882f45c4e7cb39fe3cf089c58e60 Mon Sep 17 00:00:00 2001 From: Aris Date: Fri, 2 Mar 2018 19:09:48 +0100 Subject: [PATCH 28/47] Update ISSUE_TEMPLATE --- ISSUE_TEMPLATE | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE index 23a247fd..d8305ddd 100644 --- a/ISSUE_TEMPLATE +++ b/ISSUE_TEMPLATE @@ -3,26 +3,25 @@ SUPPORT AREA for features THIS project provides 1. This is not a 'request' area for new stuff or legacy add-on features. -2. Do not open a new issue about something this project does not offer or to ask 'is this or that possible?' -3. Instead join the discussion thread to talk and ask questions about what is or could be possible there. ---> General discussions, feedback, questions belong here (v2) ---> https://github.com/Aris-t2/CustomCSSforFx/issues/88 -4. Read 'how to report issues properly' before filing a new issue. +2. Read 'how to report issues properly' before posting a new issue. --> https://github.com/Aris-t2/CustomCSSforFx/issues/4 -5. Make sure there are no '@namespace' references anywhere in your code. They cause CSS code not to work. +3. Make sure there are no '@namespace' references anywhere in your code. They cause CSS code not to work in some cases. +4. Do not open a new issue about something this project does not offer. Instead join the 'General discussions, feedback, questions belong here' thread to chat and ask questions about what is or could be possible there. +--> https://github.com/Aris-t2/CustomCSSforFx/issues/109 +5. Use available support threads: +- TABS BELOW CONTENT SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/33 +- MULTIROW TABS SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/39 +- ADD-ON BAR SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/73 +- OLD SEARCH SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/104 Firefox bugs (join general discussion thread to talk about Firefox bugs): - CSS code might not work, if multi-process mode (e10s) is disabled - CSS code might not work on macOS/Linux in userContent.css -Anything releated to multirow tabs, tabs below content or simulated add-on bar should go into: -- TABS BELOW CONTENT SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/33 -- MULTIROW TABS SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/39 -- ADD-ON BAR SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/73 !!! IMPORTANT !!! By submitting a new issue you confirm having read and understood the above and all 'how to report a new issue' instructions. -Invalid issue reports might get closed without further notice to keep this projects support area clean. +Invalid issue reports will get closed without further notice to keep this projects support area clean. Thanks for your understanding. ---------------------------------- From d9839eeb4c4f56bc46e8cc79bb141be75824f2b2 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Sat, 3 Mar 2018 17:11:00 +0100 Subject: [PATCH 29/47] 1.7.4 --- classic/css/tabs/classic_squared_tabs.css | 8 +- classic/css/tabs/tabs_below_main_content.css | 8 ++ .../tabs/tabs_below_navigation_toolbar.css | 10 ++- .../screenshots_alternative_save_ui.css | 79 +++++++++++-------- classic/userChrome.css | 4 +- classic/userContent.css | 2 +- classic/xml/oldsearch_fx57.xml | 9 +++ 7 files changed, 76 insertions(+), 44 deletions(-) diff --git a/classic/css/tabs/classic_squared_tabs.css b/classic/css/tabs/classic_squared_tabs.css index 8b101638..93242571 100644 --- a/classic/css/tabs/classic_squared_tabs.css +++ b/classic/css/tabs/classic_squared_tabs.css @@ -34,13 +34,7 @@ --space_below_content: calc( var(--classic_squared_tabs_tab_height) + 1px ) !important; } -/* adjust tab toolbars buttons for squared tabs *//* -#TabsToolbar #alltabs-button .toolbarbutton-icon, -#TabsToolbar > #new-tab-button .toolbarbutton-icon, -#TabsToolbar > toolbarpaletteitem > #new-tab-button .toolbarbutton-icon { - padding: 3px !important; -} -*/ + /* remove default tab colors */ #TabsToolbar:not(:-moz-lwtheme) .tabbrowser-tab[visuallyselected="true"], #TabsToolbar:not(:-moz-lwtheme) .tabbrowser-tab, diff --git a/classic/css/tabs/tabs_below_main_content.css b/classic/css/tabs/tabs_below_main_content.css index 9115687e..9d5abb70 100644 --- a/classic/css/tabs/tabs_below_main_content.css +++ b/classic/css/tabs/tabs_below_main_content.css @@ -13,6 +13,14 @@ --space_below_content: 33px; } +:root[uidensity=compact] { + --space_below_content: 29px; +} + +:root[uidensity=touch] { + --space_below_content: 41px; +} + /* this is an experiment not meant for every day use */ /* values might need adjustment in many different cases */ diff --git a/classic/css/tabs/tabs_below_navigation_toolbar.css b/classic/css/tabs/tabs_below_navigation_toolbar.css index fee17ff9..099968c8 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar.css @@ -12,7 +12,15 @@ --tabs_toolbar_border-tnot_normal_mode_size: 1px; --tabs_toolbar_border-tnot_normal_mode: var(--tabs-border-color); - --tab-min-height_tnot: 31px ; + --tab-min-height_tnot: 32px; +} + +:root[uidensity=compact] { + --tab-min-height_tnot: 28px; +} + +:root[uidensity=touch] { + --tab-min-height_tnot: 40px; } /* tabs toolbar adjustment */ diff --git a/classic/css/webcontent/screenshots_alternative_save_ui.css b/classic/css/webcontent/screenshots_alternative_save_ui.css index d476df5a..bbf99127 100644 --- a/classic/css/webcontent/screenshots_alternative_save_ui.css +++ b/classic/css/webcontent/screenshots_alternative_save_ui.css @@ -7,49 +7,62 @@ /****************************************************************************************/ -/* rtl locales flip button boxes direction, so there is no need to use -moz-padding-start etc. */ +/* rtl locales flip button boxes direction, so there is no need to use -moz-padding/margin-start/end etc. */ -html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download { +/* Screenshots add-ons add a dir="ltr"/"rtl" to html tag. Using direction tags will cause this code to affect less sites. */ + +html[dir="ltr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download, +html[dir="rtl"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download { width: initial !important; padding-left: 34px !important; background-position: 8px center !important; border: none !important; } -html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download img { +html[dir="ltr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download img, +html[dir="rtl"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download img { margin-bottom: -3px !important; margin-left: -28px !important; margin-right: 6px !important; width: 18px !important; } -html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download { +html[dir="ltr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download, +html[dir="rtl"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download { background-color: #1a0 !important; } -html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download:hover { +html[dir="ltr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download:hover, +html[dir="rtl"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download:hover { background-color: #2b0 !important; } -html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save, -html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save { +html[dir="ltr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save, +html[dir="rtl"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save, +html[dir="ltr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save, +html[dir="rtl"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save { background-color: #C00 !important; color: #C00 !important; font-size: 0 !important; } -html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save:hover, -html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save:hover { +html[dir="ltr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save:hover, +html[dir="rtl"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save:hover, +html[dir="ltr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save:hover, +html[dir="rtl"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save:hover { background-color: #D22 !important; } -html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { +html[dir="ltr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after, +html[dir="rtl"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { content: attr(title) !important; font-weight: bold !important; } -html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, -html body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { +html[dir="ltr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="rtl"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after, +html[dir="rtl"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { content: "Cloud" !important; font-size: medium !important; color: white !important; @@ -58,64 +71,64 @@ html body div.highlight div.highlight-buttons button.highlight-button-cancel + b /* Language settings */ /* English US*/ -html[dir="ltr"][lang="en-US"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { +html[dir="ltr"][lang="en-US"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { content: "Save" !important; } -html[dir="ltr"][lang="en-US"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, -html[dir="ltr"][lang="en-US"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { +html[dir="ltr"][lang="en-US"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="en-US"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { content: "Upload" !important; } /* German */ -html[dir="ltr"][lang="de"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { +html[dir="ltr"][lang="de"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { content: "Speichern" !important; } -html[dir="ltr"][lang="de"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, -html[dir="ltr"][lang="de"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { +html[dir="ltr"][lang="de"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="de"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { content: "Hochladen" !important; } /* French */ -html[dir="ltr"][lang="fr"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { +html[dir="ltr"][lang="fr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { content: "Sauvegarder" !important; } -html[dir="ltr"][lang="fr"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, -html[dir="ltr"][lang="fr"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { +html[dir="ltr"][lang="fr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="fr"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { content: "Télécharger" !important; } /* Spanish */ -html[dir="ltr"][lang="es-ES"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { +html[dir="ltr"][lang="es-ES"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { content: "Salvar" !important; } -html[dir="ltr"][lang="es-ES"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, -html[dir="ltr"][lang="es-ES"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { +html[dir="ltr"][lang="es-ES"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="es-ES"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { content: "Subir" !important; } /* Portuguese */ -html[dir="ltr"][lang="pt-PT"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { +html[dir="ltr"][lang="pt-PT"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { content: "Salve" !important; } -html[dir="ltr"][lang="pt-PT"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, -html[dir="ltr"][lang="pt-PT"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { +html[dir="ltr"][lang="pt-PT"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="pt-PT"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { content: "Envio" !important; } /* Italian */ -html[dir="ltr"][lang="it"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { +html[dir="ltr"][lang="it"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { content: "Salvare" !important; } -html[dir="ltr"][lang="it"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, -html[dir="ltr"][lang="it"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { +html[dir="ltr"][lang="it"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="it"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { content: "Caricare" !important; } /* Russian */ -html[dir="ltr"][lang="ru"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { +html[dir="ltr"][lang="ru"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download::after { content: "Сохранить" !important; } -html[dir="ltr"][lang="ru"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, -html[dir="ltr"][lang="ru"] body div.highlight div.highlight-buttons button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { +html[dir="ltr"][lang="ru"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.preview-button-save::after, +html[dir="ltr"][lang="ru"] > body > div.highlight > div.highlight-buttons > button.highlight-button-cancel + button.highlight-button-copy + button.highlight-button-download + button.highlight-button-save::after { content: "Загрузить" !important; } diff --git a/classic/userChrome.css b/classic/userChrome.css index 4ed85009..bb800e39 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.7.3 ********************************************************************************/ +/* version 1.7.4 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -48,7 +48,7 @@ All options have significant categories and names. Read this file to get an overview. - GENERAL SUPPORT / DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/88 + GENERAL SUPPORT / DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/109 *************************************************************************************************/ diff --git a/classic/userContent.css b/classic/userContent.css index 108e7b14..15e4a046 100644 --- a/classic/userContent.css +++ b/classic/userContent.css @@ -38,7 +38,7 @@ All options have significant categories and names. Read this file to get an overview. - GENERAL SUPPORT / DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/88 + GENERAL SUPPORT / DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/109 *************************************************************************************************/ diff --git a/classic/xml/oldsearch_fx57.xml b/classic/xml/oldsearch_fx57.xml index 4e7f9f37..a891a79c 100644 --- a/classic/xml/oldsearch_fx57.xml +++ b/classic/xml/oldsearch_fx57.xml @@ -90,6 +90,15 @@ } }).bind(this)); + try { + var prefs = Services.prefs.getDefaultBranch("browser.oldsearch."); + + prefs.setBoolPref("clearinput",false); + prefs.setBoolPref("customwidth",false); + prefs.setIntPref("customwidthvalue",300); + prefs.setBoolPref("reverttodefault",false); + } catch(e) {} + ]]> Date: Sun, 4 Mar 2018 14:51:39 +0100 Subject: [PATCH 30/47] 1.7.5 --- ...and_forward_leftclick_history_popup_hidden.css | 12 ++++++++++++ .../css/tabs/tab_title_in_firefox_titlebar.css | 3 +-- .../tab_title_in_firefox_titlebar_centered.css | 15 +++++++++++++++ classic/userChrome.css | 4 +++- 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 classic/css/buttons/back_and_forward_leftclick_history_popup_hidden.css create mode 100644 classic/css/tabs/tab_title_in_firefox_titlebar_centered.css diff --git a/classic/css/buttons/back_and_forward_leftclick_history_popup_hidden.css b/classic/css/buttons/back_and_forward_leftclick_history_popup_hidden.css new file mode 100644 index 00000000..ec838fff --- /dev/null +++ b/classic/css/buttons/back_and_forward_leftclick_history_popup_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 (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +#nav-bar :-moz-any(#back-button, #forward-button) > menupopup { + display: none !important; +} diff --git a/classic/css/tabs/tab_title_in_firefox_titlebar.css b/classic/css/tabs/tab_title_in_firefox_titlebar.css index 388ddce8..51e2a99f 100644 --- a/classic/css/tabs/tab_title_in_firefox_titlebar.css +++ b/classic/css/tabs/tab_title_in_firefox_titlebar.css @@ -68,8 +68,7 @@ font-weight: bold !important; text-shadow: rgba(255,255,255,0.99) 3px -1px 6px, rgba(255,255,255,0.5) 5px -1px 9px, rgba(255,255,255,0.99) -3px -1px 6px, rgba(255,255,255,0.5) -5px -1px 9px !important; - /*white-space: nowrap !important;*/ - + max-width: calc(100vw - 250px) !important; } #main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar][sizemode="maximized"]::after { diff --git a/classic/css/tabs/tab_title_in_firefox_titlebar_centered.css b/classic/css/tabs/tab_title_in_firefox_titlebar_centered.css new file mode 100644 index 00000000..d5eee2a5 --- /dev/null +++ b/classic/css/tabs/tab_title_in_firefox_titlebar_centered.css @@ -0,0 +1,15 @@ +/*AGENT_SHEET*/ + +/* Firefox 57+ userChrome.css tweaks ****************************************************/ +/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ +/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +#main-window:not([inFullscreen]):not([inDOMFullscreen="true"])[tabsintitlebar]::after { + max-width: unset !important; + left: 0 !important; + right: 0 !important; + text-align: center !important; +} diff --git a/classic/userChrome.css b/classic/userChrome.css index bb800e39..06924ba0 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.7.4 ********************************************************************************/ +/* version 1.7.5 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -131,6 +131,7 @@ /* other button settings ************************************************************************/ /* @import url(./css/buttons/forward_button_hide_when_disabled.css); /**/ /* @import url(./css/buttons/back_and_forward_separated_history_popups.css); /**/ +/* @import url(./css/buttons/back_and_forward_leftclick_history_popup_hidden.css); /**/ /* @import url(./css/buttons/zoom_buttons_hide_reset.css); /**/ /* CUSTOM BACK & FORWARD BUTTONS appearance - only use one at a time ****************************/ @@ -285,6 +286,7 @@ /* [!] some internal pages only show default browser title **************************************/ /* [!] might not always work correctly **********************************************************/ /* @import url(./css/tabs/tab_title_in_firefox_titlebar.css); /**/ /* <--- EXPERIMENTAL */ +/* @import url(./css/tabs/tab_title_in_firefox_titlebar_centered.css); /**/ /* <--- EXPERIMENTAL */ /* restore empty/missing tab favicon - only use one at a time ***********************************/ @import url(./css/tabs/missing_tab_favicon_restored_default.css); /**/ From da363313ef445eeffe693302806d139351ce9e5b Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Thu, 8 Mar 2018 10:09:48 +0100 Subject: [PATCH 31/47] 1.7.6 --- .../custom_tab_text_settings.css} | 0 ...appbutton_popup_panelarrow_hidden_fx57.css | 4 +++ .../tabs/tabs_below_navigation_toolbar.css | 10 ++++++- .../css/toolbars/tabs_toolbar_adjustments.css | 2 +- ...icons_and_text_and_text_only_macOS_fix.css | 28 +++++++++++++++++++ classic/userChrome.css | 6 ++-- 6 files changed, 46 insertions(+), 4 deletions(-) rename classic/{css/tabs/custom_text_settings.css => config/custom_tab_text_settings.css} (100%) create mode 100644 classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_macOS_fix.css diff --git a/classic/css/tabs/custom_text_settings.css b/classic/config/custom_tab_text_settings.css similarity index 100% rename from classic/css/tabs/custom_text_settings.css rename to classic/config/custom_tab_text_settings.css diff --git a/classic/css/buttons/appbutton_popup_panelarrow_hidden_fx57.css b/classic/css/buttons/appbutton_popup_panelarrow_hidden_fx57.css index 6a9ba455..82589c6a 100644 --- a/classic/css/buttons/appbutton_popup_panelarrow_hidden_fx57.css +++ b/classic/css/buttons/appbutton_popup_panelarrow_hidden_fx57.css @@ -16,3 +16,7 @@ -moz-margin-end: -205px !important; margin-top: -2px !important; } + +#main-window[tabsintitlebar] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) { + border-radius: 0 0 0 0 !important; +} diff --git a/classic/css/tabs/tabs_below_navigation_toolbar.css b/classic/css/tabs/tabs_below_navigation_toolbar.css index 099968c8..0905fffd 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar.css @@ -11,7 +11,8 @@ --tabs_toolbar_color_tabs_not_on_top: linear-gradient(#f9f9fa,#f9f9fa); --tabs_toolbar_border-tnot_normal_mode_size: 1px; --tabs_toolbar_border-tnot_normal_mode: var(--tabs-border-color); - + --classic_squared_tabs_tab_text_color: black; + --classic_squared_tabs_tab_text_shadow: transparent; --tab-min-height_tnot: 32px; } @@ -315,3 +316,10 @@ } } + +/* black tab text color */ +#TabsToolbar:not(:-moz-lwtheme) .tabbrowser-tab { + color: var(--classic_squared_tabs_tab_text_color) !important; + text-shadow: 1px 1px 1px var(--classic_squared_tabs_tab_text_shadow) !important; +} + diff --git a/classic/css/toolbars/tabs_toolbar_adjustments.css b/classic/css/toolbars/tabs_toolbar_adjustments.css index 1cc97675..d1ef48ec 100644 --- a/classic/css/toolbars/tabs_toolbar_adjustments.css +++ b/classic/css/toolbars/tabs_toolbar_adjustments.css @@ -20,7 +20,7 @@ -moz-margin-start: 2px !important; } -/* tab toolbar postion */ +/* tab toolbar position */ #TabsToolbar{ padding-right: 2px !important; padding-left: 2px !important; diff --git a/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_macOS_fix.css b/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_macOS_fix.css new file mode 100644 index 00000000..cadd9970 --- /dev/null +++ b/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_macOS_fix.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 (aris-addons@gmx.net)*********************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ + + +/* fix for macOS */ +toolbar:not(#TabsToolbar) toolbaritem .toolbarbutton-1, +toolbar:not(#TabsToolbar) .toolbarbutton-1, +toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton{ + -moz-appearance: none !important; +} + +toolbar:not(#TabsToolbar) toolbaritem .toolbarbutton-1:hover, +toolbar:not(#TabsToolbar) .toolbarbutton-1:hover, +toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton:hover{ + background: var(--toolbarbutton-hover-background,hsla(0,0%,70%,.4)) !important; + border-radius: 4px !important; +} + +toolbar:not(#TabsToolbar) toolbaritem .toolbarbutton-1:-moz-any([open],[checked],:hover:active,:active), +toolbar:not(#TabsToolbar) .toolbarbutton-1:-moz-any([open],[checked],:hover:active,:active), +toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] toolbarbutton:-moz-any([open],[checked],:hover:active,:active){ + background: var(--toolbarbutton-active-background,hsla(0,0%,70%,.6)) !important; +} diff --git a/classic/userChrome.css b/classic/userChrome.css index 06924ba0..dc4e5d98 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.7.5 ********************************************************************************/ +/* version 1.7.6 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -271,7 +271,7 @@ /* TAB TEXT colors/shadow/weight/style for default/active/hovered/unread/unloaded tabs **********/ /* edit target file to set own custom colors ****************************************************/ -/* @import url(./css/tabs/custom_text_settings.css); /**/ +/* @import url(./config/custom_tab_text_settings.css); /**/ /* MULTIROW / multi lined tabs - only use one at a time *****************************************/ /* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/39 ************************/ @@ -474,6 +474,8 @@ /* TOOLBAR TEXT MODES - only use one at a time **************************************************/ /* @import url(./css/toolbars/toolbar_mode_icons_and_text.css); /**/ /* @import url(./css/toolbars/toolbar_mode_text.css); /**/ +/* FIX FOR macOS / alternative appearance for Linux *********************************************/ +/* @import url(./css/toolbars/toolbar_mode_icons_and_text_and_text_only_macOS_fix.css); /**/ /* <-- macOS fix */ /* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ /* @import url(./css/toolbars/toolbar_mode_icons_and_text_and_text_only_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ From cc5d4d55ba66d4388d2451b3c1fe6549f9cc0d0e Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Thu, 15 Mar 2018 11:44:06 +0100 Subject: [PATCH 32/47] 1.7.7 --- classic/config/general_variables.css | 5 +- .../preferences_alternative_appearance.css | 3 +- .../preferences_alternative_appearance_v2.css | 1 + .../appbutton_in_titlebar_fx58_fix.css | 11 ---- ...tton_popup_classic_appearance_fx58_fix.css | 19 ------ ...olbar_old_size_and_appearance_fx58_fix.css | 31 --------- ...labels_with_and_without_icons_fx58_fix.css | 13 ---- .../ac_popup_custom_height.css} | 19 +++--- ...opup_searchwith_and_visit_items_hidden.css | 25 ++++++- .../tabs/classic_squared_tabs_fx58_fix.css | 13 ---- .../tabs/custom_colors_for_squared_tabs.css | 5 +- ...om_colors_for_squared_tabs_australized.css | 5 +- ...elow_navigation_toolbar_fx58_fix_win10.css | 15 ----- ...on_toolbar_fx58_fix_win7_classic_theme.css | 44 ------------- ...on_toolbar_fx58_fix_win7_default_theme.css | 12 ---- ..._icons_and_text_and_text_only_fx58_fix.css | 18 ----- classic/userChrome.css | 66 +++++++------------ 17 files changed, 67 insertions(+), 238 deletions(-) delete mode 100644 classic/css/buttons/appbutton_in_titlebar_fx58_fix.css delete mode 100644 classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css delete mode 100644 classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance_fx58_fix.css delete mode 100644 classic/css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css rename classic/css/{generalui/findbar_on_top_fx58_fix.css => locationbar/ac_popup_custom_height.css} (54%) delete mode 100644 classic/css/tabs/classic_squared_tabs_fx58_fix.css delete mode 100644 classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css delete mode 100644 classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css delete mode 100644 classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.css delete mode 100644 classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_fx58_fix.css diff --git a/classic/config/general_variables.css b/classic/config/general_variables.css index 850d0623..075399c6 100644 --- a/classic/config/general_variables.css +++ b/classic/config/general_variables.css @@ -40,5 +40,8 @@ --bookmark_items_lines: 3 !important; /* <- maximum amount of lines */ /* for increase_ui_font_size.css */ - --general_ui_font_size: 12pt !important; + --general_ui_font_size: 12pt !important; + + /* for ac_popup_custom_height.css */ + --ac_popup_max_height: 300px !important; } \ No newline at end of file diff --git a/classic/css/aboutpreferences/preferences_alternative_appearance.css b/classic/css/aboutpreferences/preferences_alternative_appearance.css index 97963f1c..7283aa7f 100644 --- a/classic/css/aboutpreferences/preferences_alternative_appearance.css +++ b/classic/css/aboutpreferences/preferences_alternative_appearance.css @@ -20,12 +20,13 @@ #categories { background: transparent !important; } - + .groupbox-body, #dialogFrame{ background-color: white !important; } + .sticky-container, .search-container { background: transparent !important; position: absolute !important; diff --git a/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css b/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css index f4094d03..4b8bd87e 100644 --- a/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css +++ b/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css @@ -37,6 +37,7 @@ margin: 2px !important; } + .sticky-container, .search-container { background: transparent !important; position: absolute !important; diff --git a/classic/css/buttons/appbutton_in_titlebar_fx58_fix.css b/classic/css/buttons/appbutton_in_titlebar_fx58_fix.css deleted file mode 100644 index 8adf7c84..00000000 --- a/classic/css/buttons/appbutton_in_titlebar_fx58_fix.css +++ /dev/null @@ -1,11 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - -#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar:-moz-any([autohide="true"],[autohide="false"]) ~ #nav-bar #PanelUI-button { - top: 2px !important; -} diff --git a/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css b/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css deleted file mode 100644 index 81a0e157..00000000 --- a/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css +++ /dev/null @@ -1,19 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - -#BMB_bookmarksPopup menupopup, -#BMB_bookmarksPopup .panel-arrowcontent { - background: -moz-Dialog !important; -} -#BMB_bookmarksPopup .menu-iconic-left { - -moz-margin-start: 3px !important; - -moz-margin-end: 3px !important; -} -#BMB_bookmarksPopup :-moz-any(menu,menuitem):-moz-any(:hover,:active) { - color: HighlightText !important; -} diff --git a/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance_fx58_fix.css b/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance_fx58_fix.css deleted file mode 100644 index 74278e30..00000000 --- a/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance_fx58_fix.css +++ /dev/null @@ -1,31 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - - -#PersonalToolbar toolbarbutton, -#PlacesToolbar toolbarbutton { - -moz-appearance: toolbarbutton !important; - background: unset !important; - box-shadow: unset !important; - padding-left: 3px !important; - padding-right: 3px !important; - margin-left: 0px !important; - margin-right: 0px !important; -} - -#PersonalToolbar .toolbarbutton-badge-stack, -#PersonalToolbar toolbarbutton .toolbarbutton-icon { - background: unset !important; - box-shadow: unset !important; -} - -#PersonalToolbar toolbarbutton .toolbarbutton-icon { - padding-left: 0px !important; - padding-right: 0px !important; - width: 16px !important; -} diff --git a/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css deleted file mode 100644 index 9e2eda88..00000000 --- a/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css +++ /dev/null @@ -1,13 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - - -:-moz-any(#context-back,#context-forward,#context-reload,#context-stop,#context-bookmarkpage) image { - -moz-margin-start: 0px !important; - -moz-margin-end: 2px !important; -} diff --git a/classic/css/generalui/findbar_on_top_fx58_fix.css b/classic/css/locationbar/ac_popup_custom_height.css similarity index 54% rename from classic/css/generalui/findbar_on_top_fx58_fix.css rename to classic/css/locationbar/ac_popup_custom_height.css index b6ed0825..c6039f5a 100644 --- a/classic/css/generalui/findbar_on_top_fx58_fix.css +++ b/classic/css/locationbar/ac_popup_custom_height.css @@ -7,18 +7,17 @@ /****************************************************************************************/ -:-moz-any(.browserContainer, #viewSource) .findbar-closebutton { - position: relative !important; - top: 4px !important; +/* Set a custom amount of results: about:config > browser.urlbar.maxRichResults *********/ + +:root { + --ac_popup_max_height: 300px; } -:-moz-any(.browserContainer,#viewSource) .findbar-button { - -moz-appearance: toolbarbutton !important; - background: unset !important; - box-shadow: unset !important; +#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox { + max-height: var(--ac_popup_max_height) !important; + height: auto !important; } -.browserContainer findbar toolbarbutton * { - background: unset !important; - box-shadow: unset !important; +#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] scrollbox{ + overflow-y: auto !important; } diff --git a/classic/css/locationbar/ac_popup_searchwith_and_visit_items_hidden.css b/classic/css/locationbar/ac_popup_searchwith_and_visit_items_hidden.css index f58a926f..1041d3ba 100644 --- a/classic/css/locationbar/ac_popup_searchwith_and_visit_items_hidden.css +++ b/classic/css/locationbar/ac_popup_searchwith_and_visit_items_hidden.css @@ -7,22 +7,43 @@ /****************************************************************************************/ -/* To hide seach engines at popups bottom open 'about:config' and set ************ +/* To hide search engines at popups bottom open 'about:config' and set ************ ** browser.urlbar.oneOffSearches to 'false' ************************************** ** The popup won't be hidden completely, if no result items are present.********** ** A small 'line' will be still visible ****************************************** *********************************************************************************/ /* Hide "Visit/Search" items */ + +/* this creates an empty space at items place *//* #PopupAutoCompleteRichResult richlistitem:first-of-type:-moz-any([type*="heuristic"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="keyword"],[actiontype="switchtab"]), #PopupAutoCompleteRichResult richlistitem:-moz-any([type*="heuristic"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="keyword"],[actiontype="switchtab"]), #PopupAutoCompleteRichResult richlistitem[anonid="type-icon-spacer"] { display: none !important; -} +}*/ #PopupAutoCompleteRichResult .autocomplete-richlistbox { min-height: 0 !important; height: auto !important; } +#PopupAutoCompleteRichResult richlistitem:first-of-type:-moz-any([type*="heuristic"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="keyword"],[actiontype="switchtab"]), +#PopupAutoCompleteRichResult richlistitem:-moz-any([type*="heuristic"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="keyword"],[actiontype="switchtab"]), +#PopupAutoCompleteRichResult richlistitem[anonid="type-icon-spacer"], +#PopupAutoCompleteRichResult richlistitem:first-of-type[actiontype="visiturl"] + richlistitem[actiontype="searchengine"], +#PopupAutoCompleteRichResult richlistitem:first-of-type:last-of-type[actiontype="searchengine"] { + z-index: -1000000000 !important; + position: fixed !important; + opacity: 0 !important; + visibility: collapse !important; + min-height: 0 !important; + height: 0 !important; + max-height: 0 !important; +} + +#PopupAutoCompleteRichResult richlistitem:not([collapsed="true"]) + richlistitem:-moz-any([type*="heuristic"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="keyword"],[actiontype="switchtab"]), +#PopupAutoCompleteRichResult richlistitem:-moz-any([type*="heuristic"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="keyword"],[actiontype="switchtab"]) + richlistitem:-moz-any([type*="heuristic"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="keyword"],[actiontype="switchtab"]) { + display: none !important; +} + /**/ diff --git a/classic/css/tabs/classic_squared_tabs_fx58_fix.css b/classic/css/tabs/classic_squared_tabs_fx58_fix.css deleted file mode 100644 index 0502424a..00000000 --- a/classic/css/tabs/classic_squared_tabs_fx58_fix.css +++ /dev/null @@ -1,13 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - - -.titlebar-button { - padding-top: 7px !important; - padding-bottom: 7px !important; -} diff --git a/classic/css/tabs/custom_colors_for_squared_tabs.css b/classic/css/tabs/custom_colors_for_squared_tabs.css index f302e3dc..44b49f20 100644 --- a/classic/css/tabs/custom_colors_for_squared_tabs.css +++ b/classic/css/tabs/custom_colors_for_squared_tabs.css @@ -15,8 +15,9 @@ background: linear-gradient(to bottom,#FF8800,#FFCC99) !important; } /* background color on toolbars */ -#main-window :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar), -#main-window * #navigator-toolbox toolbar:not(#TabsToolbar):not(#toolbar-menubar) { +#main-window #appcontent :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar), +#main-window #navigator-toolbox toolbar:not(#TabsToolbar):not(#toolbar-menubar) { + -moz-appearance: none !important; background: linear-gradient(to bottom,#FFCC99,#FFCC99) !important; } diff --git a/classic/css/tabs/custom_colors_for_squared_tabs_australized.css b/classic/css/tabs/custom_colors_for_squared_tabs_australized.css index 93e718be..3de9bc1a 100644 --- a/classic/css/tabs/custom_colors_for_squared_tabs_australized.css +++ b/classic/css/tabs/custom_colors_for_squared_tabs_australized.css @@ -15,8 +15,9 @@ background: linear-gradient(to bottom,#FF8800,#FFCC99) !important; } /* background color on toolbars */ -#main-window :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar), -#main-window * #navigator-toolbox toolbar:not(#TabsToolbar):not(#toolbar-menubar) { +#main-window #appcontent :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar), +#main-window #navigator-toolbox toolbar:not(#TabsToolbar):not(#toolbar-menubar) { + -moz-appearance: none !important; background: linear-gradient(to bottom,#FFCC99,#FFCC99) !important; } diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css b/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css deleted file mode 100644 index 6f9f1118..00000000 --- a/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css +++ /dev/null @@ -1,15 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - - -#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] { - margin-top: 30px !important; -} -#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] { - margin-top: 30px !important; -} diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css b/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css deleted file mode 100644 index 4423963c..00000000 --- a/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css +++ /dev/null @@ -1,44 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - - -/* tweaks for Windows Classic theme */ -#nav-bar:not(:-moz-lwtheme), -#PersonalToolbar:not(:-moz-lwtheme), -#main-window:not([tabsintitlebar]) #TabsToolbar:not(:-moz-lwtheme) { - border-left: unset !important; - border-right: unset !important; - background: unset !important; -} - -#main-window[sizemode="normal"] #navigator-toolbox :-moz-any(#nav-bar,#PersonalToolbar,#TabsToolbar) { - border-left: 0px !important; - border-right: 0px !important; -} - -#main-window:not([tabsintitlebar]) #toolbar-menubar:not(:-moz-lwtheme) { - background: unset !important; - box-shadow: unset !important; - border-bottom: unset !important; -} - -#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #navigator-toolbox, -#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #nav-bar, -#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #navigator-toolbox::before, -#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #nav-bar::before, -#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #navigator-toolbox::after, -#main-window:not([tabsintitlebar]):not(:-moz-lwtheme) #nav-bar::after { - background: unset !important; - box-shadow: unset !important; - border: unset !important; - border-image: unset !important; -} - -#main-window:not([tabsintitlebar]) toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) { - background: unset !important; -} diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.css b/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.css deleted file mode 100644 index 762c2e18..00000000 --- a/classic/css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.css +++ /dev/null @@ -1,12 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - - -.tabbrowser-tab:not([selected]) { - color: #ffffff !important; -} diff --git a/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_fx58_fix.css b/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_fx58_fix.css deleted file mode 100644 index 4534806b..00000000 --- a/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_fx58_fix.css +++ /dev/null @@ -1,18 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - - -/* tweaks for Windows Classic theme */ -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; -} diff --git a/classic/userChrome.css b/classic/userChrome.css index dc4e5d98..2478f6c4 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -8,7 +8,7 @@ /************************************************************************************************/ /* Custom CSS for Firefox ***********************************************************************/ -/* version 1.7.6 ********************************************************************************/ +/* version 1.7.7 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -32,11 +32,6 @@ - some '@import' features might not work properly, if multi-process mode (e10s) is disabled - in both cases CSS code has to be added to userChrome.css file manually - FIREFOX 58 BUG: bugzilla.mozilla.org/show_bug.cgi?id=1431933 - - DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/101 - - some @media rules get ignored -> temporal fixes required - - look for TEMPORAL FIX FOR FIREFOX 58 or TEMPORAL FX58 fix additions - MACOS issues / glitches / fixes -> look for 'macOS fix' - tabs toolbar spaces in 'toolbars' category - tabs not on top mode in 'tabs toolbar position' category @@ -110,8 +105,6 @@ /* bookmarks toolbar - buttons appearance - only use one at a time ******************************/ /* old bookmarks toolbar button appearance ******************************************************/ @import url(./css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance.css); /**/ -/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS DEFAULT OS THEME ***************************************/ -/* @import url(./css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* @import url(./css/buttons/buttons_on_bookmarks_toolbar_classic_appearance.css); /**/ /* @import url(./css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items.css); /**/ @@ -122,8 +115,6 @@ /* @import url(./css/buttons/bookmarks_menu_button_popup_other_item_hidden.css); /**/ /* popup appearance *****************************************************************************/ @import url(./css/buttons/bookmarks_menu_button_popup_classic_appearance.css); /**/ -/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ -/* @import url(./css/buttons/bookmarks_menu_button_popup_classic_appearance_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* menubar - toolbar button appearance **********************************************************/ /* @import url(./css/buttons/buttons_on_menubar_toolbar_classic_appearance.css); /**/ @@ -195,7 +186,7 @@ /************************************************************************************************/ -/* button in Firefox titlebar - if menubar is disabled (Windows only) ***************************/ +/* button in Firefox titlebar *******************************************************************/ /************************************************************************************************/ /* button in titlebar - only use one at a time **************************************************/ @@ -209,9 +200,6 @@ /* @import url(./css/buttons/appbutton_in_titlebar_label_and_icon_grey.css); /**/ /* @import url(./css/buttons/appbutton_in_titlebar_label_and_icon_browser_logo.css); /**/ -/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ -/* @import url(./css/buttons/appbutton_in_titlebar_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ - /* button color - only use one at a time ********************************************************/ @import url(./css/buttons/appbutton_in_titlebar_autocolor.css); /**/ /* @import url(./css/buttons/appbutton_in_titlebar_autocolor57p.css); /**/ @@ -231,8 +219,6 @@ /* custom tab appearance - only use one at a time ***********************************************/ @import url(./css/tabs/classic_squared_tabs.css); /**/ /* @import url(./css/tabs/classic_squared_tabs_australized.css); /**/ -/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS 10 *****************************************************/ -/* @import url(./css/tabs/classic_squared_tabs_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* custom tab colors for default/active/hovered/unread/unloaded tabs ****************************/ /* only use one at a time - edit target file to set own custom colors ***************************/ @@ -253,17 +239,11 @@ /* @import url(./css/tabs/tabs_below_navigation_toolbar.css); /**/ /* <-- tabs not on top */ /* @import url(./css/tabs/tabs_below_navigation_toolbar_macOS_fix.css); /**/ /* <-- macOS fix */ /* - TABS BELOW MAIN CONTENT (tabs on bottom) - EXPERIMENTAL ************************************/ -/* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/33 ************************/ +/* [!] SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/33 **********************/ +/* [!] not compatible to 'tabs toolbar - multiple tab lines' option *****************************/ +/* [!] not compatible to 'toolbars - add-on bar (simulated add-on bar)' option ******************/ /* @import url(./css/tabs/tabs_below_main_content.css); /**/ /* <--- EXPERIMENTAL */ -/* TEMPORAL FIX FOR FIREFOX 58 & TABS BELOW NAVIGATION TOOLBAR and MAIN CONTENT *****************/ -/* - for Windows 7s default theme ***************************************************************/ -/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_default_theme.css); /**/ /* <-- TEMPORAL FX58 fix */ -/* - for Windows 7s classic theme ***************************************************************/ -/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win7_classic_theme.css); /**/ /* <-- TEMPORAL FX58 fix */ -/* - for Windows 10 *****************************************************************************/ -/* @import url(./css/tabs/tabs_below_navigation_toolbar_fx58_fix_win10.css); /**/ /* <-- TEMPORAL FX58 fix */ -/************************************************************************************************/ -/* - MOVE NAVIGATION TOOLBAR UP TO HIGHER POSITON (tabs not on top) - only use one at a time ****/ +/* - MOVE NAVIGATION TOOLBAR TO HIGHER POSITON (tabs not on top) - only use one at a time *******/ /* @import url(./css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon.css); /**/ /* <--- EXPERIMENTAL */ /* @import url(./css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton.css); /**/ /* <--- EXPERIMENTAL */ /* @import url(./css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton_icon_only.css); /**/ /* <--- EXPERIMENTAL */ @@ -274,19 +254,20 @@ /* @import url(./config/custom_tab_text_settings.css); /**/ /* MULTIROW / multi lined tabs - only use one at a time *****************************************/ -/* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/39 ************************/ -/* - BUG: dragging tabs does not work properly with multi lined tabs ****************************/ -/* - for v1 see https://00.bulog.jp/archives/1476 ***********************************************/ -/* - for v2 see https://www.reddit.com/r/FirefoxCSS/comments/7dclp7/multirow_tabs_in_ff57/ ******/ +/* [!] SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/39 ************************/ +/* [!] BUG: dragging tabs does not work properly with multi lined tabs ****************************/ +/* [!] for v1 see https://00.bulog.jp/archives/1476 ***********************************************/ +/* [!] for v2 see https://www.reddit.com/r/FirefoxCSS/comments/7dclp7/multirow_tabs_in_ff57/ ******/ /* Recommendation: use v2 instead of v1. v1 has too many issues and glitches ********************/ +/* [!] not compatible to 'tabs toolbar - below main content' option *****************************/ /* @import url(./css/tabs/tabs_multiple_lines.css); /**/ /* <--- EXPERIMENTAL */ /* @import url(./css/tabs/tabs_multiple_lines_v2.css); /**/ /* <--- EXPERIMENTAL */ /* TAB TITLE IN FIREFOX TITLEBAR (Windows only) *************************************************/ /* [!] some internal pages only show default browser title **************************************/ /* [!] might not always work correctly **********************************************************/ -/* @import url(./css/tabs/tab_title_in_firefox_titlebar.css); /**/ /* <--- EXPERIMENTAL */ -/* @import url(./css/tabs/tab_title_in_firefox_titlebar_centered.css); /**/ /* <--- EXPERIMENTAL */ +/* @import url(./css/tabs/tab_title_in_firefox_titlebar.css); /**/ +/* @import url(./css/tabs/tab_title_in_firefox_titlebar_centered.css); /**/ /* restore empty/missing tab favicon - only use one at a time ***********************************/ @import url(./css/tabs/missing_tab_favicon_restored_default.css); /**/ @@ -362,8 +343,6 @@ /* findbar **************************************************************************************/ /* @import url(./css/generalui/findbar_on_top.css); /**/ -/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS DEFAULT OS THEME ***************************************/ -/* @import url(./css/generalui/findbar_on_top_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* @import url(./css/generalui/findbar_show_full_quickfindbar.css); /**/ /* findbar - close icon position - only use one at a time ***************************************/ /* @import url(./css/generalui/findbar_on_top_close_at_findbars_start.css); /**/ @@ -376,8 +355,6 @@ /* @import url(./css/generalui/context_bfrsb_labels_with_icons.css); /**/ /* @import url(./css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOS.css); /**/ /* <-- Lin/macOS fix v1 */ /* @import url(./css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOSv2.css); /**/ /* <-- Lin/macOS fix v2 */ -/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ -/* @import url(./css/generalui/context_bfrsb_labels_with_and_without_icons_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /* close icons for general ui and tabs - only use one at a time *********************************/ /* @import url(./css/generalui/close_icon_windows7.css); /**/ @@ -410,8 +387,8 @@ /* [!] 'about:config > browser.oldsearch.reverttodefault': revert to first engine after search **/ /* [!] Shift + click on search glass: search opens in a new window ******************************/ /* [!] Ctrl/Cmd + click on search glass: search opens in a new tab ******************************/ -/* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/104 ***********************/ -/* @import url(./css/generalui/oldsearch.css); /**/ /* <--- EXPERIMENTAL */ +/* [!] SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/104 *********************/ +/* @import url(./css/generalui/oldsearch.css); /**/ /* MENUBARS bookmarks popup (not compatible to macOS/Linux) *************************************/ /* @import url(./css/generalui/menubar_bookmarks_popup_bookmark_page_item_hidden.css); /**/ @@ -429,7 +406,7 @@ /* [!] not compatible to 'bookmarks toolbar - multiple lines' option ****************************/ /* [!] not compatible to 'tabs toolbar - below main content' option *****************************/ /* [!] not compatible to 'bookmarks toolbar autohide' option ************************************/ -/* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/73 ************************/ +/* [!] SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/73 **********************/ /* @import url(./css/toolbars/addonbar_move_bookmarks_toolbar_to_bottom.css); /**/ /* <--- EXPERIMENTAL */ /* @import url(./css/toolbars/addonbar_status_in_addonbar.css); /**/ /* <--- EXPERIMENTAL */ /* @import url(./css/toolbars/addonbar_content_on_the_right.css); /**/ /* <--- EXPERIMENTAL */ @@ -458,7 +435,7 @@ /* BOOKMARKS TOOLBAR - MULTIPLE LINES ***********************************************************/ /* [!] the amount of visible bookmark items is limited internally to ~90-110 bookmarks **********/ /* [!] not compatible to 'bookmarks toolbar autohide' option ************************************/ -/* - SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/99 ************************/ +/* [!] SUPPORT THREAD: https://github.com/aris-t2/customcssforfx/issues/99 **********************/ /* @import url(./css/toolbars/bookmarks_toolbar_multiple_lines.css); /**/ /* <--- EXPERIMENTAL */ /* TOOLBAR COLORS *******************************************************************************/ @@ -474,10 +451,8 @@ /* TOOLBAR TEXT MODES - only use one at a time **************************************************/ /* @import url(./css/toolbars/toolbar_mode_icons_and_text.css); /**/ /* @import url(./css/toolbars/toolbar_mode_text.css); /**/ -/* FIX FOR macOS / alternative appearance for Linux *********************************************/ +/* [!] FIX FOR macOS / alternative appearance for Linux *****************************************/ /* @import url(./css/toolbars/toolbar_mode_icons_and_text_and_text_only_macOS_fix.css); /**/ /* <-- macOS fix */ -/* TEMPORAL FIX FOR FIREFOX 58 & WINDOWS CLASSIC OS THEME ***************************************/ -/* @import url(./css/toolbars/toolbar_mode_icons_and_text_and_text_only_fx58_fix.css); /**/ /* <-- TEMPORAL FX58 fix */ /************************************************************************************************/ @@ -544,11 +519,14 @@ /* @import url(./css/locationbar/ac_popup_keysearch_bold.css); /**/ /* @import url(./css/locationbar/ac_popup_keysearch_underline.css); /**/ /* @import url(./css/locationbar/ac_popup_result_separator.css); /**/ +/* custom amount of result items: about:config > browser.urlbar.maxRichResults ******************/ +/* @import url(./css/locationbar/ac_popup_custom_height.css); /**/ /* hide 'Search with...' and 'Visit...' results *************************************************/ /* - browser preferences: disable 'show search suggestions inside address bar results' **********/ /* - hide bottom search engines: about:config > browser.urlbar.oneOffSearches > false ***********/ -/* @import url(./css/locationbar/ac_popup_searchwith_and_visit_items_hidden.css); /**/ +/* [!] Hiding will not work properly for all cases. An empty box will sometimes be visible ******/ +/* @import url(./css/locationbar/ac_popup_searchwith_and_visit_items_hidden.css); /**/ /* <--- EXPERIMENTAL */ /************************************************************************************************/ From 02c8659d8acead23c8ad69113d75bd15c86610e7 Mon Sep 17 00:00:00 2001 From: Aris Date: Thu, 15 Mar 2018 11:47:28 +0100 Subject: [PATCH 33/47] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7d486907..c987bc82 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -## Download +## Downloads for Firefox Photon (57+) -**[Classic Theme Restorer / Classic Toolbar Buttons / GlassMyFox CSS tweaks for Firefox 57+](https://github.com/Aris-t2/CustomCSSforFx/issues/2)** -**[NoiaButtons CSS tweaks for Firefox 57+](https://github.com/Aris-t2/CustomCSSforFx/releases/tag/NoiaButtons)** -**[Custom Scrollbars for Firefox 57+](https://github.com/Aris-t2/Scrollbars)** +**[Classic Theme Restorer / Classic Toolbar Buttons / GlassMyFox CSS tweaks](https://github.com/Aris-t2/CustomCSSforFx/issues/2)** +**[NoiaButtons CSS tweaks](https://github.com/Aris-t2/CustomCSSforFx/releases/tag/NoiaButtons)** +**[Custom Scrollbars](https://github.com/Aris-t2/Scrollbars)** ## Want to support this project? From 17b6df301ff61ca56a2d6dba075157a9670f9230 Mon Sep 17 00:00:00 2001 From: Aris Date: Fri, 16 Mar 2018 08:50:32 +0100 Subject: [PATCH 34/47] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c987bc82..43c7afcb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## Downloads for Firefox Photon (57+) +## Downloads for Firefox Quantum (57+) **[Classic Theme Restorer / Classic Toolbar Buttons / GlassMyFox CSS tweaks](https://github.com/Aris-t2/CustomCSSforFx/issues/2)** **[NoiaButtons CSS tweaks](https://github.com/Aris-t2/CustomCSSforFx/releases/tag/NoiaButtons)** From 947628f3f9c79435b109d89be0f12c28f753a375 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Fri, 16 Mar 2018 09:44:43 +0100 Subject: [PATCH 35/47] 1.7.8 --- classic/config/color_variables.css | 6 +-- classic/config/color_variables_aero.css | 6 +-- classic/config/color_variables_aeroglass.css | 6 +-- .../config/color_variables_classic-grey.css | 6 +-- classic/config/color_variables_fx3.css | 6 +-- .../config/color_variables_transparent.css | 6 +-- classic/config/custom_tab_text_settings.css | 6 +-- classic/config/general_variables.css | 6 +-- .../css/aboutaddons/addonlists_compact.css | 6 +-- .../addonlists_compact_more_compact.css | 6 +-- .../addonlists_move_button_to_start.css | 6 +-- .../addonlists_only_show_buttons_on_hover.css | 6 +-- ...lists_replace_button_labels_with_icons.css | 6 +-- .../addonlists_show_addon_version_number.css | 10 ++--- .../addons_manager_alternative_appearance.css | 6 +-- ...ns_manager_alternative_appearance_aero.css | 6 +-- ...ription_page_alternative_content_order.css | 6 +-- .../recentupdates_category_always_visible.css | 6 +-- .../search_category_always_visible.css | 6 +-- .../aboutnewtab/bottom_launcher_visible.css | 6 +-- classic/css/aboutnewtab/dark_appearance.css | 6 +-- .../preferences_alternative_appearance.css | 7 +--- ...references_alternative_appearance_aero.css | 6 +-- .../preferences_alternative_appearance_v2.css | 7 +--- classic/css/buttons/appbutton_hidden.css | 6 +-- classic/css/buttons/appbutton_in_titlebar.css | 6 +-- .../buttons/appbutton_in_titlebar_aurora.css | 6 +-- .../appbutton_in_titlebar_autocolor.css | 6 +-- .../appbutton_in_titlebar_autocolor57p.css | 6 +-- .../appbutton_in_titlebar_deved57p.css | 6 +-- .../appbutton_in_titlebar_icon_only.css | 6 +-- ...ton_in_titlebar_icon_only_browser_logo.css | 6 +-- .../appbutton_in_titlebar_icon_only_dark.css | 6 +-- .../appbutton_in_titlebar_icon_only_grey.css | 6 +-- .../appbutton_in_titlebar_label_and_icon.css | 6 +-- ...button_in_titlebar_label_and_icon_base.css | 6 +-- ...n_titlebar_label_and_icon_browser_logo.css | 6 +-- ...button_in_titlebar_label_and_icon_dark.css | 6 +-- ...button_in_titlebar_label_and_icon_grey.css | 6 +-- .../buttons/appbutton_in_titlebar_nightly.css | 6 +-- .../appbutton_in_titlebar_nightly57p.css | 6 +-- .../appbutton_in_titlebar_palemoon.css | 6 +-- ...appbutton_in_titlebar_semi_transparent.css | 6 +-- .../appbutton_in_titlebar_transparent.css | 6 +-- .../appbutton_on_navbar_color_aurora.css | 6 +-- .../appbutton_on_navbar_color_autocolor.css | 6 +-- ...appbutton_on_navbar_color_autocolor57p.css | 6 +-- .../appbutton_on_navbar_color_base.css | 6 +-- .../appbutton_on_navbar_color_deved57p.css | 6 +-- .../appbutton_on_navbar_color_nightly.css | 6 +-- .../appbutton_on_navbar_color_nightly57p.css | 6 +-- .../appbutton_on_navbar_color_orange.css | 6 +-- .../appbutton_on_navbar_color_palemoon.css | 6 +-- .../appbutton_on_navbar_icon_and_label.css | 6 +-- .../appbutton_on_navbar_icon_browser_logo.css | 6 +-- .../buttons/appbutton_on_navbar_icon_dark.css | 6 +-- .../buttons/appbutton_on_navbar_icon_grey.css | 6 +-- .../appbutton_on_navbar_icon_white.css | 6 +-- .../appbutton_on_navbar_separator_hidden.css | 6 +-- .../appbutton_on_navbar_start_position.css | 6 +-- .../appbutton_popup_icons_colorized.css | 6 +-- ... => appbutton_popup_panelarrow_hidden.css} | 8 +--- ...appbutton_popup_panelarrow_hidden_fx58.css | 14 ------- .../buttons/appbutton_popup_sync_hidden.css | 6 +-- ...forward_leftclick_history_popup_hidden.css | 6 +-- ...k_and_forward_separated_history_popups.css | 6 +-- ...n_localized_label_on_bookmarks_toolbar.css | 6 +-- ...s_menu_button_popup_classic_appearance.css | 6 +-- ...ks_menu_button_popup_other_item_hidden.css | 6 +-- ..._menu_button_popup_sidebar_item_hidden.css | 6 +-- ..._menu_button_popup_toolbar_item_hidden.css | 6 +-- ...n_bookmarks_toolbar_classic_appearance.css | 6 +-- ...marks_toolbar_classic_appearance_items.css | 6 +-- ...kmarks_toolbar_old_size_and_appearance.css | 6 +-- ..._on_menubar_toolbar_classic_appearance.css | 6 +-- .../buttons_on_navbar_button_roundness.css | 6 +-- .../buttons_on_navbar_classic_appearance.css | 6 +-- ...uttons_on_navbar_classic_appearance_v2.css | 6 +-- .../buttons_on_navbar_glass_appearance.css | 6 +-- .../buttons_on_navbar_osx_appearance.css | 6 +-- ... => buttons_on_navbar_squared_buttons.css} | 6 +-- ...buttons_on_navbar_squared_buttons_fx57.css | 42 +++++++++++++------ ..._backforward_connected_to_location_bar.css | 6 +-- ...forward_connected_to_location_bar_aero.css | 7 +--- .../css/buttons/custom_backforward_large.css | 6 +-- .../buttons/custom_backforward_large_ff2.css | 6 +-- .../buttons/custom_backforward_large_ff3.css | 6 +-- .../custom_backforward_large_ff3_strata.css | 6 +-- ...om_backforward_large_ff3_strata_orange.css | 6 +-- ...ustom_backforward_large_ff3_strata_red.css | 6 +-- .../buttons/custom_backforward_large_ie8.css | 6 +-- .../buttons/custom_backforward_large_ie9.css | 6 +-- .../custom_backforward_large_kempelton.css | 6 +-- .../css/buttons/custom_backforward_small.css | 6 +-- .../buttons/custom_backforward_small_ff3.css | 6 +-- .../custom_backforward_small_ff3_strata.css | 6 +-- ...om_backforward_small_ff3_strata_orange.css | 6 +-- ...ustom_backforward_small_ff3_strata_red.css | 6 +-- .../buttons/custom_backforward_small_ie8.css | 6 +-- .../buttons/custom_backforward_small_ie9.css | 6 +-- .../custom_backforward_small_kempelton.css | 6 +-- .../forward_button_hide_when_disabled.css | 6 +-- classic/css/buttons/icons_colorized.css | 6 +-- classic/css/buttons/icons_custom_icons.css | 6 +-- .../buttons/icons_custom_icons_crystal.css | 6 +-- .../buttons/icons_custom_icons_firebird.css | 6 +-- .../css/buttons/icons_custom_icons_fx1.css | 6 +-- .../icons_custom_icons_fx12_colorized.css | 6 +-- .../css/buttons/icons_custom_icons_fx2.css | 6 +-- .../css/buttons/icons_custom_icons_fx3.css | 6 +-- .../buttons/icons_custom_icons_fx3strata.css | 6 +-- .../css/buttons/icons_custom_icons_fx45.css | 6 +-- .../icons_custom_icons_fx45_inverted.css | 6 +-- .../css/buttons/icons_custom_icons_ie6.css | 6 +-- .../buttons/icons_custom_icons_kempelton.css | 6 +-- .../css/buttons/icons_custom_icons_noia.css | 6 +-- .../buttons/icons_custom_icons_old_chrome.css | 6 +-- .../buttons/icons_custom_icons_old_osx.css | 6 +-- .../buttons/icons_custom_icons_seamonkey.css | 6 +-- .../css/buttons/icons_custom_icons_tango.css | 6 +-- classic/css/buttons/icons_white_icons.css | 6 +-- .../css/buttons/zoom_buttons_hide_reset.css | 6 +-- .../generalui/bookmark_icons_colorized.css | 6 +-- .../bookmarks_smaller_more_bookmarks_icon.css | 6 +-- classic/css/generalui/close_icon_firefox3.css | 6 +-- classic/css/generalui/close_icon_gchrome.css | 6 +-- classic/css/generalui/close_icon_red.css | 6 +-- .../css/generalui/close_icon_windows10.css | 6 +-- .../close_icon_windows10inverted.css | 6 +-- .../css/generalui/close_icon_windows10red.css | 6 +-- .../generalui/close_icon_windows10redv2.css | 6 +-- classic/css/generalui/close_icon_windows7.css | 6 +-- .../generalui/close_icon_windows7inverted.css | 6 +-- .../css/generalui/close_icon_windows7v2.css | 6 +-- .../context_bfrsb_icons_colorized.css | 6 +-- ...abels_with_and_without_icons_Lin_macOS.css | 6 +-- ...els_with_and_without_icons_Lin_macOSv2.css | 6 +-- .../context_bfrsb_labels_with_icons.css | 6 +-- .../context_bfrsb_labels_without_icons.css | 6 +-- ...dbar_on_bottom_close_at_findbars_start.css | 6 +-- classic/css/generalui/findbar_on_top.css | 6 +-- ...findbar_on_top_close_at_findbars_start.css | 6 +-- .../findbar_show_full_quickfindbar.css | 6 +-- ...space_on_navbar_replace_with_separator.css | 6 +-- .../css/generalui/increase_ui_font_size.css | 6 +-- ...kmarks_popup_bookmark_page_item_hidden.css | 6 +-- ...ubar_bookmarks_popup_other_item_hidden.css | 6 +-- ..._bookmarks_popup_subscribe_item_hidden.css | 6 +-- ...ar_bookmarks_popup_toolbar_item_hidden.css | 6 +-- classic/css/generalui/oldsearch.css | 14 +++---- .../overflow_menu_horizontal_remove_text.css | 6 +-- .../generalui/overflow_menu_remove_text.css | 6 +-- .../popup_animation_fade_time_reduced.css | 6 +-- .../private_mode_indicator_hidden.css | 6 +-- .../searchbar_glassplus_indicator_hidden.css | 6 +-- .../generalui/searchbar_go_button_hidden.css | 6 +-- .../searchbar_popup_engines_hidden.css | 6 +-- .../searchbar_popup_engines_show_labels.css | 6 +-- .../send_to_device_menuitems_hidden.css | 6 +-- .../css/generalui/sidebar_appearance_dark.css | 6 +-- .../sidebar_appearance_lwtheme_bright.css | 6 +-- .../sidebar_appearance_lwtheme_dark.css | 6 +-- .../sidebar_header_icons_colorized.css | 6 +-- .../css/generalui/sidebar_header_lwtheme.css | 6 +-- .../generalui/sidebar_width_unrestricted.css | 6 +-- .../ac_popup_classic_with_two_lines.css | 10 ++--- .../locationbar/ac_popup_custom_height.css | 6 +-- .../ac_popup_item_title_hidden.css | 6 +-- ...popup_item_title_visible_on_hover_only.css | 6 +-- .../locationbar/ac_popup_keysearch_bold.css | 6 +-- .../ac_popup_keysearch_underline.css | 6 +-- .../ac_popup_result_highlighting_aero.css | 6 +-- .../locationbar/ac_popup_result_separator.css | 6 +-- ...opup_searchwith_and_visit_items_hidden.css | 6 +-- ...ac_popup_title_and_url_50percent_width.css | 6 +-- ...ac_popup_url_and_title_50percent_width.css | 6 +-- .../css/locationbar/background_color_dark.css | 6 +-- .../compact_mode_reduce_fontsize.css | 6 +-- .../css/locationbar/dropmarker_at_the_end.css | 6 +-- .../css/locationbar/dropmarker_visible.css | 6 +-- .../go_button_in_location_bar_hidden.css | 6 +-- classic/css/locationbar/icons_colorized.css | 6 +-- .../css/locationbar/identitybox_colors.css | 6 +-- .../locationbar/identitybox_labels_hidden.css | 6 +-- .../identitybox_padlock_icon_classic.css | 6 +-- .../identitybox_padlock_icon_classic2.css | 6 +-- .../identitybox_padlock_icon_hidden.css | 6 +-- .../identitybox_padlock_icon_modern.css | 6 +-- .../identitybox_padlock_icon_modern2.css | 6 +-- .../identitybox_replace_i_icon_with_globe.css | 6 +-- .../locationbar/locationbar_adjustments.css | 6 +-- .../locationbar_border_roundness.css | 6 +-- .../locationbar/locationbar_reduce_height.css | 6 +-- ...geaction_button_in_location_bar_hidden.css | 6 +-- ...ton_rotated_and_last_pageaction_button.css | 6 +-- ...ction_separator_in_location_bar_hidden.css | 6 +-- .../popup_blocked_button_hidden.css | 6 +-- .../locationbar/reader_alternative_icon.css | 6 +-- .../starbutton_alternative_icon.css | 6 +-- .../starbutton_is_last_pageaction_button.css | 6 +-- .../css/locationbar/zoom_button_hidden.css | 6 +-- .../tabs/alltabs_button_always_visible.css | 6 +-- classic/css/tabs/classic_squared_tabs.css | 6 +-- .../tabs/classic_squared_tabs_australized.css | 6 +-- .../classic_squared_tabs_fully_squared.css | 6 +-- .../tabs/custom_colors_for_squared_tabs.css | 6 +-- ...om_colors_for_squared_tabs_australized.css | 6 +-- classic/css/tabs/default_tabs_no_tab_line.css | 6 +-- .../tabs/default_tabs_round_top_borders.css | 6 +-- ...default_tabs_tab_background_appearance.css | 6 +-- classic/css/tabs/default_tabs_tab_border.css | 7 +--- ...t_tabs_tab_line_purple_in_private_mode.css | 7 +--- .../missing_tab_favicon_restored_default.css | 6 +-- .../missing_tab_favicon_restored_dotted.css | 6 +-- ...sing_tab_favicon_restored_dotted_white.css | 6 +-- .../missing_tab_favicon_restored_globe_v2.css | 6 +-- .../missing_tab_favicon_restored_sheet.css | 6 +-- .../tabs/pinnedtab_empty_favicon_hidden.css | 6 +-- classic/css/tabs/tab_close_always_visible.css | 6 +-- classic/css/tabs/tab_close_at_tabs_start.css | 6 +-- classic/css/tabs/tab_close_hidden.css | 6 +-- ..._close_hidden_for_only_one_visible_tab.css | 7 +--- classic/css/tabs/tab_close_icon_size.css | 6 +-- .../css/tabs/tab_close_on_active_tab_only.css | 6 +-- .../css/tabs/tab_close_show_on_hover_only.css | 6 +-- .../tabs/tab_context_menuitems_visibility.css | 6 +-- classic/css/tabs/tab_icon_colors.css | 6 +-- .../tab_icon_inactive_tabs_lower_opacity.css | 6 +-- classic/css/tabs/tab_maxwidth.css | 6 +-- classic/css/tabs/tab_throbber_blue.css | 6 +-- classic/css/tabs/tab_throbber_blue_fx56.css | 6 +-- classic/css/tabs/tab_throbber_green.css | 6 +-- .../css/tabs/tab_throbber_grey_classic.css | 6 +-- .../css/tabs/tab_throbber_orange_ubuntu.css | 6 +-- classic/css/tabs/tab_title_centered.css | 6 +-- .../tabs/tab_title_in_firefox_titlebar.css | 6 +-- ...tab_title_in_firefox_titlebar_centered.css | 6 +-- classic/css/tabs/tab_title_left.css | 6 +-- classic/css/tabs/tab_title_right.css | 6 +-- classic/css/tabs/tab_titles_remove_blur.css | 6 +-- classic/css/tabs/tabs_below_main_content.css | 6 +-- .../tabs/tabs_below_navigation_toolbar.css | 6 +-- ...vigation_toolbar_higher_navbar_positon.css | 6 +-- ...r_higher_navbar_positon_with_appbutton.css | 6 +-- ...avbar_positon_with_appbutton_icon_only.css | 6 +-- ...abs_below_navigation_toolbar_macOS_fix.css | 6 +-- ...elow_titlebar_above_navigation_toolbar.css | 6 +-- classic/css/tabs/tabs_multiple_lines.css | 6 +-- classic/css/tabs/tabs_multiple_lines_v2.css | 6 +-- .../addonbar_content_on_the_right.css | 6 +-- ...onbar_move_bookmarks_toolbar_to_bottom.css | 6 +-- .../toolbars/addonbar_status_in_addonbar.css | 6 +-- .../toolbars/bookmarks_toolbar_autohide.css | 6 +-- ...okmarks_toolbar_bookmark_labels_hidden.css | 6 +-- .../bookmarks_toolbar_in_fullscreen_mode.css | 6 +-- .../bookmarks_toolbar_multiple_lines.css | 6 +-- .../toolbars/bookmarks_toolbar_old_height.css | 6 +-- .../css/toolbars/general_toolbar_colors.css | 6 +-- ...lbar_colors_aeroglass_windows10_glass8.css | 10 ++--- ...bar_colors_bookmarks_toolbar_aeroglass.css | 6 +-- ...ar_colors_navigation_toolbar_aeroglass.css | 6 +-- ..._toolbar_colors_tabs_toolbar_aeroglass.css | 6 +-- classic/css/toolbars/menubar_color.css | 6 +-- classic/css/toolbars/menubar_fog_hidden.css | 6 +-- .../toolbars/menubar_in_fullscreen_mode.css | 6 +-- .../css/toolbars/navbar_more_compact_mode.css | 6 +-- .../css/toolbars/tabs_toolbar_adjustments.css | 6 +-- .../tabs_toolbar_adjustments_macOS_fix.css | 6 +-- .../toolbar_context_menuitems_visibility.css | 6 +-- .../toolbars/toolbar_mode_icons_and_text.css | 6 +-- ...icons_and_text_and_text_only_macOS_fix.css | 6 +-- classic/css/toolbars/toolbar_mode_text.css | 6 +-- classic/css/toolbars/toolbars_old_padding.css | 6 +-- .../screenshots_alternative_save_ui.css | 6 +-- .../webcontent/toplevel_image_classic_v1.css | 6 +-- .../webcontent/toplevel_image_classic_v2.css | 6 +-- classic/userChrome.css | 23 +++++----- classic/userContent.css | 10 +---- ...addonversion_fx57.xml => addonversion.xml} | 19 +++++---- .../xml/{oldsearch_fx57.xml => oldsearch.xml} | 6 +++ ...arBindings_fx57.xml => urlbarBindings.xml} | 9 ++-- 281 files changed, 347 insertions(+), 1448 deletions(-) rename classic/css/buttons/{appbutton_popup_panelarrow_hidden_fx57.css => appbutton_popup_panelarrow_hidden.css} (69%) delete mode 100644 classic/css/buttons/appbutton_popup_panelarrow_hidden_fx58.css rename classic/css/buttons/{buttons_on_navbar_squared_buttons_fx58.css => buttons_on_navbar_squared_buttons.css} (88%) rename classic/xml/{addonversion_fx57.xml => addonversion.xml} (96%) rename classic/xml/{oldsearch_fx57.xml => oldsearch.xml} (98%) rename classic/xml/{urlbarBindings_fx57.xml => urlbarBindings.xml} (94%) diff --git a/classic/config/color_variables.css b/classic/config/color_variables.css index c2fb8ff3..afb526cf 100644 --- a/classic/config/color_variables.css +++ b/classic/config/color_variables.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/config/color_variables_aero.css b/classic/config/color_variables_aero.css index f38cf086..f57865ce 100644 --- a/classic/config/color_variables_aero.css +++ b/classic/config/color_variables_aero.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/config/color_variables_aeroglass.css b/classic/config/color_variables_aeroglass.css index 508ef2df..5f84f94b 100644 --- a/classic/config/color_variables_aeroglass.css +++ b/classic/config/color_variables_aeroglass.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/config/color_variables_classic-grey.css b/classic/config/color_variables_classic-grey.css index 203e4c44..006c94b8 100644 --- a/classic/config/color_variables_classic-grey.css +++ b/classic/config/color_variables_classic-grey.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/config/color_variables_fx3.css b/classic/config/color_variables_fx3.css index 6889f689..289c5733 100644 --- a/classic/config/color_variables_fx3.css +++ b/classic/config/color_variables_fx3.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/config/color_variables_transparent.css b/classic/config/color_variables_transparent.css index 3cbce60e..d703cf4a 100644 --- a/classic/config/color_variables_transparent.css +++ b/classic/config/color_variables_transparent.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/config/custom_tab_text_settings.css b/classic/config/custom_tab_text_settings.css index 94528939..c1e70ed3 100644 --- a/classic/config/custom_tab_text_settings.css +++ b/classic/config/custom_tab_text_settings.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/config/general_variables.css b/classic/config/general_variables.css index 075399c6..b4a60377 100644 --- a/classic/config/general_variables.css +++ b/classic/config/general_variables.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutaddons/addonlists_compact.css b/classic/css/aboutaddons/addonlists_compact.css index 3155b258..9d572f19 100644 --- a/classic/css/aboutaddons/addonlists_compact.css +++ b/classic/css/aboutaddons/addonlists_compact.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutaddons/addonlists_compact_more_compact.css b/classic/css/aboutaddons/addonlists_compact_more_compact.css index fb36439a..236bd81e 100644 --- a/classic/css/aboutaddons/addonlists_compact_more_compact.css +++ b/classic/css/aboutaddons/addonlists_compact_more_compact.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutaddons/addonlists_move_button_to_start.css b/classic/css/aboutaddons/addonlists_move_button_to_start.css index aada29d6..b86c7262 100644 --- a/classic/css/aboutaddons/addonlists_move_button_to_start.css +++ b/classic/css/aboutaddons/addonlists_move_button_to_start.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutaddons/addonlists_only_show_buttons_on_hover.css b/classic/css/aboutaddons/addonlists_only_show_buttons_on_hover.css index 46c0ea26..8fb7f25b 100644 --- a/classic/css/aboutaddons/addonlists_only_show_buttons_on_hover.css +++ b/classic/css/aboutaddons/addonlists_only_show_buttons_on_hover.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutaddons/addonlists_replace_button_labels_with_icons.css b/classic/css/aboutaddons/addonlists_replace_button_labels_with_icons.css index 00bd2e82..e791ace7 100644 --- a/classic/css/aboutaddons/addonlists_replace_button_labels_with_icons.css +++ b/classic/css/aboutaddons/addonlists_replace_button_labels_with_icons.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutaddons/addonlists_show_addon_version_number.css b/classic/css/aboutaddons/addonlists_show_addon_version_number.css index b42f74fe..3273e546 100644 --- a/classic/css/aboutaddons/addonlists_show_addon_version_number.css +++ b/classic/css/aboutaddons/addonlists_show_addon_version_number.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ @@ -11,7 +7,7 @@ /* addonversion.xml contains a copy of the 'addon-generic' binding Mozilla removed from Fx40+ builds!*/ .addon:not([pending="uninstall"])[status="installed"] { - -moz-binding: url("./../../xml/addonversion_fx57.xml#addon-generic") !important; + -moz-binding: url("./../../xml/addonversion.xml#addon-generic") !important; } .addon:not([pending="uninstall"])[status="installed"] .name-container .version { @@ -19,7 +15,7 @@ } .addon:not([pending="uninstall"])[status="installing"] { - -moz-binding: url("./../../xml/addonversion_fx57.xml#addon-installing"); + -moz-binding: url("./../../xml/addonversion.xml#addon-installing"); } .addon:not([pending="uninstall"])[status="installing"] .name-container .version { diff --git a/classic/css/aboutaddons/addons_manager_alternative_appearance.css b/classic/css/aboutaddons/addons_manager_alternative_appearance.css index 7bb1d78b..335bb3b7 100644 --- a/classic/css/aboutaddons/addons_manager_alternative_appearance.css +++ b/classic/css/aboutaddons/addons_manager_alternative_appearance.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutaddons/addons_manager_alternative_appearance_aero.css b/classic/css/aboutaddons/addons_manager_alternative_appearance_aero.css index 702368eb..83158790 100644 --- a/classic/css/aboutaddons/addons_manager_alternative_appearance_aero.css +++ b/classic/css/aboutaddons/addons_manager_alternative_appearance_aero.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutaddons/description_page_alternative_content_order.css b/classic/css/aboutaddons/description_page_alternative_content_order.css index 002c4c2b..81ec9684 100644 --- a/classic/css/aboutaddons/description_page_alternative_content_order.css +++ b/classic/css/aboutaddons/description_page_alternative_content_order.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutaddons/recentupdates_category_always_visible.css b/classic/css/aboutaddons/recentupdates_category_always_visible.css index 18fdd50b..da949fa3 100644 --- a/classic/css/aboutaddons/recentupdates_category_always_visible.css +++ b/classic/css/aboutaddons/recentupdates_category_always_visible.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutaddons/search_category_always_visible.css b/classic/css/aboutaddons/search_category_always_visible.css index ae59b7ed..d9da10cd 100644 --- a/classic/css/aboutaddons/search_category_always_visible.css +++ b/classic/css/aboutaddons/search_category_always_visible.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutnewtab/bottom_launcher_visible.css b/classic/css/aboutnewtab/bottom_launcher_visible.css index 6e9e5e32..7b9a24a4 100644 --- a/classic/css/aboutnewtab/bottom_launcher_visible.css +++ b/classic/css/aboutnewtab/bottom_launcher_visible.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutnewtab/dark_appearance.css b/classic/css/aboutnewtab/dark_appearance.css index 7f76c298..edf38aa1 100644 --- a/classic/css/aboutnewtab/dark_appearance.css +++ b/classic/css/aboutnewtab/dark_appearance.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutpreferences/preferences_alternative_appearance.css b/classic/css/aboutpreferences/preferences_alternative_appearance.css index 7283aa7f..bb775e9e 100644 --- a/classic/css/aboutpreferences/preferences_alternative_appearance.css +++ b/classic/css/aboutpreferences/preferences_alternative_appearance.css @@ -1,10 +1,7 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ + @-moz-document url(about:preferences),url-prefix(about:preferences){ .category { diff --git a/classic/css/aboutpreferences/preferences_alternative_appearance_aero.css b/classic/css/aboutpreferences/preferences_alternative_appearance_aero.css index 3763e7d4..a3112647 100644 --- a/classic/css/aboutpreferences/preferences_alternative_appearance_aero.css +++ b/classic/css/aboutpreferences/preferences_alternative_appearance_aero.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css b/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css index 4b8bd87e..0963850e 100644 --- a/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css +++ b/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css @@ -1,10 +1,7 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ + @-moz-document url(about:preferences),url-prefix(about:preferences){ .category { diff --git a/classic/css/buttons/appbutton_hidden.css b/classic/css/buttons/appbutton_hidden.css index 339b994e..40b7133b 100644 --- a/classic/css/buttons/appbutton_hidden.css +++ b/classic/css/buttons/appbutton_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar.css b/classic/css/buttons/appbutton_in_titlebar.css index dddccc65..1f41ce6a 100644 --- a/classic/css/buttons/appbutton_in_titlebar.css +++ b/classic/css/buttons/appbutton_in_titlebar.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_aurora.css b/classic/css/buttons/appbutton_in_titlebar_aurora.css index aa2e531d..a3c01038 100644 --- a/classic/css/buttons/appbutton_in_titlebar_aurora.css +++ b/classic/css/buttons/appbutton_in_titlebar_aurora.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_autocolor.css b/classic/css/buttons/appbutton_in_titlebar_autocolor.css index f947edad..50e8f31c 100644 --- a/classic/css/buttons/appbutton_in_titlebar_autocolor.css +++ b/classic/css/buttons/appbutton_in_titlebar_autocolor.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_autocolor57p.css b/classic/css/buttons/appbutton_in_titlebar_autocolor57p.css index 4adf545f..32cd143c 100644 --- a/classic/css/buttons/appbutton_in_titlebar_autocolor57p.css +++ b/classic/css/buttons/appbutton_in_titlebar_autocolor57p.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_deved57p.css b/classic/css/buttons/appbutton_in_titlebar_deved57p.css index eaf1e96c..8e8f3188 100644 --- a/classic/css/buttons/appbutton_in_titlebar_deved57p.css +++ b/classic/css/buttons/appbutton_in_titlebar_deved57p.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only.css b/classic/css/buttons/appbutton_in_titlebar_icon_only.css index 4eca0e7a..ab8ea67f 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css b/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css index 26adc6f7..19a41f21 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only_browser_logo.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only_dark.css b/classic/css/buttons/appbutton_in_titlebar_icon_only_dark.css index 866be15d..abc8276a 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only_dark.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only_dark.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only_grey.css b/classic/css/buttons/appbutton_in_titlebar_icon_only_grey.css index 06fa7f7c..1c7c309d 100644 --- a/classic/css/buttons/appbutton_in_titlebar_icon_only_grey.css +++ b/classic/css/buttons/appbutton_in_titlebar_icon_only_grey.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_label_and_icon.css b/classic/css/buttons/appbutton_in_titlebar_label_and_icon.css index 6dc3cd70..fd3a756f 100644 --- a/classic/css/buttons/appbutton_in_titlebar_label_and_icon.css +++ b/classic/css/buttons/appbutton_in_titlebar_label_and_icon.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css index 967a5f64..51e8c323 100644 --- a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css +++ b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_base.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_browser_logo.css b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_browser_logo.css index 61971b69..1abd467f 100644 --- a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_browser_logo.css +++ b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_browser_logo.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_dark.css b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_dark.css index 1a2908d2..c095799b 100644 --- a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_dark.css +++ b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_dark.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_grey.css b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_grey.css index f2938e22..0fb12c49 100644 --- a/classic/css/buttons/appbutton_in_titlebar_label_and_icon_grey.css +++ b/classic/css/buttons/appbutton_in_titlebar_label_and_icon_grey.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_nightly.css b/classic/css/buttons/appbutton_in_titlebar_nightly.css index 9991214f..3126ec02 100644 --- a/classic/css/buttons/appbutton_in_titlebar_nightly.css +++ b/classic/css/buttons/appbutton_in_titlebar_nightly.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_nightly57p.css b/classic/css/buttons/appbutton_in_titlebar_nightly57p.css index aa1bb339..d5c5e447 100644 --- a/classic/css/buttons/appbutton_in_titlebar_nightly57p.css +++ b/classic/css/buttons/appbutton_in_titlebar_nightly57p.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_palemoon.css b/classic/css/buttons/appbutton_in_titlebar_palemoon.css index 8ccdde1f..edd3f499 100644 --- a/classic/css/buttons/appbutton_in_titlebar_palemoon.css +++ b/classic/css/buttons/appbutton_in_titlebar_palemoon.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_semi_transparent.css b/classic/css/buttons/appbutton_in_titlebar_semi_transparent.css index 71f94c49..059e2f94 100644 --- a/classic/css/buttons/appbutton_in_titlebar_semi_transparent.css +++ b/classic/css/buttons/appbutton_in_titlebar_semi_transparent.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_in_titlebar_transparent.css b/classic/css/buttons/appbutton_in_titlebar_transparent.css index c3af368c..01fad26b 100644 --- a/classic/css/buttons/appbutton_in_titlebar_transparent.css +++ b/classic/css/buttons/appbutton_in_titlebar_transparent.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_color_aurora.css b/classic/css/buttons/appbutton_on_navbar_color_aurora.css index ec21cb4d..ace8da5c 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_aurora.css +++ b/classic/css/buttons/appbutton_on_navbar_color_aurora.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_color_autocolor.css b/classic/css/buttons/appbutton_on_navbar_color_autocolor.css index dc735e00..0d2d3b6f 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_autocolor.css +++ b/classic/css/buttons/appbutton_on_navbar_color_autocolor.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_color_autocolor57p.css b/classic/css/buttons/appbutton_on_navbar_color_autocolor57p.css index 000cafc2..b990a4a6 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_autocolor57p.css +++ b/classic/css/buttons/appbutton_on_navbar_color_autocolor57p.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_color_base.css b/classic/css/buttons/appbutton_on_navbar_color_base.css index 99a5092f..4627f740 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_base.css +++ b/classic/css/buttons/appbutton_on_navbar_color_base.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_color_deved57p.css b/classic/css/buttons/appbutton_on_navbar_color_deved57p.css index f1daf9ea..a3cdc6b3 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_deved57p.css +++ b/classic/css/buttons/appbutton_on_navbar_color_deved57p.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_color_nightly.css b/classic/css/buttons/appbutton_on_navbar_color_nightly.css index 295a1822..ac55803f 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_nightly.css +++ b/classic/css/buttons/appbutton_on_navbar_color_nightly.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_color_nightly57p.css b/classic/css/buttons/appbutton_on_navbar_color_nightly57p.css index 9be1a5eb..8d100234 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_nightly57p.css +++ b/classic/css/buttons/appbutton_on_navbar_color_nightly57p.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_color_orange.css b/classic/css/buttons/appbutton_on_navbar_color_orange.css index d7a13a70..d8d2e21e 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_orange.css +++ b/classic/css/buttons/appbutton_on_navbar_color_orange.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_color_palemoon.css b/classic/css/buttons/appbutton_on_navbar_color_palemoon.css index 9323ccbc..7e75ee49 100644 --- a/classic/css/buttons/appbutton_on_navbar_color_palemoon.css +++ b/classic/css/buttons/appbutton_on_navbar_color_palemoon.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_icon_and_label.css b/classic/css/buttons/appbutton_on_navbar_icon_and_label.css index 37e6c671..4e3196c7 100644 --- a/classic/css/buttons/appbutton_on_navbar_icon_and_label.css +++ b/classic/css/buttons/appbutton_on_navbar_icon_and_label.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_icon_browser_logo.css b/classic/css/buttons/appbutton_on_navbar_icon_browser_logo.css index 45af191d..40705859 100644 --- a/classic/css/buttons/appbutton_on_navbar_icon_browser_logo.css +++ b/classic/css/buttons/appbutton_on_navbar_icon_browser_logo.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_icon_dark.css b/classic/css/buttons/appbutton_on_navbar_icon_dark.css index 8806eb5f..9e809a83 100644 --- a/classic/css/buttons/appbutton_on_navbar_icon_dark.css +++ b/classic/css/buttons/appbutton_on_navbar_icon_dark.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_icon_grey.css b/classic/css/buttons/appbutton_on_navbar_icon_grey.css index 73ccf152..1848fffa 100644 --- a/classic/css/buttons/appbutton_on_navbar_icon_grey.css +++ b/classic/css/buttons/appbutton_on_navbar_icon_grey.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_icon_white.css b/classic/css/buttons/appbutton_on_navbar_icon_white.css index e174bc0c..8233a89b 100644 --- a/classic/css/buttons/appbutton_on_navbar_icon_white.css +++ b/classic/css/buttons/appbutton_on_navbar_icon_white.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_separator_hidden.css b/classic/css/buttons/appbutton_on_navbar_separator_hidden.css index 8766ac1c..1c847e25 100644 --- a/classic/css/buttons/appbutton_on_navbar_separator_hidden.css +++ b/classic/css/buttons/appbutton_on_navbar_separator_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_on_navbar_start_position.css b/classic/css/buttons/appbutton_on_navbar_start_position.css index 9fe1e949..2228496f 100644 --- a/classic/css/buttons/appbutton_on_navbar_start_position.css +++ b/classic/css/buttons/appbutton_on_navbar_start_position.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_popup_icons_colorized.css b/classic/css/buttons/appbutton_popup_icons_colorized.css index 9497bdce..dab58190 100644 --- a/classic/css/buttons/appbutton_popup_icons_colorized.css +++ b/classic/css/buttons/appbutton_popup_icons_colorized.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/appbutton_popup_panelarrow_hidden_fx57.css b/classic/css/buttons/appbutton_popup_panelarrow_hidden.css similarity index 69% rename from classic/css/buttons/appbutton_popup_panelarrow_hidden_fx57.css rename to classic/css/buttons/appbutton_popup_panelarrow_hidden.css index 82589c6a..941e76e9 100644 --- a/classic/css/buttons/appbutton_popup_panelarrow_hidden_fx57.css +++ b/classic/css/buttons/appbutton_popup_panelarrow_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ @@ -13,7 +9,7 @@ } #main-window[tabsintitlebar] #appMenu-popup{ -moz-margin-start: 0px !important; - -moz-margin-end: -205px !important; + -moz-margin-end: -250px !important; margin-top: -2px !important; } diff --git a/classic/css/buttons/appbutton_popup_panelarrow_hidden_fx58.css b/classic/css/buttons/appbutton_popup_panelarrow_hidden_fx58.css deleted file mode 100644 index 8f9d46b5..00000000 --- a/classic/css/buttons/appbutton_popup_panelarrow_hidden_fx58.css +++ /dev/null @@ -1,14 +0,0 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ************************************/ -/****************************************************************************************/ - - -@import url(./appbutton_popup_panelarrow_hidden_fx57.css); - -#main-window[tabsintitlebar] #appMenu-popup{ - -moz-margin-end: -250px !important; -} diff --git a/classic/css/buttons/appbutton_popup_sync_hidden.css b/classic/css/buttons/appbutton_popup_sync_hidden.css index 30092f81..dfa5d45b 100644 --- a/classic/css/buttons/appbutton_popup_sync_hidden.css +++ b/classic/css/buttons/appbutton_popup_sync_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/back_and_forward_leftclick_history_popup_hidden.css b/classic/css/buttons/back_and_forward_leftclick_history_popup_hidden.css index ec838fff..db124015 100644 --- a/classic/css/buttons/back_and_forward_leftclick_history_popup_hidden.css +++ b/classic/css/buttons/back_and_forward_leftclick_history_popup_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/back_and_forward_separated_history_popups.css b/classic/css/buttons/back_and_forward_separated_history_popups.css index 55dee988..9df4378c 100644 --- a/classic/css/buttons/back_and_forward_separated_history_popups.css +++ b/classic/css/buttons/back_and_forward_separated_history_popups.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/bookmarks_menu_button_localized_label_on_bookmarks_toolbar.css b/classic/css/buttons/bookmarks_menu_button_localized_label_on_bookmarks_toolbar.css index b58c5d5b..48bfadda 100644 --- a/classic/css/buttons/bookmarks_menu_button_localized_label_on_bookmarks_toolbar.css +++ b/classic/css/buttons/bookmarks_menu_button_localized_label_on_bookmarks_toolbar.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance.css b/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance.css index d0e64905..5987ee1e 100644 --- a/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance.css +++ b/classic/css/buttons/bookmarks_menu_button_popup_classic_appearance.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/bookmarks_menu_button_popup_other_item_hidden.css b/classic/css/buttons/bookmarks_menu_button_popup_other_item_hidden.css index a014587a..11baca58 100644 --- a/classic/css/buttons/bookmarks_menu_button_popup_other_item_hidden.css +++ b/classic/css/buttons/bookmarks_menu_button_popup_other_item_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/bookmarks_menu_button_popup_sidebar_item_hidden.css b/classic/css/buttons/bookmarks_menu_button_popup_sidebar_item_hidden.css index 5151e475..f4416b60 100644 --- a/classic/css/buttons/bookmarks_menu_button_popup_sidebar_item_hidden.css +++ b/classic/css/buttons/bookmarks_menu_button_popup_sidebar_item_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/bookmarks_menu_button_popup_toolbar_item_hidden.css b/classic/css/buttons/bookmarks_menu_button_popup_toolbar_item_hidden.css index cdbe3275..cacfbd25 100644 --- a/classic/css/buttons/bookmarks_menu_button_popup_toolbar_item_hidden.css +++ b/classic/css/buttons/bookmarks_menu_button_popup_toolbar_item_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance.css b/classic/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance.css index ddb6fa82..c47bc9b6 100644 --- a/classic/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance.css +++ b/classic/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items.css b/classic/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items.css index ab53dea3..f7061274 100644 --- a/classic/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items.css +++ b/classic/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance.css b/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance.css index 7e690950..70d1df13 100644 --- a/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance.css +++ b/classic/css/buttons/buttons_on_bookmarks_toolbar_old_size_and_appearance.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/buttons_on_menubar_toolbar_classic_appearance.css b/classic/css/buttons/buttons_on_menubar_toolbar_classic_appearance.css index 0f9a057d..b785aa85 100644 --- a/classic/css/buttons/buttons_on_menubar_toolbar_classic_appearance.css +++ b/classic/css/buttons/buttons_on_menubar_toolbar_classic_appearance.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/buttons_on_navbar_button_roundness.css b/classic/css/buttons/buttons_on_navbar_button_roundness.css index d7fe16b4..1931fa38 100644 --- a/classic/css/buttons/buttons_on_navbar_button_roundness.css +++ b/classic/css/buttons/buttons_on_navbar_button_roundness.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/buttons_on_navbar_classic_appearance.css b/classic/css/buttons/buttons_on_navbar_classic_appearance.css index 6f9dad9b..2ae647f4 100644 --- a/classic/css/buttons/buttons_on_navbar_classic_appearance.css +++ b/classic/css/buttons/buttons_on_navbar_classic_appearance.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/buttons_on_navbar_classic_appearance_v2.css b/classic/css/buttons/buttons_on_navbar_classic_appearance_v2.css index 235465df..8b29a702 100644 --- a/classic/css/buttons/buttons_on_navbar_classic_appearance_v2.css +++ b/classic/css/buttons/buttons_on_navbar_classic_appearance_v2.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/buttons_on_navbar_glass_appearance.css b/classic/css/buttons/buttons_on_navbar_glass_appearance.css index 6d184a7c..2343bbde 100644 --- a/classic/css/buttons/buttons_on_navbar_glass_appearance.css +++ b/classic/css/buttons/buttons_on_navbar_glass_appearance.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/buttons_on_navbar_osx_appearance.css b/classic/css/buttons/buttons_on_navbar_osx_appearance.css index 16bfbf4e..30a3c353 100644 --- a/classic/css/buttons/buttons_on_navbar_osx_appearance.css +++ b/classic/css/buttons/buttons_on_navbar_osx_appearance.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/buttons_on_navbar_squared_buttons_fx58.css b/classic/css/buttons/buttons_on_navbar_squared_buttons.css similarity index 88% rename from classic/css/buttons/buttons_on_navbar_squared_buttons_fx58.css rename to classic/css/buttons/buttons_on_navbar_squared_buttons.css index 984728c7..d3f29366 100644 --- a/classic/css/buttons/buttons_on_navbar_squared_buttons_fx58.css +++ b/classic/css/buttons/buttons_on_navbar_squared_buttons.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/buttons_on_navbar_squared_buttons_fx57.css b/classic/css/buttons/buttons_on_navbar_squared_buttons_fx57.css index cd5d23b7..86431f4a 100644 --- a/classic/css/buttons/buttons_on_navbar_squared_buttons_fx57.css +++ b/classic/css/buttons/buttons_on_navbar_squared_buttons_fx57.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ @@ -10,6 +6,7 @@ ** types and button variations out there to catch all of them with general code. ********/ +/* compact button mode */ #main-window[uidensity=compact] #nav-bar .toolbarbutton-1 .toolbarbutton-icon { width: 32px !important; height: 26px !important; @@ -24,26 +21,33 @@ } #main-window[uidensity=compact] #nav-bar #downloads-button #downloads-indicator-anchor { - margin-left: 3px !important; - margin-right: 3px !important; + margin-left: 2px !important; + margin-right: 2px !important; padding-top: 5px !important; padding-bottom: 5px !important; } #main-window[uidensity=compact] #nav-bar .webextension-browser-action .toolbarbutton-icon { - margin-left: 3px !important; - margin-right: 3px !important; + margin-left: 2px !important; + margin-right: 2px !important; } #main-window[uidensity=compact] #nav-bar :-moz-any(#add-ons-button,#zoom-out-button,#zoom-in-button) .toolbarbutton-icon { - padding-left: 7px !important; - padding-right: 7px !important; + padding-left: 8px !important; + padding-right: 8px !important; } -#main-window[uidensity=compact] #nav-bar #nav-bar-overflow-button .toolbarbutton-animatable-box{ +#main-window[uidensity=compact] #nav-bar #stop-reload-button .toolbarbutton-animatable-box, +#main-window[uidensity=compact] #nav-bar #nav-bar-overflow-button .toolbarbutton-animatable-box { margin-left: 7px !important; margin-right: 7px !important; } +#main-window[uidensity=compact] #nav-bar #zoom-reset-button .toolbarbutton-text { + min-height: 26px !important; +} + + +/* normal button mode */ #main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar .toolbarbutton-1 .toolbarbutton-icon { width: 40px !important; height: 30px !important; @@ -76,11 +80,18 @@ padding-right: 11px !important; } -#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #nav-bar-overflow-button .toolbarbutton-animatable-box{ +#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #nav-bar-overflow-button .toolbarbutton-animatable-box, +#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #stop-reload-button .toolbarbutton-animatable-box { margin-left: 11px !important; margin-right: 11px !important; } +#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #zoom-reset-button .toolbarbutton-text { + min-height: 30px !important; +} + + +/* touch button mode */ #main-window[uidensity=touch] #nav-bar .toolbarbutton-1 .toolbarbutton-icon { width: 46px !important; height: 32px !important; @@ -113,11 +124,16 @@ padding-right: 14px !important; } +#main-window[uidensity=touch] #nav-bar #stop-reload-button .toolbarbutton-animatable-box , #main-window[uidensity=touch] #nav-bar #nav-bar-overflow-button .toolbarbutton-animatable-box{ margin-left: 14px !important; margin-right: 14px !important; } +#main-window[uidensity=touch] #nav-bar #zoom-reset-button .toolbarbutton-text { + min-height: 32px !important; +} + /* fix for toolbar button badges */ #nav-bar .toolbarbutton-1 .toolbarbutton-badge { margin-top: -1px !important; diff --git a/classic/css/buttons/custom_backforward_connected_to_location_bar.css b/classic/css/buttons/custom_backforward_connected_to_location_bar.css index a70122b9..b14718be 100644 --- a/classic/css/buttons/custom_backforward_connected_to_location_bar.css +++ b/classic/css/buttons/custom_backforward_connected_to_location_bar.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_connected_to_location_bar_aero.css b/classic/css/buttons/custom_backforward_connected_to_location_bar_aero.css index d9e95611..c757081b 100644 --- a/classic/css/buttons/custom_backforward_connected_to_location_bar_aero.css +++ b/classic/css/buttons/custom_backforward_connected_to_location_bar_aero.css @@ -1,12 +1,7 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ - @import url(./custom_backforward_connected_to_location_bar.css); /* color has to be adjusted depending toolbar color */ diff --git a/classic/css/buttons/custom_backforward_large.css b/classic/css/buttons/custom_backforward_large.css index 89e9ba82..130b62ae 100644 --- a/classic/css/buttons/custom_backforward_large.css +++ b/classic/css/buttons/custom_backforward_large.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_large_ff2.css b/classic/css/buttons/custom_backforward_large_ff2.css index c76f2a95..fae18818 100644 --- a/classic/css/buttons/custom_backforward_large_ff2.css +++ b/classic/css/buttons/custom_backforward_large_ff2.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_large_ff3.css b/classic/css/buttons/custom_backforward_large_ff3.css index 7855fa36..c1771f6b 100644 --- a/classic/css/buttons/custom_backforward_large_ff3.css +++ b/classic/css/buttons/custom_backforward_large_ff3.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_large_ff3_strata.css b/classic/css/buttons/custom_backforward_large_ff3_strata.css index 4d0ce299..3624fedf 100644 --- a/classic/css/buttons/custom_backforward_large_ff3_strata.css +++ b/classic/css/buttons/custom_backforward_large_ff3_strata.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_large_ff3_strata_orange.css b/classic/css/buttons/custom_backforward_large_ff3_strata_orange.css index df68705e..14690735 100644 --- a/classic/css/buttons/custom_backforward_large_ff3_strata_orange.css +++ b/classic/css/buttons/custom_backforward_large_ff3_strata_orange.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_large_ff3_strata_red.css b/classic/css/buttons/custom_backforward_large_ff3_strata_red.css index 2242ce1d..5b06b988 100644 --- a/classic/css/buttons/custom_backforward_large_ff3_strata_red.css +++ b/classic/css/buttons/custom_backforward_large_ff3_strata_red.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_large_ie8.css b/classic/css/buttons/custom_backforward_large_ie8.css index 9d028744..dffa5f99 100644 --- a/classic/css/buttons/custom_backforward_large_ie8.css +++ b/classic/css/buttons/custom_backforward_large_ie8.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_large_ie9.css b/classic/css/buttons/custom_backforward_large_ie9.css index 3d23c4de..f96f84dd 100644 --- a/classic/css/buttons/custom_backforward_large_ie9.css +++ b/classic/css/buttons/custom_backforward_large_ie9.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_large_kempelton.css b/classic/css/buttons/custom_backforward_large_kempelton.css index 015be0b1..7293b5ce 100644 --- a/classic/css/buttons/custom_backforward_large_kempelton.css +++ b/classic/css/buttons/custom_backforward_large_kempelton.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_small.css b/classic/css/buttons/custom_backforward_small.css index d42e69b8..67750c86 100644 --- a/classic/css/buttons/custom_backforward_small.css +++ b/classic/css/buttons/custom_backforward_small.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_small_ff3.css b/classic/css/buttons/custom_backforward_small_ff3.css index a45b9e69..99daa99f 100644 --- a/classic/css/buttons/custom_backforward_small_ff3.css +++ b/classic/css/buttons/custom_backforward_small_ff3.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_small_ff3_strata.css b/classic/css/buttons/custom_backforward_small_ff3_strata.css index 3c927949..9ab89b21 100644 --- a/classic/css/buttons/custom_backforward_small_ff3_strata.css +++ b/classic/css/buttons/custom_backforward_small_ff3_strata.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_small_ff3_strata_orange.css b/classic/css/buttons/custom_backforward_small_ff3_strata_orange.css index 760cda1f..28c9507e 100644 --- a/classic/css/buttons/custom_backforward_small_ff3_strata_orange.css +++ b/classic/css/buttons/custom_backforward_small_ff3_strata_orange.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_small_ff3_strata_red.css b/classic/css/buttons/custom_backforward_small_ff3_strata_red.css index 222fa5b3..599f89ee 100644 --- a/classic/css/buttons/custom_backforward_small_ff3_strata_red.css +++ b/classic/css/buttons/custom_backforward_small_ff3_strata_red.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_small_ie8.css b/classic/css/buttons/custom_backforward_small_ie8.css index 47626668..666682d4 100644 --- a/classic/css/buttons/custom_backforward_small_ie8.css +++ b/classic/css/buttons/custom_backforward_small_ie8.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_small_ie9.css b/classic/css/buttons/custom_backforward_small_ie9.css index 56253667..245f71cb 100644 --- a/classic/css/buttons/custom_backforward_small_ie9.css +++ b/classic/css/buttons/custom_backforward_small_ie9.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/custom_backforward_small_kempelton.css b/classic/css/buttons/custom_backforward_small_kempelton.css index 455e1697..c7ab7c51 100644 --- a/classic/css/buttons/custom_backforward_small_kempelton.css +++ b/classic/css/buttons/custom_backforward_small_kempelton.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/forward_button_hide_when_disabled.css b/classic/css/buttons/forward_button_hide_when_disabled.css index 3d7d9d3c..819ec974 100644 --- a/classic/css/buttons/forward_button_hide_when_disabled.css +++ b/classic/css/buttons/forward_button_hide_when_disabled.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_colorized.css b/classic/css/buttons/icons_colorized.css index d18b8d0a..cbfe7e40 100644 --- a/classic/css/buttons/icons_colorized.css +++ b/classic/css/buttons/icons_colorized.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons.css b/classic/css/buttons/icons_custom_icons.css index 8be8c6e3..579bca14 100644 --- a/classic/css/buttons/icons_custom_icons.css +++ b/classic/css/buttons/icons_custom_icons.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_crystal.css b/classic/css/buttons/icons_custom_icons_crystal.css index 1d236ec5..1638f4a9 100644 --- a/classic/css/buttons/icons_custom_icons_crystal.css +++ b/classic/css/buttons/icons_custom_icons_crystal.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_firebird.css b/classic/css/buttons/icons_custom_icons_firebird.css index 230b2e54..91ae0848 100644 --- a/classic/css/buttons/icons_custom_icons_firebird.css +++ b/classic/css/buttons/icons_custom_icons_firebird.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_fx1.css b/classic/css/buttons/icons_custom_icons_fx1.css index 5e3f495e..34d10278 100644 --- a/classic/css/buttons/icons_custom_icons_fx1.css +++ b/classic/css/buttons/icons_custom_icons_fx1.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_fx12_colorized.css b/classic/css/buttons/icons_custom_icons_fx12_colorized.css index 39945f13..ea1b6b89 100644 --- a/classic/css/buttons/icons_custom_icons_fx12_colorized.css +++ b/classic/css/buttons/icons_custom_icons_fx12_colorized.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_fx2.css b/classic/css/buttons/icons_custom_icons_fx2.css index 624b6505..b727b43c 100644 --- a/classic/css/buttons/icons_custom_icons_fx2.css +++ b/classic/css/buttons/icons_custom_icons_fx2.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_fx3.css b/classic/css/buttons/icons_custom_icons_fx3.css index 0c573d8a..bbfb59b9 100644 --- a/classic/css/buttons/icons_custom_icons_fx3.css +++ b/classic/css/buttons/icons_custom_icons_fx3.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_fx3strata.css b/classic/css/buttons/icons_custom_icons_fx3strata.css index ef33e869..9c75d457 100644 --- a/classic/css/buttons/icons_custom_icons_fx3strata.css +++ b/classic/css/buttons/icons_custom_icons_fx3strata.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_fx45.css b/classic/css/buttons/icons_custom_icons_fx45.css index 4cb3827c..ab6b7dc7 100644 --- a/classic/css/buttons/icons_custom_icons_fx45.css +++ b/classic/css/buttons/icons_custom_icons_fx45.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_fx45_inverted.css b/classic/css/buttons/icons_custom_icons_fx45_inverted.css index 1783bcc2..047c1b4b 100644 --- a/classic/css/buttons/icons_custom_icons_fx45_inverted.css +++ b/classic/css/buttons/icons_custom_icons_fx45_inverted.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_ie6.css b/classic/css/buttons/icons_custom_icons_ie6.css index 2d6b290a..56b592aa 100644 --- a/classic/css/buttons/icons_custom_icons_ie6.css +++ b/classic/css/buttons/icons_custom_icons_ie6.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_kempelton.css b/classic/css/buttons/icons_custom_icons_kempelton.css index 750fa972..662b948b 100644 --- a/classic/css/buttons/icons_custom_icons_kempelton.css +++ b/classic/css/buttons/icons_custom_icons_kempelton.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_noia.css b/classic/css/buttons/icons_custom_icons_noia.css index f80fdec0..6b85de5f 100644 --- a/classic/css/buttons/icons_custom_icons_noia.css +++ b/classic/css/buttons/icons_custom_icons_noia.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_old_chrome.css b/classic/css/buttons/icons_custom_icons_old_chrome.css index 31dc3e5b..e81e1edd 100644 --- a/classic/css/buttons/icons_custom_icons_old_chrome.css +++ b/classic/css/buttons/icons_custom_icons_old_chrome.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_old_osx.css b/classic/css/buttons/icons_custom_icons_old_osx.css index 7c242807..763f3bd4 100644 --- a/classic/css/buttons/icons_custom_icons_old_osx.css +++ b/classic/css/buttons/icons_custom_icons_old_osx.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_seamonkey.css b/classic/css/buttons/icons_custom_icons_seamonkey.css index b7fa5637..fa88a915 100644 --- a/classic/css/buttons/icons_custom_icons_seamonkey.css +++ b/classic/css/buttons/icons_custom_icons_seamonkey.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_custom_icons_tango.css b/classic/css/buttons/icons_custom_icons_tango.css index c72c2aa2..7f7a5b76 100644 --- a/classic/css/buttons/icons_custom_icons_tango.css +++ b/classic/css/buttons/icons_custom_icons_tango.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/icons_white_icons.css b/classic/css/buttons/icons_white_icons.css index 5e1bb9c5..ffccbcd9 100644 --- a/classic/css/buttons/icons_white_icons.css +++ b/classic/css/buttons/icons_white_icons.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/buttons/zoom_buttons_hide_reset.css b/classic/css/buttons/zoom_buttons_hide_reset.css index 8686cd4a..9d2abecb 100644 --- a/classic/css/buttons/zoom_buttons_hide_reset.css +++ b/classic/css/buttons/zoom_buttons_hide_reset.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/bookmark_icons_colorized.css b/classic/css/generalui/bookmark_icons_colorized.css index b30347a1..39442acd 100644 --- a/classic/css/generalui/bookmark_icons_colorized.css +++ b/classic/css/generalui/bookmark_icons_colorized.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/bookmarks_smaller_more_bookmarks_icon.css b/classic/css/generalui/bookmarks_smaller_more_bookmarks_icon.css index 7928b2ee..6195d20a 100644 --- a/classic/css/generalui/bookmarks_smaller_more_bookmarks_icon.css +++ b/classic/css/generalui/bookmarks_smaller_more_bookmarks_icon.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/close_icon_firefox3.css b/classic/css/generalui/close_icon_firefox3.css index c7f4cb2e..8db4fff8 100644 --- a/classic/css/generalui/close_icon_firefox3.css +++ b/classic/css/generalui/close_icon_firefox3.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/close_icon_gchrome.css b/classic/css/generalui/close_icon_gchrome.css index 61cd01d3..8fa7143d 100644 --- a/classic/css/generalui/close_icon_gchrome.css +++ b/classic/css/generalui/close_icon_gchrome.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/close_icon_red.css b/classic/css/generalui/close_icon_red.css index f76d6330..0c254ad8 100644 --- a/classic/css/generalui/close_icon_red.css +++ b/classic/css/generalui/close_icon_red.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/close_icon_windows10.css b/classic/css/generalui/close_icon_windows10.css index 79c192d3..3033f8a0 100644 --- a/classic/css/generalui/close_icon_windows10.css +++ b/classic/css/generalui/close_icon_windows10.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/close_icon_windows10inverted.css b/classic/css/generalui/close_icon_windows10inverted.css index d1e57f88..d82fc6e2 100644 --- a/classic/css/generalui/close_icon_windows10inverted.css +++ b/classic/css/generalui/close_icon_windows10inverted.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/close_icon_windows10red.css b/classic/css/generalui/close_icon_windows10red.css index b407ab1c..15d06734 100644 --- a/classic/css/generalui/close_icon_windows10red.css +++ b/classic/css/generalui/close_icon_windows10red.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/close_icon_windows10redv2.css b/classic/css/generalui/close_icon_windows10redv2.css index 84a3cd5b..2d4c6c12 100644 --- a/classic/css/generalui/close_icon_windows10redv2.css +++ b/classic/css/generalui/close_icon_windows10redv2.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/close_icon_windows7.css b/classic/css/generalui/close_icon_windows7.css index 1be26f77..5102e422 100644 --- a/classic/css/generalui/close_icon_windows7.css +++ b/classic/css/generalui/close_icon_windows7.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/close_icon_windows7inverted.css b/classic/css/generalui/close_icon_windows7inverted.css index 7fe1c963..2a33efd4 100644 --- a/classic/css/generalui/close_icon_windows7inverted.css +++ b/classic/css/generalui/close_icon_windows7inverted.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/close_icon_windows7v2.css b/classic/css/generalui/close_icon_windows7v2.css index b31ef8f8..c0868eef 100644 --- a/classic/css/generalui/close_icon_windows7v2.css +++ b/classic/css/generalui/close_icon_windows7v2.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/context_bfrsb_icons_colorized.css b/classic/css/generalui/context_bfrsb_icons_colorized.css index febf475c..f4f34279 100644 --- a/classic/css/generalui/context_bfrsb_icons_colorized.css +++ b/classic/css/generalui/context_bfrsb_icons_colorized.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOS.css b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOS.css index 859a13ff..2cc61d7b 100644 --- a/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOS.css +++ b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOS.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOSv2.css b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOSv2.css index b36a500a..4077c0b3 100644 --- a/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOSv2.css +++ b/classic/css/generalui/context_bfrsb_labels_with_and_without_icons_Lin_macOSv2.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/context_bfrsb_labels_with_icons.css b/classic/css/generalui/context_bfrsb_labels_with_icons.css index e2d268de..dce5e0ef 100644 --- a/classic/css/generalui/context_bfrsb_labels_with_icons.css +++ b/classic/css/generalui/context_bfrsb_labels_with_icons.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/context_bfrsb_labels_without_icons.css b/classic/css/generalui/context_bfrsb_labels_without_icons.css index 525defeb..f5aef154 100644 --- a/classic/css/generalui/context_bfrsb_labels_without_icons.css +++ b/classic/css/generalui/context_bfrsb_labels_without_icons.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/findbar_on_bottom_close_at_findbars_start.css b/classic/css/generalui/findbar_on_bottom_close_at_findbars_start.css index 02b407e4..e57f57a7 100644 --- a/classic/css/generalui/findbar_on_bottom_close_at_findbars_start.css +++ b/classic/css/generalui/findbar_on_bottom_close_at_findbars_start.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/findbar_on_top.css b/classic/css/generalui/findbar_on_top.css index 1bdfcd06..82fe70dd 100644 --- a/classic/css/generalui/findbar_on_top.css +++ b/classic/css/generalui/findbar_on_top.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/findbar_on_top_close_at_findbars_start.css b/classic/css/generalui/findbar_on_top_close_at_findbars_start.css index 89d05549..646efa80 100644 --- a/classic/css/generalui/findbar_on_top_close_at_findbars_start.css +++ b/classic/css/generalui/findbar_on_top_close_at_findbars_start.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/findbar_show_full_quickfindbar.css b/classic/css/generalui/findbar_show_full_quickfindbar.css index 5ca20f89..79454784 100644 --- a/classic/css/generalui/findbar_show_full_quickfindbar.css +++ b/classic/css/generalui/findbar_show_full_quickfindbar.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/flex_space_on_navbar_replace_with_separator.css b/classic/css/generalui/flex_space_on_navbar_replace_with_separator.css index 3e7bc0d3..83dbe87e 100644 --- a/classic/css/generalui/flex_space_on_navbar_replace_with_separator.css +++ b/classic/css/generalui/flex_space_on_navbar_replace_with_separator.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/increase_ui_font_size.css b/classic/css/generalui/increase_ui_font_size.css index c60c7e48..e832ad0b 100644 --- a/classic/css/generalui/increase_ui_font_size.css +++ b/classic/css/generalui/increase_ui_font_size.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/menubar_bookmarks_popup_bookmark_page_item_hidden.css b/classic/css/generalui/menubar_bookmarks_popup_bookmark_page_item_hidden.css index 7e15b706..3e1ffba7 100644 --- a/classic/css/generalui/menubar_bookmarks_popup_bookmark_page_item_hidden.css +++ b/classic/css/generalui/menubar_bookmarks_popup_bookmark_page_item_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/menubar_bookmarks_popup_other_item_hidden.css b/classic/css/generalui/menubar_bookmarks_popup_other_item_hidden.css index 1099300e..9347725a 100644 --- a/classic/css/generalui/menubar_bookmarks_popup_other_item_hidden.css +++ b/classic/css/generalui/menubar_bookmarks_popup_other_item_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/menubar_bookmarks_popup_subscribe_item_hidden.css b/classic/css/generalui/menubar_bookmarks_popup_subscribe_item_hidden.css index f1e5eab3..b2acf3f3 100644 --- a/classic/css/generalui/menubar_bookmarks_popup_subscribe_item_hidden.css +++ b/classic/css/generalui/menubar_bookmarks_popup_subscribe_item_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/menubar_bookmarks_popup_toolbar_item_hidden.css b/classic/css/generalui/menubar_bookmarks_popup_toolbar_item_hidden.css index 7658e985..a96dd735 100644 --- a/classic/css/generalui/menubar_bookmarks_popup_toolbar_item_hidden.css +++ b/classic/css/generalui/menubar_bookmarks_popup_toolbar_item_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/oldsearch.css b/classic/css/generalui/oldsearch.css index d359a1af..46bb2295 100644 --- a/classic/css/generalui/oldsearch.css +++ b/classic/css/generalui/oldsearch.css @@ -1,10 +1,6 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ************************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **********/ -/* by Aris (aris-addons@gmx.net)*****************************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ********************************************/ -/************************************************************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ /* custom settings for 'old search' @@ -24,11 +20,11 @@ } searchbar { - -moz-binding: url("./../../xml/oldsearch_fx57.xml#searchbar") !important; + -moz-binding: url("./../../xml/oldsearch.xml#searchbar") !important; } searchbar .searchbar-textbox { - -moz-binding: url("./../../xml/oldsearch_fx57.xml#searchbar-textbox") !important; + -moz-binding: url("./../../xml/oldsearch.xml#searchbar-textbox") !important; } .searchbar-engine-button { diff --git a/classic/css/generalui/overflow_menu_horizontal_remove_text.css b/classic/css/generalui/overflow_menu_horizontal_remove_text.css index 8f4eaae6..8cc409df 100644 --- a/classic/css/generalui/overflow_menu_horizontal_remove_text.css +++ b/classic/css/generalui/overflow_menu_horizontal_remove_text.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/overflow_menu_remove_text.css b/classic/css/generalui/overflow_menu_remove_text.css index e1eaf093..22aab4d6 100644 --- a/classic/css/generalui/overflow_menu_remove_text.css +++ b/classic/css/generalui/overflow_menu_remove_text.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/popup_animation_fade_time_reduced.css b/classic/css/generalui/popup_animation_fade_time_reduced.css index 513aae03..f120cc04 100644 --- a/classic/css/generalui/popup_animation_fade_time_reduced.css +++ b/classic/css/generalui/popup_animation_fade_time_reduced.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/private_mode_indicator_hidden.css b/classic/css/generalui/private_mode_indicator_hidden.css index e33e4d84..4c840b14 100644 --- a/classic/css/generalui/private_mode_indicator_hidden.css +++ b/classic/css/generalui/private_mode_indicator_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/searchbar_glassplus_indicator_hidden.css b/classic/css/generalui/searchbar_glassplus_indicator_hidden.css index 3c51f11a..7072d2c4 100644 --- a/classic/css/generalui/searchbar_glassplus_indicator_hidden.css +++ b/classic/css/generalui/searchbar_glassplus_indicator_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/searchbar_go_button_hidden.css b/classic/css/generalui/searchbar_go_button_hidden.css index dbdca9d3..478e847b 100644 --- a/classic/css/generalui/searchbar_go_button_hidden.css +++ b/classic/css/generalui/searchbar_go_button_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/searchbar_popup_engines_hidden.css b/classic/css/generalui/searchbar_popup_engines_hidden.css index 1ad71ec3..117f588f 100644 --- a/classic/css/generalui/searchbar_popup_engines_hidden.css +++ b/classic/css/generalui/searchbar_popup_engines_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/searchbar_popup_engines_show_labels.css b/classic/css/generalui/searchbar_popup_engines_show_labels.css index 3bed54ae..fb87cece 100644 --- a/classic/css/generalui/searchbar_popup_engines_show_labels.css +++ b/classic/css/generalui/searchbar_popup_engines_show_labels.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/send_to_device_menuitems_hidden.css b/classic/css/generalui/send_to_device_menuitems_hidden.css index 24c52051..77021e34 100644 --- a/classic/css/generalui/send_to_device_menuitems_hidden.css +++ b/classic/css/generalui/send_to_device_menuitems_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/sidebar_appearance_dark.css b/classic/css/generalui/sidebar_appearance_dark.css index f45b2feb..f89001d8 100644 --- a/classic/css/generalui/sidebar_appearance_dark.css +++ b/classic/css/generalui/sidebar_appearance_dark.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/sidebar_appearance_lwtheme_bright.css b/classic/css/generalui/sidebar_appearance_lwtheme_bright.css index 81d27ca6..d42859e5 100644 --- a/classic/css/generalui/sidebar_appearance_lwtheme_bright.css +++ b/classic/css/generalui/sidebar_appearance_lwtheme_bright.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/sidebar_appearance_lwtheme_dark.css b/classic/css/generalui/sidebar_appearance_lwtheme_dark.css index 5910164c..0aa6a043 100644 --- a/classic/css/generalui/sidebar_appearance_lwtheme_dark.css +++ b/classic/css/generalui/sidebar_appearance_lwtheme_dark.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/sidebar_header_icons_colorized.css b/classic/css/generalui/sidebar_header_icons_colorized.css index f9973209..33995cfe 100644 --- a/classic/css/generalui/sidebar_header_icons_colorized.css +++ b/classic/css/generalui/sidebar_header_icons_colorized.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/sidebar_header_lwtheme.css b/classic/css/generalui/sidebar_header_lwtheme.css index db7d72ad..88e5cdf0 100644 --- a/classic/css/generalui/sidebar_header_lwtheme.css +++ b/classic/css/generalui/sidebar_header_lwtheme.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/generalui/sidebar_width_unrestricted.css b/classic/css/generalui/sidebar_width_unrestricted.css index 1b9df4dc..9e86c41e 100644 --- a/classic/css/generalui/sidebar_width_unrestricted.css +++ b/classic/css/generalui/sidebar_width_unrestricted.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/ac_popup_classic_with_two_lines.css b/classic/css/locationbar/ac_popup_classic_with_two_lines.css index 515a2185..29079710 100644 --- a/classic/css/locationbar/ac_popup_classic_with_two_lines.css +++ b/classic/css/locationbar/ac_popup_classic_with_two_lines.css @@ -1,19 +1,15 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ @-moz-document url(chrome://browser/content/browser.xul) { #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] { - -moz-binding: url("./../../xml/urlbarBindings_fx57.xml#urlbar-rich-result-popup") !important; + -moz-binding: url("./../../xml/urlbarBindings.xml#urlbar-rich-result-popup") !important; } #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { - -moz-binding: url("./../../xml/urlbarBindings_fx57.xml#autocomplete-richlistitem") !important; + -moz-binding: url("./../../xml/urlbarBindings.xml#autocomplete-richlistitem") !important; } #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem *:not(.ac-url), diff --git a/classic/css/locationbar/ac_popup_custom_height.css b/classic/css/locationbar/ac_popup_custom_height.css index c6039f5a..cb4b99c1 100644 --- a/classic/css/locationbar/ac_popup_custom_height.css +++ b/classic/css/locationbar/ac_popup_custom_height.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/ac_popup_item_title_hidden.css b/classic/css/locationbar/ac_popup_item_title_hidden.css index cf5e6d9e..e6b9d298 100644 --- a/classic/css/locationbar/ac_popup_item_title_hidden.css +++ b/classic/css/locationbar/ac_popup_item_title_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/ac_popup_item_title_visible_on_hover_only.css b/classic/css/locationbar/ac_popup_item_title_visible_on_hover_only.css index c7eb78b4..5ade2f7f 100644 --- a/classic/css/locationbar/ac_popup_item_title_visible_on_hover_only.css +++ b/classic/css/locationbar/ac_popup_item_title_visible_on_hover_only.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/ac_popup_keysearch_bold.css b/classic/css/locationbar/ac_popup_keysearch_bold.css index f0930ca4..4f4d5280 100644 --- a/classic/css/locationbar/ac_popup_keysearch_bold.css +++ b/classic/css/locationbar/ac_popup_keysearch_bold.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/ac_popup_keysearch_underline.css b/classic/css/locationbar/ac_popup_keysearch_underline.css index a313d787..298ef307 100644 --- a/classic/css/locationbar/ac_popup_keysearch_underline.css +++ b/classic/css/locationbar/ac_popup_keysearch_underline.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/ac_popup_result_highlighting_aero.css b/classic/css/locationbar/ac_popup_result_highlighting_aero.css index 361e9381..0f48b5bc 100644 --- a/classic/css/locationbar/ac_popup_result_highlighting_aero.css +++ b/classic/css/locationbar/ac_popup_result_highlighting_aero.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/ac_popup_result_separator.css b/classic/css/locationbar/ac_popup_result_separator.css index 15bd073b..14590635 100644 --- a/classic/css/locationbar/ac_popup_result_separator.css +++ b/classic/css/locationbar/ac_popup_result_separator.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/ac_popup_searchwith_and_visit_items_hidden.css b/classic/css/locationbar/ac_popup_searchwith_and_visit_items_hidden.css index 1041d3ba..37b024ee 100644 --- a/classic/css/locationbar/ac_popup_searchwith_and_visit_items_hidden.css +++ b/classic/css/locationbar/ac_popup_searchwith_and_visit_items_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css b/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css index 4fcc649b..7cac5370 100644 --- a/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css +++ b/classic/css/locationbar/ac_popup_title_and_url_50percent_width.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css b/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css index e01307f4..648cc644 100644 --- a/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css +++ b/classic/css/locationbar/ac_popup_url_and_title_50percent_width.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/background_color_dark.css b/classic/css/locationbar/background_color_dark.css index eed610ca..c50160f0 100644 --- a/classic/css/locationbar/background_color_dark.css +++ b/classic/css/locationbar/background_color_dark.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/compact_mode_reduce_fontsize.css b/classic/css/locationbar/compact_mode_reduce_fontsize.css index e7534033..44610f44 100644 --- a/classic/css/locationbar/compact_mode_reduce_fontsize.css +++ b/classic/css/locationbar/compact_mode_reduce_fontsize.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/dropmarker_at_the_end.css b/classic/css/locationbar/dropmarker_at_the_end.css index 7791ad0e..bed44389 100644 --- a/classic/css/locationbar/dropmarker_at_the_end.css +++ b/classic/css/locationbar/dropmarker_at_the_end.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/dropmarker_visible.css b/classic/css/locationbar/dropmarker_visible.css index 0fc14e04..3bb33b76 100644 --- a/classic/css/locationbar/dropmarker_visible.css +++ b/classic/css/locationbar/dropmarker_visible.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/go_button_in_location_bar_hidden.css b/classic/css/locationbar/go_button_in_location_bar_hidden.css index e872b6bd..dfb1e147 100644 --- a/classic/css/locationbar/go_button_in_location_bar_hidden.css +++ b/classic/css/locationbar/go_button_in_location_bar_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/icons_colorized.css b/classic/css/locationbar/icons_colorized.css index ae442216..55c9959a 100644 --- a/classic/css/locationbar/icons_colorized.css +++ b/classic/css/locationbar/icons_colorized.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/identitybox_colors.css b/classic/css/locationbar/identitybox_colors.css index 9ec8fcd7..c099f0dc 100644 --- a/classic/css/locationbar/identitybox_colors.css +++ b/classic/css/locationbar/identitybox_colors.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/identitybox_labels_hidden.css b/classic/css/locationbar/identitybox_labels_hidden.css index 2299ebd6..63629628 100644 --- a/classic/css/locationbar/identitybox_labels_hidden.css +++ b/classic/css/locationbar/identitybox_labels_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/identitybox_padlock_icon_classic.css b/classic/css/locationbar/identitybox_padlock_icon_classic.css index 3c0d4b70..95c0f148 100644 --- a/classic/css/locationbar/identitybox_padlock_icon_classic.css +++ b/classic/css/locationbar/identitybox_padlock_icon_classic.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/identitybox_padlock_icon_classic2.css b/classic/css/locationbar/identitybox_padlock_icon_classic2.css index f529e73c..9bea0596 100644 --- a/classic/css/locationbar/identitybox_padlock_icon_classic2.css +++ b/classic/css/locationbar/identitybox_padlock_icon_classic2.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/identitybox_padlock_icon_hidden.css b/classic/css/locationbar/identitybox_padlock_icon_hidden.css index a1db1f27..5dc2dd30 100644 --- a/classic/css/locationbar/identitybox_padlock_icon_hidden.css +++ b/classic/css/locationbar/identitybox_padlock_icon_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/identitybox_padlock_icon_modern.css b/classic/css/locationbar/identitybox_padlock_icon_modern.css index 118071e0..d71407ab 100644 --- a/classic/css/locationbar/identitybox_padlock_icon_modern.css +++ b/classic/css/locationbar/identitybox_padlock_icon_modern.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/identitybox_padlock_icon_modern2.css b/classic/css/locationbar/identitybox_padlock_icon_modern2.css index 8769a44b..e6f72427 100644 --- a/classic/css/locationbar/identitybox_padlock_icon_modern2.css +++ b/classic/css/locationbar/identitybox_padlock_icon_modern2.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/identitybox_replace_i_icon_with_globe.css b/classic/css/locationbar/identitybox_replace_i_icon_with_globe.css index b9178494..ab1d865a 100644 --- a/classic/css/locationbar/identitybox_replace_i_icon_with_globe.css +++ b/classic/css/locationbar/identitybox_replace_i_icon_with_globe.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/locationbar_adjustments.css b/classic/css/locationbar/locationbar_adjustments.css index b9b56083..90ae4e6f 100644 --- a/classic/css/locationbar/locationbar_adjustments.css +++ b/classic/css/locationbar/locationbar_adjustments.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/locationbar_border_roundness.css b/classic/css/locationbar/locationbar_border_roundness.css index 214e86d4..cd9400b4 100644 --- a/classic/css/locationbar/locationbar_border_roundness.css +++ b/classic/css/locationbar/locationbar_border_roundness.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/locationbar_reduce_height.css b/classic/css/locationbar/locationbar_reduce_height.css index 6d035300..7486e993 100644 --- a/classic/css/locationbar/locationbar_reduce_height.css +++ b/classic/css/locationbar/locationbar_reduce_height.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/pageaction_button_in_location_bar_hidden.css b/classic/css/locationbar/pageaction_button_in_location_bar_hidden.css index 538ec289..a2e4aa9e 100644 --- a/classic/css/locationbar/pageaction_button_in_location_bar_hidden.css +++ b/classic/css/locationbar/pageaction_button_in_location_bar_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/pageaction_button_rotated_and_last_pageaction_button.css b/classic/css/locationbar/pageaction_button_rotated_and_last_pageaction_button.css index b80a490b..42809ce7 100644 --- a/classic/css/locationbar/pageaction_button_rotated_and_last_pageaction_button.css +++ b/classic/css/locationbar/pageaction_button_rotated_and_last_pageaction_button.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/pageaction_separator_in_location_bar_hidden.css b/classic/css/locationbar/pageaction_separator_in_location_bar_hidden.css index 557655f3..5664103d 100644 --- a/classic/css/locationbar/pageaction_separator_in_location_bar_hidden.css +++ b/classic/css/locationbar/pageaction_separator_in_location_bar_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/popup_blocked_button_hidden.css b/classic/css/locationbar/popup_blocked_button_hidden.css index f4315abb..c13983da 100644 --- a/classic/css/locationbar/popup_blocked_button_hidden.css +++ b/classic/css/locationbar/popup_blocked_button_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/reader_alternative_icon.css b/classic/css/locationbar/reader_alternative_icon.css index 7579ccff..bf1e7557 100644 --- a/classic/css/locationbar/reader_alternative_icon.css +++ b/classic/css/locationbar/reader_alternative_icon.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/starbutton_alternative_icon.css b/classic/css/locationbar/starbutton_alternative_icon.css index 729b40c4..ecac058e 100644 --- a/classic/css/locationbar/starbutton_alternative_icon.css +++ b/classic/css/locationbar/starbutton_alternative_icon.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/starbutton_is_last_pageaction_button.css b/classic/css/locationbar/starbutton_is_last_pageaction_button.css index 1f657b3b..7a27d4d1 100644 --- a/classic/css/locationbar/starbutton_is_last_pageaction_button.css +++ b/classic/css/locationbar/starbutton_is_last_pageaction_button.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/locationbar/zoom_button_hidden.css b/classic/css/locationbar/zoom_button_hidden.css index 24dca2e8..707b4650 100644 --- a/classic/css/locationbar/zoom_button_hidden.css +++ b/classic/css/locationbar/zoom_button_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/alltabs_button_always_visible.css b/classic/css/tabs/alltabs_button_always_visible.css index 0fb7c59c..01b4e515 100644 --- a/classic/css/tabs/alltabs_button_always_visible.css +++ b/classic/css/tabs/alltabs_button_always_visible.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/classic_squared_tabs.css b/classic/css/tabs/classic_squared_tabs.css index 93242571..5489d39d 100644 --- a/classic/css/tabs/classic_squared_tabs.css +++ b/classic/css/tabs/classic_squared_tabs.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/classic_squared_tabs_australized.css b/classic/css/tabs/classic_squared_tabs_australized.css index a3fea6d1..c5e432a2 100644 --- a/classic/css/tabs/classic_squared_tabs_australized.css +++ b/classic/css/tabs/classic_squared_tabs_australized.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/classic_squared_tabs_fully_squared.css b/classic/css/tabs/classic_squared_tabs_fully_squared.css index a2c6b9fb..ca87066c 100644 --- a/classic/css/tabs/classic_squared_tabs_fully_squared.css +++ b/classic/css/tabs/classic_squared_tabs_fully_squared.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/custom_colors_for_squared_tabs.css b/classic/css/tabs/custom_colors_for_squared_tabs.css index 44b49f20..1719b32a 100644 --- a/classic/css/tabs/custom_colors_for_squared_tabs.css +++ b/classic/css/tabs/custom_colors_for_squared_tabs.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/custom_colors_for_squared_tabs_australized.css b/classic/css/tabs/custom_colors_for_squared_tabs_australized.css index 3de9bc1a..23470d4e 100644 --- a/classic/css/tabs/custom_colors_for_squared_tabs_australized.css +++ b/classic/css/tabs/custom_colors_for_squared_tabs_australized.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/default_tabs_no_tab_line.css b/classic/css/tabs/default_tabs_no_tab_line.css index 58f207e7..a8fbc862 100644 --- a/classic/css/tabs/default_tabs_no_tab_line.css +++ b/classic/css/tabs/default_tabs_no_tab_line.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/default_tabs_round_top_borders.css b/classic/css/tabs/default_tabs_round_top_borders.css index 7de7ab4c..83c29eb0 100644 --- a/classic/css/tabs/default_tabs_round_top_borders.css +++ b/classic/css/tabs/default_tabs_round_top_borders.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/default_tabs_tab_background_appearance.css b/classic/css/tabs/default_tabs_tab_background_appearance.css index e00fdf3a..a5b993be 100644 --- a/classic/css/tabs/default_tabs_tab_background_appearance.css +++ b/classic/css/tabs/default_tabs_tab_background_appearance.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/default_tabs_tab_border.css b/classic/css/tabs/default_tabs_tab_border.css index 7a2a6b53..f77a31b8 100644 --- a/classic/css/tabs/default_tabs_tab_border.css +++ b/classic/css/tabs/default_tabs_tab_border.css @@ -1,12 +1,7 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ - .tabbrowser-tab { border-top: 1px solid var(--tabs-border) !important; border-left: 1px solid var(--tabs-border) !important; diff --git a/classic/css/tabs/default_tabs_tab_line_purple_in_private_mode.css b/classic/css/tabs/default_tabs_tab_line_purple_in_private_mode.css index caeb568e..0033d91f 100644 --- a/classic/css/tabs/default_tabs_tab_line_purple_in_private_mode.css +++ b/classic/css/tabs/default_tabs_tab_line_purple_in_private_mode.css @@ -1,11 +1,6 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ - #main-window[privatebrowsingmode=temporary] .tabbrowser-tab[selected] .tab-line { background-color: purple !important; } diff --git a/classic/css/tabs/missing_tab_favicon_restored_default.css b/classic/css/tabs/missing_tab_favicon_restored_default.css index 8753be90..4127b296 100644 --- a/classic/css/tabs/missing_tab_favicon_restored_default.css +++ b/classic/css/tabs/missing_tab_favicon_restored_default.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/missing_tab_favicon_restored_dotted.css b/classic/css/tabs/missing_tab_favicon_restored_dotted.css index 75fb1385..54eb7704 100644 --- a/classic/css/tabs/missing_tab_favicon_restored_dotted.css +++ b/classic/css/tabs/missing_tab_favicon_restored_dotted.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/missing_tab_favicon_restored_dotted_white.css b/classic/css/tabs/missing_tab_favicon_restored_dotted_white.css index 19c11d41..f8a8993b 100644 --- a/classic/css/tabs/missing_tab_favicon_restored_dotted_white.css +++ b/classic/css/tabs/missing_tab_favicon_restored_dotted_white.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/missing_tab_favicon_restored_globe_v2.css b/classic/css/tabs/missing_tab_favicon_restored_globe_v2.css index 8267df67..42c7dabd 100644 --- a/classic/css/tabs/missing_tab_favicon_restored_globe_v2.css +++ b/classic/css/tabs/missing_tab_favicon_restored_globe_v2.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/missing_tab_favicon_restored_sheet.css b/classic/css/tabs/missing_tab_favicon_restored_sheet.css index 78846a40..4fa5bb67 100644 --- a/classic/css/tabs/missing_tab_favicon_restored_sheet.css +++ b/classic/css/tabs/missing_tab_favicon_restored_sheet.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/pinnedtab_empty_favicon_hidden.css b/classic/css/tabs/pinnedtab_empty_favicon_hidden.css index e101e927..b08cadf5 100644 --- a/classic/css/tabs/pinnedtab_empty_favicon_hidden.css +++ b/classic/css/tabs/pinnedtab_empty_favicon_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_close_always_visible.css b/classic/css/tabs/tab_close_always_visible.css index 95c08677..65941b6a 100644 --- a/classic/css/tabs/tab_close_always_visible.css +++ b/classic/css/tabs/tab_close_always_visible.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_close_at_tabs_start.css b/classic/css/tabs/tab_close_at_tabs_start.css index 38656236..8c5712ae 100644 --- a/classic/css/tabs/tab_close_at_tabs_start.css +++ b/classic/css/tabs/tab_close_at_tabs_start.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_close_hidden.css b/classic/css/tabs/tab_close_hidden.css index c3967708..03e74b9b 100644 --- a/classic/css/tabs/tab_close_hidden.css +++ b/classic/css/tabs/tab_close_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_close_hidden_for_only_one_visible_tab.css b/classic/css/tabs/tab_close_hidden_for_only_one_visible_tab.css index af153048..49fda312 100644 --- a/classic/css/tabs/tab_close_hidden_for_only_one_visible_tab.css +++ b/classic/css/tabs/tab_close_hidden_for_only_one_visible_tab.css @@ -1,12 +1,7 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ - .tabbrowser-tab[first-visible-tab][last-visible-tab] .tab-close-button { visibility: collapse !important; } diff --git a/classic/css/tabs/tab_close_icon_size.css b/classic/css/tabs/tab_close_icon_size.css index 4ac9352d..f02f0942 100644 --- a/classic/css/tabs/tab_close_icon_size.css +++ b/classic/css/tabs/tab_close_icon_size.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_close_on_active_tab_only.css b/classic/css/tabs/tab_close_on_active_tab_only.css index 075b4d6a..b8ab4691 100644 --- a/classic/css/tabs/tab_close_on_active_tab_only.css +++ b/classic/css/tabs/tab_close_on_active_tab_only.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_close_show_on_hover_only.css b/classic/css/tabs/tab_close_show_on_hover_only.css index 50284ba5..575ede38 100644 --- a/classic/css/tabs/tab_close_show_on_hover_only.css +++ b/classic/css/tabs/tab_close_show_on_hover_only.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_context_menuitems_visibility.css b/classic/css/tabs/tab_context_menuitems_visibility.css index 825f63f9..506e3181 100644 --- a/classic/css/tabs/tab_context_menuitems_visibility.css +++ b/classic/css/tabs/tab_context_menuitems_visibility.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_icon_colors.css b/classic/css/tabs/tab_icon_colors.css index cae703bf..1b12c6b9 100644 --- a/classic/css/tabs/tab_icon_colors.css +++ b/classic/css/tabs/tab_icon_colors.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_icon_inactive_tabs_lower_opacity.css b/classic/css/tabs/tab_icon_inactive_tabs_lower_opacity.css index 5a7ea135..327e946c 100644 --- a/classic/css/tabs/tab_icon_inactive_tabs_lower_opacity.css +++ b/classic/css/tabs/tab_icon_inactive_tabs_lower_opacity.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_maxwidth.css b/classic/css/tabs/tab_maxwidth.css index 500cbd77..53b08cfd 100644 --- a/classic/css/tabs/tab_maxwidth.css +++ b/classic/css/tabs/tab_maxwidth.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_throbber_blue.css b/classic/css/tabs/tab_throbber_blue.css index e8a3ca99..7161420c 100644 --- a/classic/css/tabs/tab_throbber_blue.css +++ b/classic/css/tabs/tab_throbber_blue.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_throbber_blue_fx56.css b/classic/css/tabs/tab_throbber_blue_fx56.css index b92488db..a15a4a22 100644 --- a/classic/css/tabs/tab_throbber_blue_fx56.css +++ b/classic/css/tabs/tab_throbber_blue_fx56.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_throbber_green.css b/classic/css/tabs/tab_throbber_green.css index 7d7dfc80..227bd960 100644 --- a/classic/css/tabs/tab_throbber_green.css +++ b/classic/css/tabs/tab_throbber_green.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_throbber_grey_classic.css b/classic/css/tabs/tab_throbber_grey_classic.css index 462522c1..394db055 100644 --- a/classic/css/tabs/tab_throbber_grey_classic.css +++ b/classic/css/tabs/tab_throbber_grey_classic.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_throbber_orange_ubuntu.css b/classic/css/tabs/tab_throbber_orange_ubuntu.css index d5203aeb..4c489201 100644 --- a/classic/css/tabs/tab_throbber_orange_ubuntu.css +++ b/classic/css/tabs/tab_throbber_orange_ubuntu.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_title_centered.css b/classic/css/tabs/tab_title_centered.css index bec38e88..70b2d500 100644 --- a/classic/css/tabs/tab_title_centered.css +++ b/classic/css/tabs/tab_title_centered.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_title_in_firefox_titlebar.css b/classic/css/tabs/tab_title_in_firefox_titlebar.css index 51e2a99f..eb52de1d 100644 --- a/classic/css/tabs/tab_title_in_firefox_titlebar.css +++ b/classic/css/tabs/tab_title_in_firefox_titlebar.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_title_in_firefox_titlebar_centered.css b/classic/css/tabs/tab_title_in_firefox_titlebar_centered.css index d5eee2a5..5c031f65 100644 --- a/classic/css/tabs/tab_title_in_firefox_titlebar_centered.css +++ b/classic/css/tabs/tab_title_in_firefox_titlebar_centered.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_title_left.css b/classic/css/tabs/tab_title_left.css index cdf69832..1bf2f31c 100644 --- a/classic/css/tabs/tab_title_left.css +++ b/classic/css/tabs/tab_title_left.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_title_right.css b/classic/css/tabs/tab_title_right.css index 8db407e2..e164a910 100644 --- a/classic/css/tabs/tab_title_right.css +++ b/classic/css/tabs/tab_title_right.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tab_titles_remove_blur.css b/classic/css/tabs/tab_titles_remove_blur.css index 4b92bf6f..a025e244 100644 --- a/classic/css/tabs/tab_titles_remove_blur.css +++ b/classic/css/tabs/tab_titles_remove_blur.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tabs_below_main_content.css b/classic/css/tabs/tabs_below_main_content.css index 9d5abb70..be4900da 100644 --- a/classic/css/tabs/tabs_below_main_content.css +++ b/classic/css/tabs/tabs_below_main_content.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tabs_below_navigation_toolbar.css b/classic/css/tabs/tabs_below_navigation_toolbar.css index 0905fffd..a9195090 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon.css b/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon.css index b26576bc..53e79bf3 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton.css b/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton.css index 9e06ea23..c42159a6 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton_icon_only.css b/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton_icon_only.css index 5a2aefbb..2d5687a4 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton_icon_only.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar_higher_navbar_positon_with_appbutton_icon_only.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_macOS_fix.css b/classic/css/tabs/tabs_below_navigation_toolbar_macOS_fix.css index eb6e63ae..238f0797 100644 --- a/classic/css/tabs/tabs_below_navigation_toolbar_macOS_fix.css +++ b/classic/css/tabs/tabs_below_navigation_toolbar_macOS_fix.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tabs_below_titlebar_above_navigation_toolbar.css b/classic/css/tabs/tabs_below_titlebar_above_navigation_toolbar.css index 4bd4b086..6de474cf 100644 --- a/classic/css/tabs/tabs_below_titlebar_above_navigation_toolbar.css +++ b/classic/css/tabs/tabs_below_titlebar_above_navigation_toolbar.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tabs_multiple_lines.css b/classic/css/tabs/tabs_multiple_lines.css index 97e55476..a111fca7 100644 --- a/classic/css/tabs/tabs_multiple_lines.css +++ b/classic/css/tabs/tabs_multiple_lines.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/tabs/tabs_multiple_lines_v2.css b/classic/css/tabs/tabs_multiple_lines_v2.css index 2ded9ca7..55553c63 100644 --- a/classic/css/tabs/tabs_multiple_lines_v2.css +++ b/classic/css/tabs/tabs_multiple_lines_v2.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/addonbar_content_on_the_right.css b/classic/css/toolbars/addonbar_content_on_the_right.css index 9f329dd7..03e03bb7 100644 --- a/classic/css/toolbars/addonbar_content_on_the_right.css +++ b/classic/css/toolbars/addonbar_content_on_the_right.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/addonbar_move_bookmarks_toolbar_to_bottom.css b/classic/css/toolbars/addonbar_move_bookmarks_toolbar_to_bottom.css index c5e2478a..d7a933ef 100644 --- a/classic/css/toolbars/addonbar_move_bookmarks_toolbar_to_bottom.css +++ b/classic/css/toolbars/addonbar_move_bookmarks_toolbar_to_bottom.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/addonbar_status_in_addonbar.css b/classic/css/toolbars/addonbar_status_in_addonbar.css index 8218367b..cf08baaa 100644 --- a/classic/css/toolbars/addonbar_status_in_addonbar.css +++ b/classic/css/toolbars/addonbar_status_in_addonbar.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/bookmarks_toolbar_autohide.css b/classic/css/toolbars/bookmarks_toolbar_autohide.css index 4ac81d43..540f36f6 100644 --- a/classic/css/toolbars/bookmarks_toolbar_autohide.css +++ b/classic/css/toolbars/bookmarks_toolbar_autohide.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/bookmarks_toolbar_bookmark_labels_hidden.css b/classic/css/toolbars/bookmarks_toolbar_bookmark_labels_hidden.css index 7decdf4f..7efe8697 100644 --- a/classic/css/toolbars/bookmarks_toolbar_bookmark_labels_hidden.css +++ b/classic/css/toolbars/bookmarks_toolbar_bookmark_labels_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/bookmarks_toolbar_in_fullscreen_mode.css b/classic/css/toolbars/bookmarks_toolbar_in_fullscreen_mode.css index bec92efa..5f710717 100644 --- a/classic/css/toolbars/bookmarks_toolbar_in_fullscreen_mode.css +++ b/classic/css/toolbars/bookmarks_toolbar_in_fullscreen_mode.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/bookmarks_toolbar_multiple_lines.css b/classic/css/toolbars/bookmarks_toolbar_multiple_lines.css index 36b3cfcb..3dad3a5f 100644 --- a/classic/css/toolbars/bookmarks_toolbar_multiple_lines.css +++ b/classic/css/toolbars/bookmarks_toolbar_multiple_lines.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/bookmarks_toolbar_old_height.css b/classic/css/toolbars/bookmarks_toolbar_old_height.css index 7bf3e8a8..3bc4e1c2 100644 --- a/classic/css/toolbars/bookmarks_toolbar_old_height.css +++ b/classic/css/toolbars/bookmarks_toolbar_old_height.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/general_toolbar_colors.css b/classic/css/toolbars/general_toolbar_colors.css index 169fa7a9..b50a8d43 100644 --- a/classic/css/toolbars/general_toolbar_colors.css +++ b/classic/css/toolbars/general_toolbar_colors.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/general_toolbar_colors_aeroglass_windows10_glass8.css b/classic/css/toolbars/general_toolbar_colors_aeroglass_windows10_glass8.css index 4a1ea29a..cb367964 100644 --- a/classic/css/toolbars/general_toolbar_colors_aeroglass_windows10_glass8.css +++ b/classic/css/toolbars/general_toolbar_colors_aeroglass_windows10_glass8.css @@ -1,10 +1,6 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ************************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **********/ -/* by Aris (aris-addons@gmx.net)*****************************************************************/ -/* Github: https://github.com/aris-t2/customcssforfx ********************************************/ -/************************************************************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ +/* Github: https://github.com/aris-t2/customcssforfx ************************************/ +/****************************************************************************************/ /* Glass8 ( http://www.glass8.eu/ ) required for 'Windows 7'-like window transparency */ diff --git a/classic/css/toolbars/general_toolbar_colors_bookmarks_toolbar_aeroglass.css b/classic/css/toolbars/general_toolbar_colors_bookmarks_toolbar_aeroglass.css index d4627b0c..6bc992b8 100644 --- a/classic/css/toolbars/general_toolbar_colors_bookmarks_toolbar_aeroglass.css +++ b/classic/css/toolbars/general_toolbar_colors_bookmarks_toolbar_aeroglass.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/general_toolbar_colors_navigation_toolbar_aeroglass.css b/classic/css/toolbars/general_toolbar_colors_navigation_toolbar_aeroglass.css index 7aceb149..cd672d22 100644 --- a/classic/css/toolbars/general_toolbar_colors_navigation_toolbar_aeroglass.css +++ b/classic/css/toolbars/general_toolbar_colors_navigation_toolbar_aeroglass.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/general_toolbar_colors_tabs_toolbar_aeroglass.css b/classic/css/toolbars/general_toolbar_colors_tabs_toolbar_aeroglass.css index 59bd8c9a..182e7ab1 100644 --- a/classic/css/toolbars/general_toolbar_colors_tabs_toolbar_aeroglass.css +++ b/classic/css/toolbars/general_toolbar_colors_tabs_toolbar_aeroglass.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/menubar_color.css b/classic/css/toolbars/menubar_color.css index 69682a9b..4e219951 100644 --- a/classic/css/toolbars/menubar_color.css +++ b/classic/css/toolbars/menubar_color.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/menubar_fog_hidden.css b/classic/css/toolbars/menubar_fog_hidden.css index 16dd6f68..8faa8876 100644 --- a/classic/css/toolbars/menubar_fog_hidden.css +++ b/classic/css/toolbars/menubar_fog_hidden.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/menubar_in_fullscreen_mode.css b/classic/css/toolbars/menubar_in_fullscreen_mode.css index 4010544b..a71cae8d 100644 --- a/classic/css/toolbars/menubar_in_fullscreen_mode.css +++ b/classic/css/toolbars/menubar_in_fullscreen_mode.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/navbar_more_compact_mode.css b/classic/css/toolbars/navbar_more_compact_mode.css index cc4815ea..ef061219 100644 --- a/classic/css/toolbars/navbar_more_compact_mode.css +++ b/classic/css/toolbars/navbar_more_compact_mode.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/tabs_toolbar_adjustments.css b/classic/css/toolbars/tabs_toolbar_adjustments.css index d1ef48ec..86eff487 100644 --- a/classic/css/toolbars/tabs_toolbar_adjustments.css +++ b/classic/css/toolbars/tabs_toolbar_adjustments.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/tabs_toolbar_adjustments_macOS_fix.css b/classic/css/toolbars/tabs_toolbar_adjustments_macOS_fix.css index 06793c69..ffc55983 100644 --- a/classic/css/toolbars/tabs_toolbar_adjustments_macOS_fix.css +++ b/classic/css/toolbars/tabs_toolbar_adjustments_macOS_fix.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/toolbar_context_menuitems_visibility.css b/classic/css/toolbars/toolbar_context_menuitems_visibility.css index ef9d3a67..ab331d4b 100644 --- a/classic/css/toolbars/toolbar_context_menuitems_visibility.css +++ b/classic/css/toolbars/toolbar_context_menuitems_visibility.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/toolbar_mode_icons_and_text.css b/classic/css/toolbars/toolbar_mode_icons_and_text.css index a8008d97..d5f25828 100644 --- a/classic/css/toolbars/toolbar_mode_icons_and_text.css +++ b/classic/css/toolbars/toolbar_mode_icons_and_text.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_macOS_fix.css b/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_macOS_fix.css index cadd9970..b7e0f7c4 100644 --- a/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_macOS_fix.css +++ b/classic/css/toolbars/toolbar_mode_icons_and_text_and_text_only_macOS_fix.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/toolbar_mode_text.css b/classic/css/toolbars/toolbar_mode_text.css index dc18a3b7..8720aef9 100644 --- a/classic/css/toolbars/toolbar_mode_text.css +++ b/classic/css/toolbars/toolbar_mode_text.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/toolbars/toolbars_old_padding.css b/classic/css/toolbars/toolbars_old_padding.css index 590842c4..bfc9e955 100644 --- a/classic/css/toolbars/toolbars_old_padding.css +++ b/classic/css/toolbars/toolbars_old_padding.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/webcontent/screenshots_alternative_save_ui.css b/classic/css/webcontent/screenshots_alternative_save_ui.css index bbf99127..05dd1da0 100644 --- a/classic/css/webcontent/screenshots_alternative_save_ui.css +++ b/classic/css/webcontent/screenshots_alternative_save_ui.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/webcontent/toplevel_image_classic_v1.css b/classic/css/webcontent/toplevel_image_classic_v1.css index 0c8fdbb7..eebeda2f 100644 --- a/classic/css/webcontent/toplevel_image_classic_v1.css +++ b/classic/css/webcontent/toplevel_image_classic_v1.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/css/webcontent/toplevel_image_classic_v2.css b/classic/css/webcontent/toplevel_image_classic_v2.css index 330af0c2..a1762334 100644 --- a/classic/css/webcontent/toplevel_image_classic_v2.css +++ b/classic/css/webcontent/toplevel_image_classic_v2.css @@ -1,8 +1,4 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ****************************************************/ -/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/ -/* by Aris (aris-addons@gmx.net)*********************************************************/ +/* Firefox Quantum userChrome.css tweaks ************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ************************************/ /****************************************************************************************/ diff --git a/classic/userChrome.css b/classic/userChrome.css index 2478f6c4..b4f6fef4 100644 --- a/classic/userChrome.css +++ b/classic/userChrome.css @@ -1,14 +1,11 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ************************************************************/ +/* Firefox Quantum userChrome.css tweaks ********************************************************/ /* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **********/ -/* by Aris (aris-addons@gmx.net)*****************************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ********************************************/ /************************************************************************************************/ /************************************************************************************************/ -/* Custom CSS for Firefox ***********************************************************************/ -/* version 1.7.7 ********************************************************************************/ +/* Custom CSS for Firefox 59+ *******************************************************************/ +/* version 1.7.8 ********************************************************************************/ /************************************************************************************************/ /************************************************************************************************* @@ -55,13 +52,14 @@ @import url(./config/general_variables.css); /**/ /* COLOR VARIABLES - only use one at a time *****************************************************/ +/* [!] edit 'color_variables.css' to set own colors for most ui areas ***************************/ @import url(./config/color_variables.css); /**/ /* <- default 'grey' colors */ /* @import url(./config/color_variables_aero.css); /**/ /* <- 'AeroBlue' colors */ /* @import url(./config/color_variables_classic-grey.css); /**/ /* <- 'classic grey' colors */ /* @import url(./config/color_variables_fx3.css); /**/ /* <- 'Firefox 3-like' colors */ /* @import url(./config/color_variables_classic-grey.css); /**/ /* <- 'classic grey' colors */ /* @import url(./config/color_variables_transparent.css); /**/ /* <- 'transparent' colors */ -/* @import url(./config/color_variables_aeroglass.css); /**/ /* <- 'AeroGlass' colors / Win10 Glass8 fix is in 'toolbar' area */ +/* @import url(./config/color_variables_aeroglass.css); /**/ /* <- 'AeroGlass' colors / Win10+Glass8 fix can be found in 'toolbars' area */ /************************************************************************************************/ @@ -77,9 +75,8 @@ /* navigation toolbar buttons - button roundness (edit file to set different roundness) *********/ /* @import url(./css/buttons/buttons_on_navbar_button_roundness.css); /**/ -/* squared buttons - only use one at a time (based on Firefox version) **************************/ -/* @import url(./css/buttons/buttons_on_navbar_squared_buttons_fx57.css); /**/ -/* @import url(./css/buttons/buttons_on_navbar_squared_buttons_fx58.css); /**/ +/* squared buttons (rectangular shape) **********************************************************/ +/* @import url(./css/buttons/buttons_on_navbar_squared_buttons.css); /**/ /* icon appearance - only use one at a time (custom icons do not scale in HiDPI modes) **********/ @import url(./css/buttons/icons_colorized.css); /**/ @@ -155,8 +152,7 @@ /* application/hamburger button popup ***********************************************************/ @import url(./css/buttons/appbutton_popup_icons_colorized.css); /**/ /* @import url(./css/buttons/appbutton_popup_sync_hidden.css); /**/ -/* @import url(./css/buttons/appbutton_popup_panelarrow_hidden_fx57.css); /**/ -/* @import url(./css/buttons/appbutton_popup_panelarrow_hidden_fx58.css); /**/ +/* @import url(./css/buttons/appbutton_popup_panelarrow_hidden.css); /**/ /************************************************************************************************/ /* button on navigation toolbar *****************************************************************/ @@ -525,7 +521,8 @@ /* hide 'Search with...' and 'Visit...' results *************************************************/ /* - browser preferences: disable 'show search suggestions inside address bar results' **********/ /* - hide bottom search engines: about:config > browser.urlbar.oneOffSearches > false ***********/ -/* [!] Hiding will not work properly for all cases. An empty box will sometimes be visible ******/ +/* [!] Hiding will not work properly in all cases. An empty box will sometimes be visible *******/ +/* [!] Suggested to additionally use above custom popup height and more result items ************/ /* @import url(./css/locationbar/ac_popup_searchwith_and_visit_items_hidden.css); /**/ /* <--- EXPERIMENTAL */ diff --git a/classic/userContent.css b/classic/userContent.css index 15e4a046..87c16d00 100644 --- a/classic/userContent.css +++ b/classic/userContent.css @@ -1,8 +1,5 @@ -/*AGENT_SHEET*/ - -/* Firefox 57+ userChrome.css tweaks ************************************************************/ +/* Firefox Quantum userChrome.css tweaks ********************************************************/ /* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **********/ -/* by Aris (aris-addons@gmx.net)*****************************************************************/ /* Github: https://github.com/aris-t2/customcssforfx ********************************************/ /************************************************************************************************/ @@ -27,11 +24,6 @@ - some '@import' features might not work properly, if multi-process mode (e10s) is disabled - in both cases CSS code has to be added to userContent.css file manually - FIREFOX 58 BUG: bugzilla.mozilla.org/show_bug.cgi?id=1431933 - - DISCUSSION THREAD: github.com/Aris-t2/CustomCSSforFx/issues/101 - - some @media rules get ignored -> temporal fixes required - - look for TEMPORAL FIX FOR FIREFOX 58 or TEMPORAL FX58 fix additions - CSS tweaks won't work, if '@namespace' references are used inside .css files! Do not report issues with EXPERIMENTAL settings! They are for testing only! diff --git a/classic/xml/addonversion_fx57.xml b/classic/xml/addonversion.xml similarity index 96% rename from classic/xml/addonversion_fx57.xml rename to classic/xml/addonversion.xml index 38908cba..d2fa9e07 100644 --- a/classic/xml/addonversion_fx57.xml +++ b/classic/xml/addonversion.xml @@ -1,18 +1,21 @@ + + %extensionsDTD; ]> - - - @@ -22,14 +25,14 @@