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.

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

[Highlighter] - Ui update export flow #5328

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

[Highlighter] - Ui update export flow #5328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7f76f80
base works
marvinoffers Mar 14, 2025
e11d812
css cleanup
marvinoffers Mar 14, 2025
2ca5bab
Merge branch 'master' into highlighter/new-export-flow
marvinoffers Mar 17, 2025
0f6369b
only use enabled clips
marvinoffers Mar 17, 2025
398d015
adjusted colors
marvinoffers Mar 17, 2025
ba56ccb
wording fixes
marvinoffers Mar 17, 2025
43812e8
removed change
marvinoffers Mar 17, 2025
8d861cd
review fixes
marvinoffers Mar 25, 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
2 changes: 1 addition & 1 deletion app/components-react/highlighter/ClipsViewModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default function ClipsViewModal({
{
trim: '60%',
preview: '700px',
export: '700px',
export: 'fit-content',
remove: '400px',
}[modal],
);
Expand Down
7 changes: 0 additions & 7 deletions app/components-react/highlighter/EducationCarousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,28 +119,24 @@ const SupportedGameModes = () => (
<div className={styles.gameModeImageWrapper}>
<img
src="https://cdn.streamlabs.com/static/imgs/carousel-images/battle-royale.png"
alt=""
className={styles.gameModeImage}
/>
</div>
<div className={styles.gameModeImageWrapper}>
<img
src="https://cdn.streamlabs.com/static/imgs/carousel-images/zero-build.png"
alt=""
className={styles.gameModeImage}
/>
</div>
<div className={styles.gameModeImageWrapper}>
<img
src="https://cdn.streamlabs.com/static/imgs/carousel-images/reload.png"
alt=""
className={styles.gameModeImage}
/>
</div>
<div className={styles.gameModeImageWrapper}>
<img
src="https://cdn.streamlabs.com/static/imgs/carousel-images/og.png"
alt=""
className={styles.gameModeImage}
/>
</div>
Expand All @@ -163,7 +159,6 @@ const Overlay = () => (
</div>
<img
src="https://cdn.streamlabs.com/static/imgs/carousel-images/correct.png"
alt=""
className={styles.gameModeImage}
/>
</div>
Expand All @@ -176,7 +171,6 @@ const Overlay = () => (
</div>
<img
src="https://cdn.streamlabs.com/static/imgs/carousel-images/false-map.png"
alt=""
className={styles.gameModeImage}
/>
</div>{' '}
Expand All @@ -187,7 +181,6 @@ const Overlay = () => (
</div>
<img
src="https://cdn.streamlabs.com/static/imgs/carousel-images/false-overlay.png"
alt=""
className={styles.gameModeImage}
/>
</div>
Expand Down
259 changes: 259 additions & 0 deletions app/components-react/highlighter/ExportModal.m.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,262 @@
.log-in {
text-align: center;
}

.modal-wrapper {
:global {
/* Hide labels */
.ant-form-item-label,
[class*='ant-col'] .ant-form-item-label {
display: none !important;
}

/* Hide the button addon */
.ant-input-group-addon,
.ant-input-wrapper .ant-input-group-addon,
.ant-input-group-wrapper .ant-input-group-addon {
position: absolute;
left: 88%;
bottom: 24px;
background-color: transparent;
}

/* Style the input */
.ant-input,
input.ant-input,
.ant-input-disabled,
input.ant-input-disabled {
border: none !important;
background-color: transparent !important;
font-family: monospace !important;
box-shadow: none !important;
padding: 0 !important;
color: inherit !important;
}

/* Fix overall form item spacing */
.ant-form-item,
.ant-row.ant-form-item {
margin-bottom: 8px !important;
}

/* Adjust column widths */
.ant-col.ant-form-item-control {
flex: 1 1 100% !important;
max-width: 100% !important;
}
}
}

.settings-and-progress {
width: 422px;
display: flex;
flex-direction: column;
gap: 12px;
}

.path-wrapper {
display: flex;
justify-content: space-between;
flex-direction: column;
margin-top: 12px;
width: 100%;
}

.custom-input {
width: 100%;
border: none;
outline: none;
background-color: transparent;
padding: 0;
color: inherit;
}

.stream-path {
font-family: monospace;
font-size: 10px;
opacity: 0.8;
}

.thumbnail {
position: relative;
border-radius: 8px;
overflow: hidden;
max-height: 390px;
margin: 0 auto;

--thumbHeight: 180px;
overflow-x: clip;

height: calc(var(--thumbHeight) * 1.32);
background: var(--Day-Colors-Dark-4, #4f5e65);
}

.thumbnail-in-progress img {
position: relative;
filter: blur(10px);
}

.thumbnail img {
height: 100%;
}

.thumbnail::before {
content: '';
border-style: solid;
border-width: 1px;
border-color: #ffffff29;
border-radius: 8px;
position: absolute;
width: 100%;
height: 100%;
}

.clip-info-wrapper {
display: flex;
justify-content: space-between;
align-items: center;
}

.progress-item {
position: absolute;
width: 100%;
padding: 24px;
z-index: 10;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
display: flex;
flex-direction: column;
justify-content: center;
text-align: center;
}

.progress-item h1 {
font-size: 32px;
margin: 0;
margin-bottom: -8px;
font-weight: 600;
color: white;
}

.progress-item p {
margin: 0;
font-size: 14px;
color: white;
}

.is-disabled {
pointer-events: none;
opacity: 0.7;
}

.inner-dropdown-wrapper {
position: relative;
border-radius: 8px;
width: 100%;
height: 40px;
background-color: var(--dropdown-alt-bg);
padding: 4px;
padding-left: 12px;
padding-right: 14px;
display: flex;
justify-content: space-between;
align-items: center;
color: var(--title);
cursor: pointer;
}

.inner-item-wrapper {
position: absolute;
width: 100%;
background-color: #232d35;
padding: 4px;
border-radius: 8px;
}
.inner-dropdown-item {
color: white;
width: 100%;
height: 32px;
border-radius: 4px;
background-color: #232d35;
display: flex;
align-items: center;
padding-left: 8px;
cursor: pointer;
}

.inner-dropdown-item.active {
background-color: #e6e8f807;
cursor: default;
}

.inner-dropdown-item:hover {
background-color: rgba(230, 232, 248, 0.12);
}

.dropdown-text {
font-size: 16px;
display: flex;
align-items: center;
}
.dropdown-text p {
margin: 0;
font-size: 12px;
margin-left: 8px;
opacity: 0.6;
font-size: 12px;
}

.custom-section {
width: 100%;
display: flex;
flex-direction: column;
gap: 4px;
}

.custom-item-wrapper {
display: flex;
justify-content: space-between;
width: 100%;
padding-left: 14px;
align-items: center;
}

.orientation-toggle {
display: flex;
padding: 4px;
gap: 4px;
border-radius: 8px;
background-color: var(--dropdown-alt-bg);
cursor: pointer;
box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.13), 0px 1px 4px 0px rgba(0, 0, 0, 0.13);
}

.orientation-button {
width: 32px;
height: 32px;
border-radius: 4px;
display: grid;
place-content: center;
opacity: 0.6;
background-color: transparent;

&.active {
background-color: var(--dropdown-bg);
opacity: 1;
}
}

.vertical-icon {
width: 14px;
height: 22px;
border: 2px solid var(--title);
border-radius: 3px;
}

.horizontal-icon {
width: 22px;
height: 14px;
border: 2px solid var(--title);
border-radius: 3px;
}
Loading
Loading