Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	classic/css/tabs/tabs_multiple_lines.css
#	classic/userChrome.css
#	classic/userContent.css

Author: rob006

CONTRIBUTING.md

@@ -7,11 +7,8 @@
 --> https://github.com/Aris-t2/CustomCSSforFx/issues/4
 4. Verify there are no '@namespace' references anywhere in your custom code.
 5. Use available support threads:
-- GENERAL DISCUSSIONS, FEEDBACK, QUESTIONS --> https://github.com/Aris-t2/CustomCSSforFx/issues/452
-- 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
+- GENERAL DISCUSSIONS, FEEDBACK, QUESTIONS --> https://github.com/Aris-t2/CustomCSSforFx/discussions/454
+- MULTIROW TABS SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/discussions/455
 
 <b>IMPORTANT</b>   
 By submitting a new issue you confirm having read and understood the above and all 'how to report a new issue' instructions.

ISSUE_TEMPLATE

@@ -15,11 +15,8 @@ Thanks for your understanding.
 SUPPORT AREA only for features THIS project provides
 1. This is not a 'request' area for new stuff or legacy add-on features. 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.
 2. Use available support threads:
-- GENERAL TALK, FEEDBACK & QUESTIONS: --> https://github.com/Aris-t2/CustomCSSforFx/issues/452
-- 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
+- GENERAL TALK, FEEDBACK & QUESTIONS: --> https://github.com/Aris-t2/CustomCSSforFx/discussions/454
+- MULTIROW TABS SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/discussions/455
 3. Read 'how to report issues properly' before posting a new issue.
 --> https://github.com/Aris-t2/CustomCSSforFx/issues/4
 
@@ -31,22 +28,23 @@ Add all information required in 1-5 and delete this line and everything above it
 1. Issue description:
 
 
