external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-11 17:41:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fine tune fenix UI as per Bram's feedback

Browse source
This commit is contained in:
Raymond Hill 2020-02-18 09:53:20 -05:00
parent 40d4a4df25
commit 69a7c6771b
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
2 changed files with 19 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/css/popup-fenix.css
View file

@ -1,3 +1,17 @@
/* External CSS values override */
body {
color: #20123a;
fill: #20123a;
}
.fa-icon {
padding: 0 0.1em;
}
.fa-icon.fa-icon-badged > .fa-icon-badge {
bottom: auto;
top: -20%;
}
/* Internal CSS values */
body { body {
background-color: white; background-color: white;
border: 0; border: 0;
@ -6,16 +20,6 @@ body {
white-space: nowrap; white-space: nowrap;
} }
h2 {
background-color: #eee;
border: 0;
color: #666;
cursor: pointer;
font-size: 100%;
font-weight: normal;
padding: 0.2em;
text-align: center;
}
a { a {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
@ -34,7 +38,7 @@ a {
} }
hr { hr {
border: 0; border: 0;
border-top: 1px solid #ddd; border-top: 1px solid #e3e2e3;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
@ -43,7 +47,7 @@ hr {
} }
#sticky { #sticky {
background-color: white; background-color: inherit;
position: sticky; position: sticky;
top: 0; top: 0;
z-index: 100; z-index: 100;
@ -60,7 +64,7 @@ hr {
margin: 0.5em 0; margin: 0.5em 0;
} }
#switch .fa-icon { #switch .fa-icon {
fill: #0046ff; fill: #0060df;
cursor: pointer; cursor: pointer;
font-size: 700%; font-size: 700%;
margin: 0; margin: 0;
@ -96,9 +100,6 @@ body.off #switch .fa-icon {
.rulesetTools [id]:not(:first-of-type) { .rulesetTools [id]:not(:first-of-type) {
margin-top: 0.2em; margin-top: 0.2em;
} }
.rulesetTools [id]:hover {
fill: black;
}
body.needReload #refresh, body.needReload #refresh,
body.needSave #saveRules, body.needSave #saveRules,
body.needSave #revertRules { body.needSave #revertRules {
@ -142,9 +143,7 @@ body.needSave #revertRules {
} }
.tool { .tool {
color: #444;
cursor: pointer; cursor: pointer;
fill: #444;
padding: 0 0.5em; padding: 0 0.5em;
unicode-bidi: embed; unicode-bidi: embed;
visibility: hidden; visibility: hidden;
@ -152,10 +151,6 @@ body.needSave #revertRules {
.tool.enabled { .tool.enabled {
visibility: visible; visibility: visible;
} }
.tool.enabled:hover {
color: #444;
fill: #444;
}
.statValue { .statValue {
margin: 0; margin: 0;
@ -176,10 +171,6 @@ body.needSave #revertRules {
#extraTools > span.on .fa-icon >.nope { #extraTools > span.on .fa-icon >.nope {
visibility: visible; visibility: visible;
} }
#extraTools > span:hover {
color: #222;
fill: #222;
}
#main:not(.dfEnabled) #moreButton .fa-icon { #main:not(.dfEnabled) #moreButton .fa-icon {
transform: rotate(180deg); transform: rotate(180deg);
@ -252,7 +243,7 @@ body[dir="rtl"] #tooltip {
display: none; display: none;
} }
#firewallContainer > div > span { #firewallContainer > div > span {
background-color: #e6e6e6; background-color: #e0e0e6;
border: none; border: none;
box-sizing: border-box; box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;

7
src/js/start.js
View file

@ -346,12 +346,7 @@ if (
browser.browserAction.setPopup instanceof Function browser.browserAction.setPopup instanceof Function
) { ) {
let uiFlavor = µb.hiddenSettings.uiFlavor; let uiFlavor = µb.hiddenSettings.uiFlavor;
if ( if ( uiFlavor === 'unset' && vAPI.webextFlavor.soup.has('mobile') ) {
uiFlavor === 'unset' &&
vAPI.webextFlavor.major > 68 &&
vAPI.webextFlavor.soup.has('firefox') &&
vAPI.webextFlavor.soup.has('mobile')
) {
uiFlavor = 'fenix'; uiFlavor = 'fenix';
} }
if ( uiFlavor !== 'unset' && /\w+/.test(uiFlavor) ) { if ( uiFlavor !== 'unset' && /\w+/.test(uiFlavor) ) {