Add new advanced setting: uiStyles

gorhill · gorhill · commit 9f7e5b621dc5 · 2020-05-19T10:33:36.000-04:00
Default to `unset`. To allow users to bypass uBO's default CSS styles in case they are causing issues to specific users. It is the responsibility of the user to ensure the value of `uiStyles` contains valid CSS property declarations. uBO will assign the value to `document.body.style.cssText`. Related issue: - uBlockOrigin/uBlock-issues#1044 For example, in the case of the issue above, one could set `uiStyles` to `font-family: sans-serif` to force uBO to the system font for its user interface.
diff --git a/src/css/dashboard-common.css b/src/css/dashboard-common.css
@@ -8,7 +8,6 @@ body > div.body {
     }
 h2, h3 {
     margin: 1em 0;
-    font-family: sans-serif;
     }
 h2 {
     font-size: 18px;
diff --git a/src/js/background.js b/src/js/background.js
@@ -74,6 +74,7 @@ const µBlock = (( ) => { // jshint ignore:line
         suspendTabsUntilReady: 'unset',
         uiPopupConfig: 'undocumented',
         uiFlavor: 'unset',
+        uiStyles: 'unset',
         updateAssetBypassBrowserCache: false,
         userResourcesLocation: 'unset',
     };
diff --git a/src/js/messaging.js b/src/js/messaging.js
@@ -159,6 +159,10 @@ const onMessage = function(request, sender, callback) {
         µb.toggleHostnameSwitch(request);
         break;
 
+    case 'uiStyles':
+        response = µb.hiddenSettings.uiStyles;
+        break;
+
     case 'userSettings':
         response = µb.changeUserSettings(request.name, request.value);
         break;
diff --git a/src/js/udom.js b/src/js/udom.js
@@ -105,6 +105,13 @@ DOMListFactory.nodeFromSelector = function(selector) {
     if ( window.matchMedia('(prefers-color-scheme: dark)').matches ) {
         root.classList.add('dark');
     }
+
+    // https://github.com/uBlockOrigin/uBlock-issues/issues/1044
+    //   Offer the possibility to bypass uBO's default styling
+    vAPI.messaging.send('uDom', { what: 'uiStyles' }).then(response => {
+        if ( typeof response !== 'string' || response === 'unset' ) { return; }
+        document.body.style.cssText = response;
+    });
 }
 
 /******************************************************************************/

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ body > div.body {`
`8`	`8`	`}`
`9`	`9`	`h2, h3 {`
`10`	`10`	`margin: 1em 0;`
`11`		`- font-family: sans-serif;`
`12`	`11`	`}`
`13`	`12`	`h2 {`
`14`	`13`	`font-size: 18px;`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,13 @@ DOMListFactory.nodeFromSelector = function(selector) {`
`105`	`105`	`if ( window.matchMedia('(prefers-color-scheme: dark)').matches ) {`
`106`	`106`	`root.classList.add('dark');`
`107`	`107`	`}`
	`108`	`+`
	`109`	`+ // https://github.com/uBlockOrigin/uBlock-issues/issues/1044`
	`110`	`+ // Offer the possibility to bypass uBO's default styling`
	`111`	`+ vAPI.messaging.send('uDom', { what: 'uiStyles' }).then(response => {`
	`112`	`+ if ( typeof response !== 'string' \|\| response === 'unset' ) { return; }`
	`113`	`+ document.body.style.cssText = response;`
	`114`	`+ });`
`108`	`115`	`}`
`109`	`116`
`110`	`117`	`/******************************************************************************/`