Revert use of Fontawesome v5; use 4.7 or equivalent: see <>uBlockOrig…

…in/uBlock-issues#249 (comment)

src/about.html

@@ -29,7 +29,6 @@
         <li><span data-i18n="aboutDependencies"></span><ul>
             <li><a href="https://github.com/bestiejs/punycode.js" target="_blank">Punycode.js</a> by <a href="https://github.com/mathiasbynens">Mathias Bynens</a>
             <li><a href="https://fontawesome.com/" target="_blank">Font Awesome</a> by <a href="https://github.com/davegandy">Dave Gandy</a>
-            <li><a href="https://fontawesome.com/" target="_blank">Font Awesome Free 5.3.1 by @fontawesome</a>
             <li><a href="https://codemirror.net/" target="_blank">CodeMirror</a> by <a href="https://github.com/marijnh">Marijn Haverbeke</a>
             <li><a href="https://github.com/Swatinem/diff" target="_blank">An implementation of Myers' diff algorithm</a> by <a href="https://github.com/Swatinem">Arpad Borsos</a>
         </ul>

src/css/fa-icons.css

@@ -38,63 +38,51 @@
     height: 1em;
     width: 1em;
     }
-.fa-icon > .fa-icon_cloud-download-alt,
-.fa-icon > .fa-icon_cloud-upload-alt,
+
+.fa-icon > .fa-icon_eraser,
+.fa-icon > .fa-icon_film {
+    width: calc(1em * 1920 / 1792);
+    }
 .fa-icon > .fa-icon_code {
-    width: calc(1em * 640 / 512);
+    width: calc(1em * 1830 / 1792);
     }
-.fa-icon > .fa-icon_exclamation-triangle,
-.fa-icon > .fa-icon_eye,
-.fa-icon > .fa-icon_eye-slash,
-.fa-icon > .fa-icon_home,
-.fa-icon > .fa-icon_puzzle-piece,
-.fa-icon > .fa-icon_reply-all {
-    width: calc(1em * 576 / 512);
-    }
-.fa-icon > .fa-icon_clock,
-.fa-icon > .fa-icon_cog,
-.fa-icon > .fa-icon_download,
-.fa-icon > .fa-icon_eraser,
 .fa-icon > .fa-icon_eye-dropper,
-.fa-icon > .fa-icon_film,
-.fa-icon > .fa-icon_filter,
+.fa-icon > .fa-icon_eye-slash,
+.fa-icon > .fa-icon_files-o,
+.fa-icon > .fa-icon_list-alt {
+    width: calc(1em * 1792 / 1792);
+    }
+.fa-icon > .fa-icon_font {
+    width: calc(1em * 1664 / 1792);
+    }
+.fa-icon > .fa-icon_home {
+    width: calc(1em * 1612 / 1792);
+    }
+.fa-icon > .fa-icon_floppy-o,
 .fa-icon > .fa-icon_info-circle,
-.fa-icon > .fa-icon_list-alt,
-.fa-icon > .fa-icon_pause-circle,
-.fa-icon > .fa-icon_play-circle,
+.fa-icon > .fa-icon_pause-circle-o,
+.fa-icon > .fa-icon_play-circle-o,
 .fa-icon > .fa-icon_power-off,
-.fa-icon > .fa-icon_question-circle,
-.fa-icon > .fa-icon_reply,
-.fa-icon > .fa-icon_search-minus,
-.fa-icon > .fa-icon_search-plus,
-.fa-icon > .fa-icon_sliders-h,
-.fa-icon > .fa-icon_spinner,
-.fa-icon > .fa-icon_sync-alt,
-.fa-icon > .fa-icon_th,
-.fa-icon > .fa-icon_th-list,
-.fa-icon > .fa-icon_unlink {
-    width: calc(1em * 512 / 512);
-    }
-.fa-icon > .fa-icon_angle-double-left,
-.fa-icon > .fa-icon_arrow-left,
-.fa-icon > .fa-icon_arrow-right,
-.fa-icon > .fa-icon_copy,
-.fa-icon > .fa-icon_font,
-.fa-icon > .fa-icon_lock,
-.fa-icon > .fa-icon_plus,
-.fa-icon > .fa-icon_save,
-.fa-icon > .fa-icon_unlock,
-.fa-icon > .fa-icon_trash-alt {
-    width: calc(1em * 448 / 512);
+.fa-icon > .fa-icon_refresh,
+.fa-icon > .fa-icon_sliders {
+    width: calc(1em * 1536 / 1792);
+    }
+.fa-icon > .fa-icon_filter {
+    width: calc(1em * 1410 / 1792);
     }
 .fa-icon > .fa-icon_times {
-    width: calc(1em * 352 / 512);
+    width: calc(1em * 1188 / 1792);
+    }
+.fa-icon > .fa-icon_lock {
+    width: calc(1em *  1152 / 1792);
     }
 .fa-icon > .fa-icon_angle-up,
-.fa-icon > .fa-icon_angle-double-up,
-.fa-icon > .fa-icon_bolt {
-    width: calc(1em * 320 / 512);
+.fa-icon > .fa-icon_double-angle-up {
+    width: calc(1em *  998 / 1792);
+    }
+.fa-icon > .fa-icon_double-angle-left {
+    width: calc(1em *  966 / 1792);
     }
-.fa-icon > .fa-icon_ellipsis-v {
-    width: calc(1em * 192 / 512);
+.fa-icon > .fa-icon_bolt {
+    width: calc(1em *  896 / 1792);
     }

src/css/logger-ui.css

@@ -77,7 +77,6 @@ textarea {
 #inspectors {
     flex-grow: 1;
     font-family: "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-    font-size: 13px;
     }
 .inspector {
     border-top: 1px solid #ccc;
@@ -86,6 +85,7 @@ textarea {
     }
 .vscrollable {
     flex-grow: 1;
+    font-size: small;
     overflow-x: hidden;
     overflow-y: auto;
 }
@@ -157,9 +157,6 @@ textarea {
     top: 100%;
     z-index: 100;
     }
-#netInspector #filterExprButton.on {
-    fill: #5F9EA0;
-    }
 #netInspector #filterExprButton.expanded ~ #filterExprPicker {
     display: flex;
     }
@@ -684,7 +681,7 @@ body.colorBlind  #netFilteringDialog .dialog > div.containers > div.dynamic tr.e
     font-size: larger;
     }
 #filterFinderDialog .filterFinderListEntry {
-    align-items: center;
+    align-items: flex-end;
     display: flex;
     }
 #filterFinderDialog .filterFinderListEntry a {

