Merge branch 'development' into fix/calendar-scroll-position

Stremio · Feb 13, 2025 · b4ac4b4 · b4ac4b4
2 parents 7074e13 + d05488f
commit b4ac4b4
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 50 deletions.
diff --git a/src/components/NavBar/VerticalNavBar/styles.less b/src/components/NavBar/VerticalNavBar/styles.less
@@ -13,6 +13,7 @@
     background-color: transparent;
     overflow-y: auto;
     scrollbar-width: none;
+    -ms-overflow-style: none;
 
     &::-webkit-scrollbar {
         display: none;
@@ -21,6 +22,7 @@
     .nav-tab-button {
         width: calc(var(--vertical-nav-bar-size) - 1.2rem);
         height: calc(var(--vertical-nav-bar-size) - 1.2rem);
+        min-height: 3.5rem;
     }
 }
 

diff --git a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
@@ -213,60 +213,62 @@ const SubtitlesMenu = React.memo((props) => {
                 }
             </div>
             <div className={styles['subtitles-settings-container']}>
-                <div className={styles['settings-header']}>Subtitles Settings</div>
-                <DiscreteSelectInput
-                    className={styles['discrete-input']}
-                    label={t('DELAY')}
-                    value={typeof props.selectedExtraSubtitlesTrackId === 'string' && props.extraSubtitlesDelay !== null && !isNaN(props.extraSubtitlesDelay) ? `${(props.extraSubtitlesDelay / 1000).toFixed(2)}s` : '--'}
-                    disabled={typeof props.selectedExtraSubtitlesTrackId !== 'string' || props.extraSubtitlesDelay === null || isNaN(props.extraSubtitlesDelay)}
-                    onChange={onSubtitlesDelayChanged}
-                />
-                <DiscreteSelectInput
-                    className={styles['discrete-input']}
-                    label={t('SIZE')}
-                    value={
-                        typeof props.selectedSubtitlesTrackId === 'string' ?
-                            props.subtitlesSize !== null && !isNaN(props.subtitlesSize) ? `${props.subtitlesSize}%` : '--'
-                            :
-                            typeof props.selectedExtraSubtitlesTrackId === 'string' ?
-                                props.extraSubtitlesSize !== null && !isNaN(props.extraSubtitlesSize) ? `${props.extraSubtitlesSize}%` : '--'
+                <div className={styles['settings-header']}>{t('PLAYER_SUBTITLES_SETTINGS')}</div>
+                <div className={styles['settings-list']}>
+                    <DiscreteSelectInput
+                        className={styles['discrete-input']}
+                        label={t('DELAY')}
+                        value={typeof props.selectedExtraSubtitlesTrackId === 'string' && props.extraSubtitlesDelay !== null && !isNaN(props.extraSubtitlesDelay) ? `${(props.extraSubtitlesDelay / 1000).toFixed(2)}s` : '--'}
+                        disabled={typeof props.selectedExtraSubtitlesTrackId !== 'string' || props.extraSubtitlesDelay === null || isNaN(props.extraSubtitlesDelay)}
+                        onChange={onSubtitlesDelayChanged}
+                    />
+                    <DiscreteSelectInput
+                        className={styles['discrete-input']}
+                        label={t('SIZE')}
+                        value={
+                            typeof props.selectedSubtitlesTrackId === 'string' ?
+                                props.subtitlesSize !== null && !isNaN(props.subtitlesSize) ? `${props.subtitlesSize}%` : '--'
                                 :
-                                '--'
-                    }
-                    disabled={
-                        typeof props.selectedSubtitlesTrackId === 'string' ?
-                            props.subtitlesSize === null || isNaN(props.subtitlesSize)
-                            :
-                            typeof props.selectedExtraSubtitlesTrackId === 'string' ?
-                                props.extraSubtitlesSize === null || isNaN(props.extraSubtitlesSize)
+                                typeof props.selectedExtraSubtitlesTrackId === 'string' ?
+                                    props.extraSubtitlesSize !== null && !isNaN(props.extraSubtitlesSize) ? `${props.extraSubtitlesSize}%` : '--'
+                                    :
+                                    '--'
+                        }
+                        disabled={
+                            typeof props.selectedSubtitlesTrackId === 'string' ?
+                                props.subtitlesSize === null || isNaN(props.subtitlesSize)
                                 :
-                                true
-                    }
-                    onChange={onSubtitlesSizeChanged}
-                />
-                <DiscreteSelectInput
-                    className={styles['discrete-input']}
-                    label={t('PLAYER_SUBTITLES_VERTICAL_POSIITON')}
-                    value={
-                        typeof props.selectedSubtitlesTrackId === 'string' ?
-                            props.subtitlesOffset !== null && !isNaN(props.subtitlesOffset) ? `${props.subtitlesOffset}%` : '--'
-                            :
-                            typeof props.selectedExtraSubtitlesTrackId === 'string' ?
-                                props.extraSubtitlesOffset !== null && !isNaN(props.extraSubtitlesOffset) ? `${props.extraSubtitlesOffset}%` : '--'
+                                typeof props.selectedExtraSubtitlesTrackId === 'string' ?
+                                    props.extraSubtitlesSize === null || isNaN(props.extraSubtitlesSize)
+                                    :
+                                    true
+                        }
+                        onChange={onSubtitlesSizeChanged}
+                    />
+                    <DiscreteSelectInput
+                        className={styles['discrete-input']}
+                        label={t('PLAYER_SUBTITLES_VERTICAL_POSIITON')}
+                        value={
+                            typeof props.selectedSubtitlesTrackId === 'string' ?
+                                props.subtitlesOffset !== null && !isNaN(props.subtitlesOffset) ? `${props.subtitlesOffset}%` : '--'
                                 :
-                                '--'
-                    }
-                    disabled={
-                        typeof props.selectedSubtitlesTrackId === 'string' ?
-                            props.subtitlesOffset === null || isNaN(props.subtitlesOffset)
-                            :
-                            typeof props.selectedExtraSubtitlesTrackId === 'string' ?
-                                props.extraSubtitlesOffset === null || isNaN(props.extraSubtitlesOffset)
+                                typeof props.selectedExtraSubtitlesTrackId === 'string' ?
+                                    props.extraSubtitlesOffset !== null && !isNaN(props.extraSubtitlesOffset) ? `${props.extraSubtitlesOffset}%` : '--'
+                                    :
+                                    '--'
+                        }
+                        disabled={
+                            typeof props.selectedSubtitlesTrackId === 'string' ?
+                                props.subtitlesOffset === null || isNaN(props.subtitlesOffset)
                                 :
-                                true
-                    }
-                    onChange={onSubtitlesOffsetChanged}
-                />
+                                typeof props.selectedExtraSubtitlesTrackId === 'string' ?
+                                    props.extraSubtitlesOffset === null || isNaN(props.extraSubtitlesOffset)
+                                    :
+                                    true
+                        }
+                        onChange={onSubtitlesOffsetChanged}
+                    />
+                </div>
             </div>
         </div>
     );

diff --git a/src/routes/Player/SubtitlesMenu/styles.less b/src/routes/Player/SubtitlesMenu/styles.less
@@ -106,6 +106,10 @@
     .subtitles-settings-container {
         width: 17rem;
 
+        .settings-list {
+            overflow-y: scroll;
+        }
+
         .spacing {
             flex: 1;
         }