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

Jump to bottom

Version label was almost not visible #491

Merged
merged 4 commits into from
Oct 25, 2023
Merged

Version label was almost not visible #491

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68dc499
fix(Settings): version label was almost not visible
tymmesyde Oct 20, 2023
67234e6
refactor(Settings): improve layout of versions labels on mobile
tymmesyde Oct 25, 2023
0698057
refactor(Settings): lower opacity of versions label on desktop
tymmesyde Oct 25, 2023
36d6052
refactor(Settings): remove unnecessary titles on version labels for m…
tymmesyde Oct 25, 2023
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
31 changes: 31 additions & 0 deletions src/routes/Settings/Settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,37 @@ const Settings = () => {
</div>
</div>
</div>
<div className={classnames(styles['section-container'], styles['versions-section-container'])}>
<div className={styles['option-container']}>
<div className={styles['option-name-container']}>
<div className={styles['label']} title={process.env.VERSION}>
App Version
</div>
</div>
<div className={classnames(styles['option-input-container'], styles['info-container'])}>
<div className={styles['label']}>
{process.env.VERSION}
</div>
</div>
</div>
{
streamingServer.settings !== null && streamingServer.settings.type === 'Ready' ?
<div className={styles['option-container']}>
<div className={styles['option-name-container']}>
<div className={styles['label']} title={process.env.VERSION}>
Server Version
</div>
</div>
<div className={classnames(styles['option-input-container'], styles['info-container'])}>
<div className={styles['label']}>
{streamingServer.settings.content.serverVersion}
</div>
</div>
</div>
:
null
}
</div>
</div>
</div>
{
Expand Down
30 changes: 17 additions & 13 deletions src/routes/Settings/styles.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
.version-info-label {
flex: 0 1 auto;
margin: 0.5rem 0;
color: var(--overlay-color);
color: var(--primary-foreground-color);
opacity: 0.3;
}
}

Expand Down Expand Up @@ -376,6 +377,10 @@
}
}
}

.versions-section-container {
display: none;
}
}
}
}
Expand Down Expand Up @@ -428,6 +433,12 @@
.side-menu-container {
display: none;
}

.sections-container {
.versions-section-container {
display: flex;
}
}
}
}
}
Expand All @@ -438,18 +449,7 @@
flex-direction: column-reverse;

.side-menu-container {
kKaskak marked this conversation as resolved.
Show resolved Hide resolved
display: flex;
width: 100%;
padding: 0 1rem;

.side-menu-button {
display: none;
}

.version-info-label {
width: 100%;
text-align: end;
}
display: none;
}

.sections-container {
Expand All @@ -465,6 +465,10 @@
}
}
}

kKaskak marked this conversation as resolved.
Show resolved Hide resolved
.versions-section-container {
display: flex;
}
}
}
}
Expand Down