src/css/popup.css

@@ -98,7 +98,7 @@ p {
 #switch .fa-icon {
     fill: #0046ff;
     cursor: pointer;
-    font-size: 650%;
+    font-size: 700%;
     margin: 0;
     padding: 0;
     }
@@ -161,25 +161,21 @@ body.off #switch .fa-icon {
 #extraTools > span:first-of-type {
     margin-left: 0.9em;
     }
-#extraTools > span > span:last-of-type {
-    color: #e00;
+#extraTools > span > .nope {
     left: 50%;
     position: absolute;
-    top: 0;
-    transform: translateX(-50%);
-    visibility: hidden;
-    }
-#extraTools > span > span:last-of-type > svg {
     stroke: red;
     stroke-width: 2;
+    transform: translateX(-50%);
+    visibility: hidden;
     width: 1em;
     }
-#extraTools > span.on > span:last-of-type {
+#extraTools > span.on > .nope {
     visibility: visible;
     }
 #extraTools > span:hover {
-    color: #333;
-    fill: #333;
+    color: #222;
+    fill: #222;
     }
 
 #refresh {
@@ -498,11 +494,11 @@ body.advancedUser #firewallContainer > div > span.noopRule.ownRule {
     border-radius: 4px;
     cursor: pointer;
     display: inline-block;
-    font-size: 1.5em;
+    font-size: 1.8em;
     line-height: 1.0;
     margin: 0;
     margin-right: 0.1em;
-    padding: 0.3em 0.5em;
+    padding: 0.2em 0.4em;
     text-align: center;
     width: 1em;
     }

src/img/fontawesome/LICENSE.txt

@@ -1,34 +1,25 @@
-Font Awesome Free License
--------------------------
+# [Font Awesome v4.7.0](http://fontawesome.io)
+### The iconic font and CSS framework
 
-Font Awesome Free is free, open source, and GPL friendly. You can use it for
-commercial projects, open source projects, or really almost whatever you want.
-Full Font Awesome Free license: https://fontawesome.com/license/free.
+Font Awesome is a full suite of 675 pictographic icons for easy scalable vector graphics on websites,
+created and maintained by [Dave Gandy](https://twitter.com/davegandy).
+Stay up to date with the latest release and announcements on Twitter:
+[@fontawesome](http://twitter.com/fontawesome).
 
-# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
-In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
-packaged as SVG and JS file types.
+Get started at http://fontawesome.io!
 
-# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
-In the Font Awesome Free download, the SIL OLF license applies to all icons
-packaged as web and desktop font files.
+## License
+- The Font Awesome font is licensed under the SIL OFL 1.1:
+  - http://scripts.sil.org/OFL
+- Font Awesome CSS, LESS, and Sass files are licensed under the MIT License:
+  - https://opensource.org/licenses/mit-license.html
+- The Font Awesome documentation is licensed under the CC BY 3.0 License:
+  - http://creativecommons.org/licenses/by/3.0/
+- Attribution is no longer required as of Font Awesome 3.0, but much appreciated:
+  - `Font Awesome by Dave Gandy - http://fontawesome.io`
+- Full details: http://fontawesome.io/license/
 
-# Code: MIT License (https://opensource.org/licenses/MIT)
-In the Font Awesome Free download, the MIT license applies to all non-font and
-non-icon files.
-
-# Attribution
-Attribution is required by MIT, SIL OLF, and CC BY licenses. Downloaded Font
-Awesome Free files already contain embedded comments with sufficient
-attribution, so you shouldn't need to do anything additional when using these
-files normally.
-
-We've kept attribution comments terse, so we ask that you do not actively work
-to remove them from files, especially code. They're a great way for folks to
-learn about Font Awesome.
-
-# Brand Icons
-All brand icons are trademarks of their respective owners. The use of these
-trademarks does not indicate endorsement of the trademark holder by Font
-Awesome, nor vice versa. **Please do not use brand logos for any purpose except
-to represent the company, product, or service to which they refer.**
+## Author
+- Email: dave@fontawesome.io
+- Twitter: http://twitter.com/davegandy
+- GitHub: https://github.com/davegandy