@@ -27,6 +28,7 @@
+
diff --git a/src/css/3p-filters.css b/src/css/3p-filters.css
index f8d369b45..111d4e8f7 100644
--- a/src/css/3p-filters.css
+++ b/src/css/3p-filters.css
@@ -74,7 +74,6 @@ body.hideUnused #listsOfBlockedHostsPrompt::before,
.listEntry.toRemove .listname {
text-decoration: line-through;
}
-.listEntry .fa,
.listEntry .fa-icon,
.listEntry .counts {
color: var(--fg-0-50);
@@ -83,7 +82,6 @@ body.hideUnused #listsOfBlockedHostsPrompt::before,
font-size: 120%;
margin: 0 0.2em 0 0;
}
-.listEntry .fa:hover,
.listEntry .fa-icon:hover {
color: inherit;
fill: inherit;
diff --git a/src/css/common.css b/src/css/common.css
index a2af2f934..c15a14f32 100644
--- a/src/css/common.css
+++ b/src/css/common.css
@@ -25,14 +25,6 @@
src: url('fonts/Metropolis/Metropolis-SemiBold.woff2') format('woff2');
}
-/* Usage of FontAwesome is deprecated and will be removed eventually */
-@font-face {
- font-family: FontAwesome;
- font-weight: normal;
- font-style: normal;
- src: url('fonts/fontawesome-webfont.ttf') format('truetype');
- }
-
/**
Common uBO spacing.
Ref: https://github.com/uBlockOrigin/uBlock-issues/issues/1005
@@ -59,16 +51,6 @@ body {
margin: 0;
padding: 0;
}
-.fa {
- display: inline-block;
- font-family: FontAwesome;
- font-style: normal;
- font-weight: normal;
- line-height: 1;
- user-select: none;
- -moz-user-select: none;
- -webkit-user-select: none;
- }
a {
color: var(--link-ink);
}
@@ -134,7 +116,6 @@ button.preferred {
background-color: var(--button-preferred-surface);
color: var(--button-preferred-ink);
}
-button.iconifiable > .fa,
button.iconifiable > .fa-icon {
padding-left: 0;
padding-right: 0.4em;
@@ -142,7 +123,6 @@ button.iconifiable > .fa-icon {
button.iconifiable > .fa-icon {
font-size: 120%;
}
-body[dir="rtl"] button.iconifiable > .fa,
body[dir="rtl"] button.iconifiable > .fa-icon {
padding-left: 0.5em;
}
@@ -233,7 +213,6 @@ select {
-webkit-margin-start: 2em;
}
@media (max-width: 640px) {
- button.iconifiable > .fa,
button.iconifiable > .fa-icon {
font-size: 1.2rem;
padding: 0;
diff --git a/src/css/dashboard-common.css b/src/css/dashboard-common.css
index 562923443..628aa3b98 100644
--- a/src/css/dashboard-common.css
+++ b/src/css/dashboard-common.css
@@ -18,24 +18,22 @@ h3 {
a {
text-decoration: none;
}
-.fa.info,
.fa-icon.info {
color: var(--fg-icon-info-lvl-0-dimmed);
fill: var(--fg-icon-info-lvl-0-dimmed);
font-size: 115%;
}
-.fa.info:hover,
.fa-icon.info:hover {
color: inherit;
fill: inherit;
}
-.fa.info.important,
.fa-icon.info.important {
color: var(--fg-icon-info-lvl-3-dimmed);
+ fill: var(--fg-icon-info-lvl-3-dimmed);
}
-.fa.info.important:hover,
.fa-icon.info.important:hover {
color: var(--fg-icon-info-lvl-3);
+ fill: var(--fg-icon-info-lvl-3);
}
input[type="number"] {
width: 5em;
diff --git a/src/css/dyna-rules.css b/src/css/dyna-rules.css
index 1245cbb2d..c709bedd4 100644
--- a/src/css/dyna-rules.css
+++ b/src/css/dyna-rules.css
@@ -64,9 +64,6 @@ body:not(.editing) #diff.dirty #commitButton:hover {
display: flex;
justify-content: center;
}
-#ruleFilter .fa {
- color: var(--fg-0-60);
- }
#ruleFilter #diffCollapse {
padding: 0 0.5em;
font-size: 150%;
diff --git a/src/css/fa-icons.css b/src/css/fa-icons.css
index ba98eb96e..5c8bf7b12 100644
--- a/src/css/fa-icons.css
+++ b/src/css/fa-icons.css
@@ -34,7 +34,10 @@
position: absolute;
visibility: visible;
}
-.fa-icon.fa-icon-vflipped {
+.fa-icon.fa-icon-hflipped > svg {
+ transform: scale(-1, 1);
+ }
+.fa-icon.fa-icon-vflipped > svg {
transform: scale(1, -1);
}
@@ -69,10 +72,12 @@
.fa-icon > .fa-icon_list-alt {
width: calc(1em * 1792 / 1792);
}
+.fa-icon > .fa-icon_download-alt,
.fa-icon > .fa-icon_font,
.fa-icon > .fa-icon_search,
.fa-icon > .fa-icon_spinner,
-.fa-icon > .fa-icon_unlink {
+.fa-icon > .fa-icon_unlink,
+.fa-icon > .fa-icon_upload-alt {
width: calc(1em * 1664 / 1792);
}
.fa-icon > .fa-icon_home {
@@ -90,9 +95,14 @@
.fa-icon > .fa-icon_power-off,
.fa-icon > .fa-icon_question-circle,
.fa-icon > .fa-icon_refresh,
-.fa-icon > .fa-icon_sliders {
+.fa-icon > .fa-icon_save,
+.fa-icon > .fa-icon_sliders,
+.fa-icon > .fa-icon_undo {
width: calc(1em * 1536 / 1792);
}
+.fa-icon > .fa-icon_arrow-right {
+ width: calc(1em * 1472 / 1792);
+ }
.fa-icon > .fa-icon_filter {
width: calc(1em * 1410 / 1792);
}
diff --git a/src/css/fonts/OFL.txt b/src/css/fonts/OFL.txt
deleted file mode 100644
index f1a20ac1a..000000000
--- a/src/css/fonts/OFL.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-Copyright (c) , (),
-with Reserved Font Name .
-Copyright (c) , (),
-with Reserved Font Name .
-Copyright (c) , ().
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/css/fonts/fontawesome-webfont.ttf b/src/css/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index 96a3639cd..000000000
Binary files a/src/css/fonts/fontawesome-webfont.ttf and /dev/null differ
diff --git a/src/css/popup-fenix.css b/src/css/popup-fenix.css
index 7af6d9420..3c849872f 100644
--- a/src/css/popup-fenix.css
+++ b/src/css/popup-fenix.css
@@ -53,9 +53,6 @@ hr {
margin: 0;
padding: 0;
}
-.fa {
- font-size: 120%;
- }
#sticky {
background-color: var(--default-surface);
diff --git a/src/dyna-rules.html b/src/dyna-rules.html
index 704b3976e..0feb56565 100644
--- a/src/dyna-rules.html
+++ b/src/dyna-rules.html
@@ -4,35 +4,35 @@
uBlock — Dynamic filtering rules
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+