Skip to content

Fix: Several OBS Source Effects Lacked Padding #2602

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
SReject merged 2 commits into from
Jul 11, 2024
Merged

Fix: Several OBS Source Effects Lacked Padding #2602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c39c2af
Fix: OBS Source Effects Padding
phroggster Jul 9, 2024
b4f4e86
Merge branch 'v5' into issue_2580
SReject Jul 11, 2024
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
2 changes: 1 addition & 1 deletion src/backend/integrations/builtin/obs/effects/set-obs-browser-source-url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const SetOBSBrowserSourceUrlEffectType: EffectType<{
No sources found. {{ isObsConfigured ? "Is OBS running?" : "Have you configured the OBS integration?" }}
</div>
</eos-container>
<eos-container ng-if="browserSources != null && effect.browserSourceName != null" header="URL" style="margin-top: 10px;">
<eos-container ng-if="browserSources != null && effect.browserSourceName != null" header="URL" style="margin-top: 10px;" pad-top="true">
<firebot-input model="effect.url"></firebot-input>
</eos-container>
`,
Expand Down
2 changes: 1 addition & 1 deletion src/backend/integrations/builtin/obs/effects/set-obs-color-source-color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const SetOBSColorSourceColorEffectType: EffectType<{
</div>
</eos-container>

<eos-container ng-if="colorSources != null && effect.colorSourceName != null" header="Color" style="margin-top: 10px;">
<eos-container ng-if="colorSources != null && effect.colorSourceName != null" header="Color" style="margin-top: 10px;" pad-top="true">
<firebot-input model="effect.color" placeholder-text="Format: #0066FF or #FF336699"></firebot-input>
</eos-container>
`,
Expand Down
2 changes: 1 addition & 1 deletion src/backend/integrations/builtin/obs/effects/set-obs-image-source-file.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const SetOBSImageSourceFileEffectType: EffectType<{
</div>
</eos-container>

<eos-container ng-if="imageSources != null && effect.imageSourceName != null" header="File" style="margin-top: 10px;">
<eos-container ng-if="imageSources != null && effect.imageSourceName != null" header="File" style="margin-top: 10px;" pad-top="true">
<file-chooser model="effect.file" options="{ filters: [ {name: 'OBS-Supported Image Files', extensions: ['png', 'jpg', 'jpeg', 'gif', 'bmp', 'tga', 'jxr', 'psd', 'webp']}, {name: 'All Files', extensions: ['*']} ]}"></file-chooser>
</eos-container>
`,
Expand Down
2 changes: 1 addition & 1 deletion src/backend/integrations/builtin/obs/effects/set-obs-media-source-file.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const SetOBSMediaSourceFileEffectType: EffectType<{
</div>
</eos-container>

<eos-container ng-if="mediaSources != null && effect.mediaSourceName != null" header="File" style="margin-top: 10px;">
<eos-container ng-if="mediaSources != null && effect.mediaSourceName != null" header="File" style="margin-top: 10px;" pad-top="true">
<file-chooser model="effect.file" options="{ filters: [ {name: 'OBS-Supported Video Files', extensions: ['mp4', 'm4v', 'ts', 'mov', 'mxf', 'flv', 'mkv', 'avi', 'gif', 'webm']}, {name: 'OBS-Supported Audio Files', extensions: ['mp3', 'aac', 'ogg', 'wav']}, {name: 'All Files', extensions: ['*']} ]}"></file-chooser>
</eos-container>
`,
Expand Down
2 changes: 1 addition & 1 deletion src/backend/integrations/builtin/obs/effects/set-obs-source-text.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const SetOBSSourceTextEffectType: EffectType<{
No sources found. {{ isObsConfigured ? "Is OBS running?" : "Have you configured the OBS integration?" }}
</div>
</eos-container>
<eos-container ng-if="textSources != null && effect.textSourceName != null" header="Text" style="margin-top: 10px;">
<eos-container ng-if="textSources != null && effect.textSourceName != null" header="Text" style="margin-top: 10px;" pad-top="true">
<label class="control-fb control--checkbox">Use file as text source
<input type="checkbox" ng-click="toggleSource()" ng-checked="effect.textSource === 'file'" aria-label="..." >
<div class="control__indicator"></div>
Expand Down