diff --git a/manifest/chrome-manifest-extra.json b/manifest/chrome-manifest-extra.json index fbfe224230..c47f1f0402 100644 --- a/manifest/chrome-manifest-extra.json +++ b/manifest/chrome-manifest-extra.json @@ -53,6 +53,8 @@ "icons/PlayerInfoIconSponsorBlocker.svg", "icons/PlayerDeleteIconSponsorBlocker.svg", "icons/dearrow.svg", + "icons/sb-pride.png", + "icons/pride.svg", "popup.html", "popup.css", "content.css", diff --git a/manifest/manifest-v2-extra.json b/manifest/manifest-v2-extra.json index e9dad9f32e..f149e1c30b 100644 --- a/manifest/manifest-v2-extra.json +++ b/manifest/manifest-v2-extra.json @@ -45,6 +45,8 @@ "icons/PlayerInfoIconSponsorBlocker.svg", "icons/PlayerDeleteIconSponsorBlocker.svg", "icons/dearrow.svg", + "icons/sb-pride.png", + "icons/pride.svg", "popup.html", "popup.css", "content.css", diff --git a/manifest/manifest.json b/manifest/manifest.json index b840fdc1a6..36f9776e7a 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "SponsorBlock", - "version": "6.0.1", + "version": "6.0.2", "default_locale": "en", "description": "__MSG_Description__", "homepage_url": "https://sponsor.ajay.app", diff --git a/public/_locales b/public/_locales index 32c293e861..daa96aa537 160000 --- a/public/_locales +++ b/public/_locales @@ -1 +1 @@ -Subproject commit 32c293e8617e9be661fc8b19912858340a1df4f1 +Subproject commit daa96aa537195417e32db346122b5b55678da76b diff --git a/public/content.css b/public/content.css index 57be071bfe..f3eaaf9308 100644 --- a/public/content.css +++ b/public/content.css @@ -973,4 +973,26 @@ input::-webkit-inner-spin-button { .sponsorblock-chapter-visible { display: block !important; +} + +/* Pride theme */ + +.playerButton.prideTheme:nth-of-type(1) { + filter: brightness(50%) sepia(100) saturate(100); +} + +.playerButton.prideTheme:nth-of-type(2) { + filter: sepia(100) saturate(100) hue-rotate(0deg); +} + +.playerButton.prideTheme:nth-of-type(3) { + filter: sepia(100) saturate(100) hue-rotate(45deg); +} + +.playerButton.prideTheme:nth-of-type(4) { + filter: sepia(100) saturate(100) invert() hue-rotate(5deg); +} + +.playerButton.prideTheme:nth-of-type(5) { + filter: sepia(100) saturate(100) invert() hue-rotate(35deg); } \ No newline at end of file diff --git a/public/icons/pride.svg b/public/icons/pride.svg new file mode 100644 index 0000000000..ec2fbecdb5 --- /dev/null +++ b/public/icons/pride.svg @@ -0,0 +1,90 @@ + + diff --git a/public/icons/sb-pride.png b/public/icons/sb-pride.png new file mode 100644 index 0000000000..c73802e667 Binary files /dev/null and b/public/icons/sb-pride.png differ diff --git a/public/options/options.css b/public/options/options.css index 35ae92af19..5ebc6bfe69 100644 --- a/public/options/options.css +++ b/public/options/options.css @@ -17,6 +17,10 @@ --border-color: #484848; --black: black; --white: white; + + --selector-red: #c00000; + --selector-red-hover: #fc0303; + --tab-selected: #950000; } [data-theme="light"] { @@ -38,6 +42,10 @@ --white: black; } +[data-theme="pride"] { + --menu-background: #181818d0; +} + .medium-description, .switch-container, .optionLabel, .categoryTableElement, .promotion-description { color: var(--white); } @@ -58,6 +66,12 @@ html, body { background-color: var(--background); } +[data-theme="pride"] body { + background: url("../icons/pride.svg"); + background-size: contain; +} + + * { box-sizing: border-box; } @@ -107,15 +121,99 @@ html, body { } .tab-heading.selected { - background-color: #c00000; + background-color: var(--selector-red); color: white; } .tab-heading:active { - background-color: #950000; + background-color: var(--tab-selected); color: white; } +[data-theme="pride"] .tab-heading:nth-of-type(1) { + background-color: #2f0000; +} +[data-theme="pride"] .tab-heading:nth-of-type(2) { + background-color: #3a2000; +} +[data-theme="pride"] .tab-heading:nth-of-type(3) { + background-color: #3e3a00; +} +[data-theme="pride"] .tab-heading:nth-of-type(4) { + background-color: #003e13; +} +[data-theme="pride"] .tab-heading:nth-of-type(5) { + background-color: #00164a; +} + +[data-theme="pride"] .tab-heading:hover:nth-of-type(1) { + background-color: #550000; +} +[data-theme="pride"] .tab-heading:hover:nth-of-type(2), +[data-theme="pride"] #category-type tr:nth-of-type(5n) .slider, +[data-theme="pride"] [data-type="toggle"]:nth-of-type(5n) .slider { + background-color: #824700; +} +[data-theme="pride"] .tab-heading:hover:nth-of-type(3), +[data-theme="pride"] #category-type tr:nth-of-type(5n + 1) .slider, +[data-theme="pride"] [data-type="toggle"]:nth-of-type(5n + 1) .slider { + background-color: #867d00; +} +[data-theme="pride"] .tab-heading:hover:nth-of-type(4), +[data-theme="pride"] #category-type tr:nth-of-type(5n + 2) .slider, +[data-theme="pride"] [data-type="toggle"]:nth-of-type(5n + 2) .slider { + background-color: #00691f; +} +[data-theme="pride"] .tab-heading:hover:nth-of-type(5), +[data-theme="pride"] #category-type tr:nth-of-type(5n + 3) .slider, +[data-theme="pride"] [data-type="toggle"]:nth-of-type(5n + 3) .slider { + background-color: #002374; +} +[data-theme="pride"] #category-type tr:nth-of-type(5n + 4) .slider, +[data-theme="pride"] [data-type="toggle"]:nth-of-type(5n + 4) .slider { + background-color: #400449; +} + +[data-theme="pride"] #category-type tr .optionsSelector { + color: var(--white); +} +[data-theme="pride"] .tab-heading:nth-of-type(1).selected { + background-color: #E40303; +} +[data-theme="pride"] .tab-heading:nth-of-type(2).selected, +[data-theme="pride"] #category-type tr:nth-of-type(10n + 2) .optionsSelector, +[data-theme="pride"] #category-type tr:nth-of-type(5n) input:checked + .slider, +[data-theme="pride"] [data-type]:nth-of-type(5n) :is(input:checked + .slider, .option-button, .optionsSelector) { + background-color: #dd7a00; +} +[data-theme="pride"] .tab-heading:nth-of-type(3).selected, +[data-theme="pride"] #category-type tr:nth-of-type(10n + 4) .optionsSelector, +[data-theme="pride"] #category-type tr:nth-of-type(2n + 1) .optionsSelector, +[data-theme="pride"] #category-type tr:nth-of-type(5n + 1) input:checked + .slider, +[data-theme="pride"] [data-type]:nth-of-type(5n + 1) :is(input:checked + .slider, .option-button, .optionsSelector) { + background-color: #FFED00; + color: rgb(23, 23, 23); +} +[data-theme="pride"] .tab-heading:nth-of-type(4).selected, +[data-theme="pride"] #category-type tr:nth-of-type(10n + 6) .optionsSelector, +[data-theme="pride"] #category-type tr:nth-of-type(5n + 2) input:checked + .slider, +[data-theme="pride"] [data-type]:nth-of-type(5n + 2) :is(input:checked + .slider, .option-button, .optionsSelector) { + background-color: #008026; +} +[data-theme="pride"] .tab-heading:nth-of-type(5).selected, +[data-theme="pride"] #category-type tr:nth-of-type(10n + 8) .optionsSelector, +[data-theme="pride"] #category-type tr:nth-of-type(5n + 3) input:checked + .slider, +[data-theme="pride"] [data-type]:nth-of-type(5n + 3) :is(input:checked + .slider, .option-button, .optionsSelector) { + background-color: #004DFF; +} +[data-theme="pride"] .tab-heading:nth-of-type(5).selected, +[data-theme="pride"] #category-type tr:nth-of-type(10n + 10) .optionsSelector, +[data-theme="pride"] #category-type tr:nth-of-type(5n + 4) input:checked + .slider, +[data-theme="pride"] [data-type]:nth-of-type(5n + 4) :is(input:checked + .slider, .option-button, .optionsSelector) { + background-color: #750787; +} + + .option-group > div, .extraOptionGroup { min-height: 50px; padding: 15px 0; @@ -135,7 +233,7 @@ html, body { padding: 0; } -.categoryChooserTable .categoryExtraOptions { +#category-type .categoryExtraOptions { padding-bottom: 15px; } @@ -310,7 +408,7 @@ input[type='number'] { .option-button { cursor: pointer; - background-color: #c00000; + background-color: var(--selector-red); padding: 10px; color: white; border-radius: 5px; @@ -320,7 +418,7 @@ input[type='number'] { } .option-button:hover:not(.disabled) { - background-color: #fc0303; + background-color: var(--selector-red-hover); } .option-button.disabled { @@ -430,7 +528,7 @@ input[type='number'] { } input:checked + .slider { - background-color: #fc0303; + background-color: var(--selector-red-hover); } input:checked + .slider:before { @@ -611,7 +709,7 @@ svg { } .optionsSelector { - background-color: #c00000; + background-color: var(--selector-red); color: white; border: none; diff --git a/public/options/options.html b/public/options/options.html index 68c9f6fd3d..a1867ab101 100644 --- a/public/options/options.html +++ b/public/options/options.html @@ -19,7 +19,7 @@
-