Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gorhill/uBlock
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5e1f4d7
Choose a base ref
...
head repository: gorhill/uBlock
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 07c950f
Choose a head ref
  • 4 commits
  • 10 files changed
  • 1 contributor

Commits on Aug 10, 2019

  1. Reflect blocking mode in badge color of toolbar icon

    Related feedback:
    - https://www.reddit.com/r/uBlockOrigin/comments/cmh910/
    
    Additionally, the `3p` rule has been made distinct from
    `3p-script`/`3p-frame` for the purpose of
    "Relax blocking mode" command.
    
    The badge color will hint at the current blocking mode.
    There are four colors for the four following blocking
    modes:
    - JavaScript wholly disabled
    - All 3rd parties blocked
    - 3rd-party scripts and frames blocked
    - None of the above
    
    The default badge color will be used when JavaScript is not
    wholly disabled and when there are no rules for `3p`,
    `3p-script` or `3p-frame`.
    
    A new advanced setting has been added to let the user choose
    the badge colors for the various blocking modes,
    `blockingProfileColors`. The value *must* be a sequence of
    4 valid CSS color values that match 6 hexadecimal digits
    prefixed with`#` -- anything else will be ignored.
    gorhill committed Aug 10, 2019
    4 Configuration menu
    Copy the full SHA
    7ff750e View commit details
    Browse the repository at this point in the history
  2. New revision for dev build

    gorhill committed Aug 10, 2019
    Configuration menu
    Copy the full SHA
    ce4d0bb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d5d6438 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2019

  1. Review icon badge color management

    Related commit & feedback:
    - 7ff750e
    
    The color value for the icon badge is now
    "attached" to the blocking profile value.
    Additionally, as per feedback, `3p` rules
    will be relaxing before master JavaScript
    switch rules.
    gorhill committed Aug 11, 2019
    Configuration menu
    Copy the full SHA
    07c950f View commit details
    Browse the repository at this point in the history
Loading