Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Sponsorblock Default Category Colors #5686

Merged
merged 2 commits into from
Sep 11, 2024

Conversation

Neuheit
Copy link
Contributor

@Neuheit Neuheit commented Sep 11, 2024

Title

Pull Request Type

  • Bugfix
  • Feature Implementation
  • Documentation
  • Other

Related issue

Closes #5622

Description

This PR changes the default sponsorblock segment colors to ones that match the extension's defaults

Screenshots

Before:
image

After:
image

Testing

Desktop

  • OS: Windows
  • OS Version: 11
  • FreeTube version: v0.21.3 Beta

Additional context

@github-actions github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Sep 11, 2024
@FreeTubeBot FreeTubeBot enabled auto-merge (squash) September 11, 2024 00:55
@PikachuEXE
Copy link
Collaborator

Default extension colors got from installing the extension
image
image
image

@PikachuEXE
Copy link
Collaborator

Interaction should be pink?
Filler should be purple?

auto-merge was automatically disabled September 11, 2024 03:00

Head branch was pushed to by a user without write access

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) September 11, 2024 03:00
@Neuheit
Copy link
Contributor Author

Neuheit commented Sep 11, 2024

New colors

image

@FreeTubeBot FreeTubeBot merged commit 1376009 into FreeTubeApp:development Sep 11, 2024
6 checks passed
@github-actions github-actions bot removed the PR: waiting for review For PRs that are complete, tested, and ready for review label Sep 11, 2024
PikachuEXE added a commit to PikachuEXE/FreeTube that referenced this pull request Sep 12, 2024
* development: (24 commits)
  Add ability to see comment replies of community posts through invidious (FreeTubeApp#5589)
  Bump electron-builder from 24.13.3 to 25.0.5 (FreeTubeApp#5674)
  Change Sponsorblock Default Category Colors (FreeTubeApp#5686)
  Proxy live streams when "Proxy Videos Through Invidious" is enabled (FreeTubeApp#5649)
  Translated using Weblate (Belarusian)
  Translated using Weblate (Hebrew)
  Fix saving Invidious thumbnail URLs for subscriptions (FreeTubeApp#5662)
  Bump peter-evans/create-pull-request from 6 to 7 (FreeTubeApp#5676)
  Bump webpack-dev-server from 5.0.4 to 5.1.0 (FreeTubeApp#5672)
  Use auto-generated playlists for the videos tab on artist topic channels (FreeTubeApp#5661)
  Rewrite locale file updating to be more Vue 3 friendly (FreeTubeApp#5660)
  Bump sass from 1.77.8 to 1.78.0 (FreeTubeApp#5673)
  Bump electron from 32.0.1 to 32.0.2 (FreeTubeApp#5671)
  Bump marked from 14.1.0 to 14.1.2 (FreeTubeApp#5670)
  Bump postcss from 8.4.44 to 8.4.45 in the stylelint group (FreeTubeApp#5669)
  Bump the eslint group with 2 updates (FreeTubeApp#5668)
  Cleanup a few vue-i18n usages (FreeTubeApp#5663)
  Use nextTick instead of setTimeout to wait until Vue has rendered changes (FreeTubeApp#5664)
  Translated using Weblate (Estonian)
  Translated using Weblate (Belarusian)
  ...

# Conflicts:
#	src/renderer/components/ft-community-post/ft-community-post.js
#	src/renderer/helpers/api/local.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature Request]: Use Sponsorblock default colors
5 participants