Skip to content

[pull] master from ajayyy:master #78

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.

Sign up for GitHub

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

Merged
pull merged 5 commits into from
Sep 9, 2025
Merged

[pull] master from ajayyy:master #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13f9914
Request unlimited storate permission in sponsorblock on Firefox
ajayyy Aug 9, 2025
40eabe6
Add channel skip profiles
ajayyy Sep 9, 2025
9753b7c
Merge branch 'master' of https://github.com/ajayyy/SponsorBlock
ajayyy Sep 9, 2025
05fa9ff
Fix skip profile fallback for toggle settings not working
ajayyy Sep 9, 2025
e1e6660
Handle popup staying open for videoID changes
ajayyy Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion manifest/firefox-manifest-extra.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@
},
"browser_action": {
"default_area": "navbar"
}
},
"permissions": [
"unlimitedStorage"
]
}
2 changes: 1 addition & 1 deletion maze-utils
Open in desktop
Submodule maze-utils updated 2 files
+3 −3 src/config.ts
+12 −0 src/video.ts
2 changes: 1 addition & 1 deletion public/_locales
Open in desktop
Submodule _locales updated 1 files
+65 −14 en/messages.json
59 changes: 56 additions & 3 deletions public/options/options.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,26 @@ html, body {
color: white;
}

.option-group > div {
.option-group > div, .extraOptionGroup {
min-height: 50px;
padding: 15px 0;
border-bottom: 1px solid var(--border-color);
border-image: linear-gradient(to right, var(--border-color), #00000000 80%) 1;
}
.option-group > div {
border-bottom: 1px solid var(--border-color);
}
.extraOptionGroup {
border-top: 1px solid var(--border-color);
}
.extraOptionGroup tr:not(:last-child) {
padding-bottom: 15px;
display: block;
}
#category-type {
padding: 0;
}

.categoryExtraOptions {
.categoryChooserTable .categoryExtraOptions {
padding-bottom: 15px;
}

Expand Down Expand Up @@ -364,6 +376,11 @@ input[type='number'] {
padding: 4px;
}

.sb-number-input {
margin-left: 4px;
margin-right: 4px;
}

.switch-label {
width: inherit;
}
Expand Down Expand Up @@ -744,4 +761,40 @@ svg {
.advanced-config-help-message {
margin-bottom: 10px;
transition: none;
}

.categoryChooserTopRow {
display: flex;
align-items: center;
justify-content: space-between;

margin-bottom: 10px;
}

.partiallyHidden {
opacity: 0.5;
}

.partiallyHidden:hover {
opacity: 1;
}

.reset-button svg {
margin-left: 5px;
width: 10px;
fill: var(--white);

cursor: pointer;
}

.skipProfileMenu {
position: absolute;
}

.configurationInfo > *:not(:last-child) {
margin-bottom: 10px;
}

.configurationInfo .option-text-box {
width: 100%;
}
60 changes: 0 additions & 60 deletions public/options/options.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,66 +80,6 @@
</a>
</div>

<div data-type="toggle" data-sync="muteSegments">
<div class="switch-container">
<label class="switch">
<input id="muteSegments" type="checkbox" checked>
<span class="slider round"></span>
</label>
<label class="switch-label" for="muteSegments">
__MSG_muteSegments__
</label>
</div>
</div>

<div data-type="toggle" data-sync="fullVideoSegments" class="no-bottom-border">
<div class="switch-container">
<label class="switch">
<input id="fullVideoSegments" type="checkbox" checked>
<span class="slider round"></span>
</label>
<label class="switch-label" for="fullVideoSegments">
__MSG_fullVideoSegments__
</label>
</div>
</div>

<div data-type="toggle" data-sync="fullVideoLabelsOnThumbnails"
data-dependent-on="fullVideoSegments">
<div class="switch-container">
<label class="switch">
<input id="fullVideoLabelsOnThumbnails" type="checkbox" checked>
<span class="slider round"></span>
</label>
<label class="switch-label" for="fullVideoLabelsOnThumbnails">
__MSG_fullVideoLabelsOnThumbnails__
</label>
</div>
</div>

<div data-type="number-change" data-sync="minDuration">
<label class="number-container">
<span class="optionLabel">__MSG_minDuration__</span>
<input type="number" step="0.1" min="0">
</label>

<div class="small-description">__MSG_minDurationDescription__</div>
</div>

<div data-type="toggle" data-sync="manualSkipOnFullVideo">
<div class="switch-container">
<label class="switch">
<input id="manualSkipOnFullVideo" type="checkbox" checked>
<span class="slider round"></span>
</label>
<label class="switch-label" for="manualSkipOnFullVideo">
__MSG_enableManualSkipOnFullVideo__
</label>
</div>

<div class="small-description">__MSG_whatManualSkipOnFullVideo__</div>
</div>

<div data-type="react-AdvancedSkipOptionsComponent"></div>

<div data-type="toggle" data-sync="forceChannelCheck">
Expand Down
60 changes: 59 additions & 1 deletion public/popup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@
border-radius: 8px;
background-color: var(--sb-grey-bg-color);
justify-content: space-evenly;
overflow: hidden;
display: flex;
position: relative;
}
.sbControlsMenu-item {
display: flex;
Expand Down Expand Up @@ -627,4 +627,62 @@
.sbPopupButton {
width: 16px;
fill: var(--sb-main-fg-color);
}

#skipProfileMenu {
position: absolute;
top: 80px;
left: 50%;

background-color: #292828;
border-radius: 10px;
padding: 10px;

transform: translateX(-50%);
}

#skipProfileActions {
padding-top: 10px;
}

.skipOptionAction {
transition: border-color 0.2s ease-in-out, background-color 0.2s ease-in-out;
font-size: 14px;
padding: 5px;
margin: 5px;

background-color: #222;
border-radius: 5px;

cursor: help;
user-select: none;

border-color: transparent;
border-width: 2px;
border-style: solid;
}
.skipOptionAction:not(.highlighted, .disabled):hover {
background-color: var(--sb-grey-bg-color);
}
.skipOptionAction.selected {
border-color: var(--sb-red-bg-color);
}
.skipOptionAction.highlighted {
border-color: rgb(127, 0, 0);
}
.skipOptionAction:not(.highlighted, .disabled) {
cursor: pointer;
}
.skipOptionAction.disabled {
color: #808080
}

.optionsSelector {
background-color: #c00000;
color: white;

border: none;
font-size: 14px;
padding: 5px;
border-radius: 5px;
}
Loading