mirror of
https://github.com/fluxerapp/fluxer
synced 2026-10-17 21:15:32 +09:00
fix(app): restore composer menus and present action styling (#1585)
This commit is contained in:
1 parent
5cc92469aa
commit
27f459e6bd
3 files changed
+33
-39
No files matched your search
@@ -183,30 +183,9 @@
|
||||
}
|
||||
|
||||
.newMessagesBarAction {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 0.375rem;
|
||||
min-height: 2rem;
|
||||
padding: 0 0.75rem;
|
||||
border: 0;
|
||||
border-radius: var(--radius-full);
|
||||
background: var(--background-modifier-hover);
|
||||
color: var(--text-primary);
|
||||
font-size: 0.875rem;
|
||||
font-weight: 600;
|
||||
flex: 0 0 auto;
|
||||
white-space: nowrap;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.newMessagesBarAction:hover:not(:disabled) {
|
||||
background: var(--background-modifier-active);
|
||||
}
|
||||
|
||||
.newMessagesBarAction:disabled {
|
||||
cursor: wait;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
@media (max-width: 520px) {
|
||||
|
||||
@@ -35,8 +35,8 @@ import * as ReadStateCommands from '@app/features/read_state/commands/ReadStateC
|
||||
import ReadStates from '@app/features/read_state/state/ReadStates';
|
||||
import {shouldAutoAck} from '@app/features/read_state/utils/AutoAckPredicate';
|
||||
import {remFromPx} from '@app/features/theme/layout/RemFromPx';
|
||||
import {Button} from '@app/features/ui/button/Button';
|
||||
import {Scroller} from '@app/features/ui/components/Scroller';
|
||||
import {Spinner} from '@app/features/ui/components/Spinner';
|
||||
import KeyboardMode from '@app/features/ui/state/KeyboardMode';
|
||||
import MediaViewer from '@app/features/ui/state/MediaViewer';
|
||||
import Modal from '@app/features/ui/state/Modal';
|
||||
@@ -703,19 +703,18 @@ const JumpToPresentBar = observer(function JumpToPresentBar({
|
||||
<span className={styles.newMessagesBarText} data-flx="channel.messages.jump-to-present-bar.new-messages-bar-text">
|
||||
{i18n._(YOU_RE_VIEWING_OLDER_MESSAGES_DESCRIPTOR)}
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
<Button
|
||||
variant="primary"
|
||||
compact
|
||||
fitContent
|
||||
className={styles.newMessagesBarAction}
|
||||
onClick={onJumpToPresent}
|
||||
submitting={jumpIsActiveNow}
|
||||
disabled={jumpIsActiveNow}
|
||||
data-flx="channel.messages.jump-to-present-bar.new-messages-bar-action"
|
||||
>
|
||||
{jumpIsActiveNow ? (
|
||||
<Spinner size="small" data-flx="channel.messages.jump-to-present-bar.spinner" />
|
||||
) : (
|
||||
i18n._(JUMP_TO_PRESENT_DESCRIPTOR)
|
||||
)}
|
||||
</button>
|
||||
{i18n._(JUMP_TO_PRESENT_DESCRIPTOR)}
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
});
|
||||
@@ -731,19 +730,18 @@ function LoadErrorBar({loading, onRetry}: {loading: boolean; onRetry: () => void
|
||||
<span className={styles.newMessagesBarText} data-flx="channel.messages.load-error-bar.new-messages-bar-text">
|
||||
{i18n._(MESSAGES_FAILED_TO_LOAD_DESCRIPTOR)}
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
<Button
|
||||
variant="primary"
|
||||
compact
|
||||
fitContent
|
||||
className={styles.newMessagesBarAction}
|
||||
disabled={loading}
|
||||
submitting={loading}
|
||||
onClick={onRetry}
|
||||
data-flx="channel.messages.load-error-bar.new-messages-bar-action"
|
||||
>
|
||||
{loading ? (
|
||||
<Spinner size="small" data-flx="channel.messages.load-error-bar.spinner" />
|
||||
) : (
|
||||
i18n._(TRY_AGAIN_DESCRIPTOR)
|
||||
)}
|
||||
</button>
|
||||
{i18n._(TRY_AGAIN_DESCRIPTOR)}
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user