chore: merge branch 'dev' of https://github.com/mue/mue into dev

This commit is contained in:
David Ralph
2026-01-28 16:45:49 +00:00
3 changed files with 83 additions and 66 deletions

View File

@@ -7,77 +7,76 @@
@include modal-button(standard);
} */
padding: 1rem 2rem 5rem;
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
overflow-y: auto;
@include themed {
padding: 1rem 2rem 5rem;
display: flex;
flex-direction: column;
width: 100%;
// height: 100%;
overflow-y: auto;
@include themed {
background: t($modal-background);
margin: 0;
border-radius: t($borderRadius);
}
}
@extend %tabText;
@extend %tabText;
hr {
width: 100%;
background: rgb(196 196 196 / 74%);
outline: none;
hr {
width: 100%;
background: rgb(196 196 196 / 74%);
outline: none;
}
.settingsRow {
display: flex;
align-items: center;
justify-content: space-between;
transition: 0.4s ease-in-out;
padding-top: 2rem;
padding-bottom: 2rem;
@include themed {
border-bottom: 1px solid t($modal-border);
}
.settingsRow {
&.settingsNoBorder {
border-bottom: none;
}
&:last-child {
margin-bottom: 2rem;
}
.content {
display: flex;
align-items: center;
justify-content: space-between;
transition: 0.4s ease-in-out;
padding-top: 2rem;
padding-bottom: 2rem;
flex-flow: column;
max-width: 50%;
gap: 5px;
}
@include themed {
border-bottom: 1px solid t($modal-border);
.action {
display: flex;
flex-flow: column;
align-items: flex-end;
width: 300px;
gap: 10px;
button {
margin-top: 10px;
}
&.settingsNoBorder {
border-bottom: none;
}
&:last-child {
margin-bottom: 2rem;
}
.content {
.link {
margin-top: 10px;
display: flex;
flex-flow: column;
max-width: 50%;
gap: 5px;
}
.action {
display: flex;
flex-flow: column;
align-items: flex-end;
width: 300px;
gap: 10px;
button {
margin-top: 10px;
}
.link {
margin-top: 10px;
display: flex;
flex-flow: row;
gap: 15px;
align-items: center;
}
flex-flow: row;
gap: 15px;
align-items: center;
}
}
}
}
.resetDataButtonsLayout {
display: grid;

View File

@@ -126,7 +126,7 @@
&:hover {
transform: translateY(-4px);
box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
// box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
.image-nav-buttons {
opacity: 1;

View File

@@ -10,9 +10,10 @@ import {
MdFolder,
MdChevronLeft,
MdChevronRight,
MdDelete,
MdInfo,
MdImage,
} from 'react-icons/md';
import { BiSolidFilm } from 'react-icons/bi';
import EventBus from 'utils/eventbus';
import { compressAccurately, filetoDataURL } from 'image-conversion';
import videoCheck from '../api/videoCheck';
@@ -802,9 +803,7 @@ const CustomSettings = memo(() => {
justifyContent: 'center',
}}
>
<MdPersonalVideo
style={{ fontSize: '20px', color: 'white' }}
/>
<BiSolidFilm style={{ fontSize: '20px', color: 'white' }} />
</div>
</>
) : (
@@ -813,12 +812,31 @@ const CustomSettings = memo(() => {
</div>
)
) : (
<img
alt={bg.name || 'Custom background'}
src={bg.url}
loading="lazy"
style={{ position: 'relative', zIndex: 1 }}
/>
<>
<img
alt={bg.name || 'Custom background'}
src={bg.url}
loading="lazy"
style={{ position: 'relative', zIndex: 1 }}
/>
<div
className="photo-overlay-icon"
style={{
position: 'absolute',
top: '8px',
right: '8px',
zIndex: 2,
background: 'rgba(0, 0, 0, 0.6)',
borderRadius: '4px',
padding: '4px',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
}}
>
<MdImage style={{ fontSize: '20px', color: 'white' }} />
</div>
</>
)}
<div className="image-nav-buttons">
<button