-2. Steps to reproduce the issue:
+2. Does the issue occur with latest CustomCSSforFx release?
+(Check here: https://github.com/Aris-t2/CustomCSSforFx/releases)
 
 
-3. SCREENSHOT(S) of the issue (drag & drop images into this post):
+3. Steps to reproduce the issue:
 
 
-4. about:config prefs (custom CSS files won't work, if these prefs are set to false)
-- toolkit.legacyUserProfileCustomizations.stylesheets > true (yes / no):
-- browser.proton.enabled > true (yes / no):
-- does the issue occur with latest CustomCSSforFx release (yes / no):
+4. SCREENSHOT(S) of the issue (drag & drop images into this post):
 
 
-5. System information
+5. Is 'about:config > toolkit.legacyUserProfileCustomizations.stylesheets' set to 'true'?
+(Custom CSS files will only work, if this pref is set to true!)
+
+
+6. System information
 - OS & OS version: 
-- OS theme (if not default): 
-- DPI / HiDPI resolution (e.g. 100%, 125%...): 
+- DPI / HiDPI (e.g. 100%, 125%...): 
 - Firefox version: 
-- Firefox (lw) theme (e.g. default, dark, 'theme name/link'): 
+- Firefox theme (e.g. default, dark, 'theme name & link'): 
 - This projects userChrome.css/userContent.css 'settings' the issue occurs with: 

README.md

@@ -78,25 +78,15 @@ Code between `/*` and `*/` won't be used by Firefox unless there are other `/*`
 
 ## How to find item ids and attributes?
 
-Firefox 57-60  
-
-Enable once:  
-1\. Tools > WebDeveloper > Toggle Tools > Toolbox Options > Enable browser chrome and add-on debugging toolboxes  
-2\. Tools > WebDeveloper > Toggle Tools > Toolbox Options > Enable remote debugging  
-
-Hit `Ctrl+Alt+Shift+I` or open 'Tools > WebDeveloper > Browser Toolbox'.  
-
-Inspect ui or web content.  
-
-Force popups to stay open for inspection:  
-Click on 'disable popup auto hide' button (= button with four squares) on developer toolbars end.  
-
-Firefox 61+  
-
 Enable once:  
 1\. Tools > WebDeveloper > Toggle Tools > 'Customize Tools and get help button' (= button with three dots) > Settings > Enable browser chrome and add-on debugging toolboxes  
 2\. Tools > WebDeveloper > Toggle Tools > 'Customize Tools and get help button' (= button with three dots) > Settings > Enable remote debugging  
 
+or set these two in about:config to true  
+
+about:config > devtools.chrome.enabled > true  
+about:config > devtools.debugger.remote-enabled > true  
+
 Hit `Ctrl+Alt+Shift+I` or open 'Tools > WebDeveloper > Browser Toolbox'.  
 
 Inspect ui or web content.  
@@ -126,144 +116,3 @@ Open `userChrome.css` file
 Look for `/* @import "./css/locationbar/reader_alternative_icon.css"; /**/`  
 Remove `/*` at lines start to enable this popup appearance.  
 The result will look like `/* @import "./css/locationbar/reader_alternative_icon.css"; /**` 
-
-## Suggested ui tweaks (list might be partly outdated)<a name="suggested-ui-tweaks"></a>
-
-**Toolbar modes (suggestion: compact mode)**  
-_Customize mode > Density > Compact / Normal / Touch_  
-
-**Titlebar modes** (suggestion: Firefox titlebar ['application/hamburger button in titlebar' only works in Firefox titlebar])  
-_Customize mode > Title Bar > uncheck checkbox_  
-
-**Drag space above tabs toolbar** (suggestion: disable drag space ['application/hamburger button in titlebar' works best without drag space])  
-_Customize mode > Drag Space > uncheck checkbox_  
-
-**Bookmarks menu button on bookmarks toolbar**  
-_Customize mode > Toolbars > Bookmarks Toolbar_  
-_Customize mode > move 'bookmarks menu' button to bookmark toolbars end_  
-
-**Downloads button always visible**  
-_Customize mode > downloads button > click on button and uncheck 'Auto-hide'_  
-
-**Searchbar** (suggestion: placed after location bar)  
-_Customize mode > Search(bar) > move to navigation toolbar_  
-
-**Flexible spaces** (suggestion: remove spaces after and before location bar)  
-_Customize mode > grab and drag flexible space into palette_  
-
-**RSS icon in location bar**  
-_Install [Awesome RSS](https://addons.mozilla.org/addon/awesome-rss/) WebExtension_  
-
-**Search within "New Tab page" (Fx69+)**  
-_browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar_  
-
-## 'about:config' tweaks (list might be partly outdated) <a name="aboutconfig-tweaks"></a>
-
-(To revert changes right-click entry and select 'reset')  
-
-**Tab audio icon**  
-_browser.tabs.showAudioPlayingIcon_  
-
-**Tab min width** (suggestion: 100)  
-_browser.tabs.tabMinWidth_  
-
-**Insert related tab after current tab** (suggestion: enable / set to 'true')  
-_browser.tabs.insertRelatedAfterCurrent_  
-
-**Hide 'http://' from url** (suggestion: disable / set to 'false')  
-_browser.urlbar.trimURLs_  
-
-**Open links in new tab/window**  
-_browser.link.open_newwindow.restriction_ > 0 (new tab instead window)  
-
-**Preview tabs using 'Ctrl + Tab'**  
-_browser.ctrlTab.previews_  
-
-**Close window with last visible tab** (suggestion: disable / set to 'false')  
-_browser.tabs.closeWindowWithLastTab_  
-
-**Titlebar**  
-_browser.tabs.drawInTitlebar_  
-
-**Old about:newtab and about:home pages (Firefox 57-59 only)**  
-_browser.newtabpage.activity-stream.enabled_  
-_browser.newtabpage.activity-stream.aboutHome.enabled_
-
-**HTML5 fullscreen warning**  
-_full-screen-api.warning.delay_ > 0 or -1 (reduces delay / hides warning)  
-_full-screen-api.warning.timeout_ > 0 (reduces delay)  
-
-**Recently added bookmarks**  
-_browser.bookmarks.showRecentlyBookmarked_  
-
-**General animations**  
-_toolkit.cosmeticAnimations.enabled_  
-
-**Fullscreen animations for HTML5 content**  
-_full-screen-api.transition-duration.enter_ > 0 0 (reduces animation time)  
-_full-screen-api.transition-duration.leave_ > 0 0 (reduces animation time)  
-
-**Add-on manager: remove 'Get Add-ons' category**  
-_extensions.getAddons.showPane_  
-
-**Findbar: animated result highlighting**  
-_findbar.modalHighlight_  
-
-**Searchbar in 'about:preferences'**  
-_browser.preferences.search_  
-
-**Location Bar: search engines at popups bottom**  
-_browser.urlbar.oneOffSearches_  
-
-**Searchbar: open search results in new tab**  
-_browser.search.openintab_  
-
-**Reader mode**  
-_reader.parse-on-load.enabled_  
-
-**Geolocation** (suggestion: disable / set to 'false')  
-_geo.enabled_  
-
-**Pocket** (suggestion: disable / set to 'false')  
-_extensions.pocket.enabled_  
-
-**Screenshots** (suggestion: disable / set to 'true')  
-_extensions.screenshots.disabled_  
-
-**Container tabs**  
-_privacy.userContext.enabled_  
-
-**Password viewer in login forms** (suggestion: disable / set to 'false')  
-_signon.showAutoCompleteFooter_
-
-**Font rendering**  
-_gfx.canvas.azure.backends_ > direct2d1.1,cairo,skia (old font rendering)  
-_gfx.content.azure.backends_ > direct2d1.1,cairo,skia (old font rendering)  
-
-**Anti fingerprinting (Caution: browser might behave in unforeseen ways!)**  
-_privacy.resistFingerprinting_  
-[Fingerprinting info at Mozilla Wiki tweaks](https://wiki.mozilla.org/Security/Fingerprinting)  
-
-**Telemetry / data collection** (suggestion: disable / set to 'false')  
-_browser.ping-centre.telemetry_  
-_toolkit.telemetry.archive.enabled_  
-_toolkit.telemetry.bhrPing.enabled_  
-_toolkit.telemetry.enabled_  
-_toolkit.telemetry.firstShutdownPing.enabled_  
-_toolkit.telemetry.newProfilePing.enabled_  
-_toolkit.telemetry.reportingpolicy.firstRun_  
-_toolkit.telemetry.shutdownPingSender.enabled_  
-_toolkit.telemetry.unified_  
-_toolkit.telemetry.updatePing.enabled_  
-_experiments.enabled_  
-_experiments.activeExperiment_  
-_experiments.supported_  
-_datareporting.healthreport.uploadEnabled_  
-_nsITelemetry.canRecordBase_  
-_nsITelemetry.canRecordExtended_  
-_browser.newtabpage.activity-stream.feeds.telemetry_  
-_browser.newtabpage.activity-stream.telemetry_  
-_extensions.screenshots.upload-disabled_ ("true" to disable)
-
-**Privacy enhancements**  
-arkenfox/user.js: https://github.com/arkenfox/user.js

classic/config/general_variables.css

@@ -31,42 +31,31 @@
   /* for tabs_multiple_lines.css and tabs_multiple_lines_v2.css */
   --tab_min_width_mlt: 100px !important;
   --tab_max_width_mlt: 200px !important;
-  
-  /* for 'tabs_multiple_lines_v2.css' only */
   --tabs-lines: 3 !important; 
 
-  /* for bookmarks_toolbar_multiple_lines.css /_fx66.css / _fx74.css */
+  /* for bookmarks_toolbar_multiple_lines.css */
   --bookmark_items_height: 22px !important; /* <- bookmark items - line height */
   --bookmark_items_lines: 3 !important; /* <- maximum amount of lines */
 
   /* for increase_ui_font_size.css */
   --general_ui_font_size: 10pt !important;
 
-  /* for searchbar_popup_engines_show_labels_scrollbars.css / ..._fx66.css*/
+  /* for searchbar_popup_engines_show_labels_scrollbars.css */
   --search-one-offs_labels_height: 100px !important;
 
-  /* for ac_popup_custom_height.css (location bar popup) */
-  --ac_popup_max_height: 300px !important;
-
   /* for addonbar_move_bookmarks_toolbar_to_bottom.css */
   --addonbar_height: 27px !important;
-  
-  /* for custom_backforward_connected.css */
-  --color_disabled_state: #f9f9fa !important;
-  --color_default_state: #e8e8e8 !important;
-  --color_hover_state: lightblue !important;
-  --color_active_state: lightgrey !important;
-  
+
   /* for ac_popup_result_font_size.css */
   --results_font_size: var(--general_ui_font_size,10pt) !important; /* 10pt */
 
   /* for urlbar_border_roundness.css */
   --megabar_border_roundness: 20px !important;
 
   /* for top_toolbar_colors.css */
-  --top_toolbars_background: #0063b1 !important;
-  --top_toolbars_background_inactive: #ffffff !important;
-  --top_toolbars_text: #ffffff !important;
+  --top_toolbars_background: hsl(235,33%,19%) !important; /* #0063b1 */ /* hsl(235,33%,19%) was used by old accent color option  */ 
+  --top_toolbars_background_inactive: hsl(235,13%,9%) !important; /* #ffffff */
+  --top_toolbars_text: hsl(240,9%,98%) !important;
   --top_toolbars_text_inactive: #999999 !important;
 
   /* for urlbar_background_color.css */

classic/css/aboutaddons/addonlists_show_addon_version_number.css

@@ -9,8 +9,8 @@
 
 
 	/*restore version number */
-	div:not([current-view="updates"]) .addon-name-link[title]:not([data-l10n-args])::after,
-	div:not([current-view="updates"]) .addon-name[title]:not([data-l10n-args])::after {
+	div:not([current-view="updates"]) .addon-name-link[title]:not([data-l10n-args])::after/*,
+	div:not([current-view="updates"]) .addon-name[title]:not([data-l10n-args])::after */{
 	  display: block !important;
 	  content: attr(title) !important;
 	  margin-top: -22px !important;

classic/css/aboutaddons/addons_manager_alternative_appearance.css

@@ -251,7 +251,7 @@
 	  max-width: unset !important;
 	  padding-inline-end: 0px !important;
 	}
-
+	
 	.list-view-heading-inner {
 	  -moz-box-flex: 1 !important;
 	  width: unset !important;
@@ -500,4 +500,25 @@
 	  display: flex !important;
 	}
 
+	.colorways-section {
+	  display: none !important;
+	}
+
+	colorways-card .addon.card {
+	  max-width: unset !important;
+	  padding-inline-end: 0px !important;
+	}
+	
+	colorways-card .card-heading-image {
+	  max-width: 335px !important;
+	}
+
+	#colorways-preview-text-container {
+	  position: unset !important;
+	  display: unset !important;
+	  width: unset !important;
+	  height: unset !important;
+	  margin: unset !important;
+	}
+
 }

classic/css/aboutpreferences/preferences_alternative_appearance.css

@@ -46,7 +46,7 @@
 	}
 
 	.pane-container {
-	  width: 100vw !important;
+	  width: 100% !important;
 	  padding: 0px !important;
 	  margin: 0px !important;
 	}
@@ -58,10 +58,9 @@
 	  padding-inline: 0px !important;
 	  min-height: unset !important;
 	  height: unset !important;
-	  /*margin-top: -20px !important;*/
 	  background: unset !important;
 	}
-	
+
 	.sticky-inner-container {
 	  max-width: unset !important;
 	}
@@ -76,9 +75,9 @@
 	}
 
 	.sticky-container {
-	  position: fixed !important;
+	  position: relative !important;
 	}
-	
+
 	.header-name {
 	  visibility: collapse !important;
 	}
@@ -251,6 +250,10 @@
 	  fill: unset !important;
 	}
 
+	/*.web-appearance-choice  {
+	  width: 150px !important;
+	}*/
+	
 }
 
 /* preference sub windows */
@@ -288,8 +291,8 @@
 	*[subdialog="true"] .contentPane,
 	*[subdialog="true"] .dialog-content-box,
 	*[subdialog="true"] .largeDialogContainer{
-	  background-color: white !important;
-	  color: black !important;
+	  background-color: var(--in-content-page-background) !important;
+	  color: var(--in-content-page-color) !important;
 	}
 
 }