Skip to content
This repository has been archived by the owner on Jul 21, 2021. It is now read-only.

Minor fixes #1005

Merged
merged 10 commits into from
Dec 30, 2018
Merged

Minor fixes #1005

merged 10 commits into from
Dec 30, 2018

Conversation

xofe
Copy link
Contributor

@xofe xofe commented Dec 30, 2018

Similar to my previous PR #839, here's another handful of minor fixes for things I've noticed when working on a personal build on uMatrix. Each change is independent, so if any aren't wanted I'm happy to rebase and drop that commit.

Fixes:

  • correct the cloud icon CSS selectors (FontAwesome v4.7 doesn't have the "-alt" suffix)
  • fixed scope button tooltip in logger not appearing properly due to missing "tip-anchor" class
  • open logger/dashboard links adjacent to current tab instead of at the end (like uBO does - makes it easier when many tabs are open)
  • fix dist/version file not being used when building the Opera version (not sure if you're still updating Opera version though)
  • use options_ui in Chromium manifest (from uBO - gorhill/uBlock@6dd6dc5)
  • remove unused "processReferer" setting (it was changed to a matrix switch in 5d8bae3)
  • remove unused profiler code (from uBO - gorhill/uBlock@f516cd3)
  • remove bold version of the Roboto font (the popup currently uses only light and regular versions - removing bold reduces the size of the xpi/zip package by 75 kB)
  • correct the FontAwesome license after changing back to v4.7 (it still contained the v5.0 license - I copied the v4.7 license notes from the uBO change gorhill/uBlock@bb737e2)

On a similar note, I've been using @rhendric's code cleaning changes posted in uBlockOrigin/uMatrix-issues#16 without any issues - I think they'd be worth merging in too.

@gorhill
Copy link
Owner

gorhill commented Dec 30, 2018

Looks all good to me, thank you very much.

@gorhill gorhill merged commit 2045397 into gorhill:master Dec 30, 2018
@xofe
Copy link
Contributor Author

xofe commented Dec 30, 2018

You're welcome!

Any thoughts on the changes in master...rhendric:cleaning (uBlockOrigin/uMatrix-issues#16)? I didn't include them in this PR as I wasn't sure if the authorship would be preserved.

@gorhill
Copy link
Owner

gorhill commented Dec 30, 2018

The PR changed the semantic of the block count on the matrix filtering button, and I questioned that.

Looking again into it, I realize the matrix filtering button count badge is already broken anyways.

The intent was that the count reflects only what is blocked as a result of matrix filtering, not what is blocked as a result of other switches doing their work (you will notice the uMatrix icon badge differs from the matrix filtering button badge when you have referrer spoofing enabled).

But now I see it's broken anyways since resources blocked as a result of "Forbid mixed content" are reported on the matrix filtering button anyways.

So I will merge the request, keeping in mind there is still something to fix (unrelated to the PR) with regard to the matrix filtering button badge count.

@gorhill gorhill mentioned this pull request Dec 30, 2018
@xofe xofe deleted the minor-fixes-2 branch December 30, 2018 15:04
@xofe xofe mentioned this pull request Aug 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants