n/nyxmuks
1
0
Fork 0
forked from Mirrors/gomuks
Code Pull requests Activity

web/{composer,timeline}: fix a couple loader colors (#561)

Browse source 
Signed-off-by: Sumner Evans <me@sumnerevans.com>
This commit is contained in:
Sumner Evans 2024-12-21 15:56:04 -07:00 • committed by GitHub
parent 74842707b3
commit bb26bc4e64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/src/ui/composer/MessageComposer.tsx
View file

@ -602,7 +602,7 @@ const MessageComposer = () => {
isThread={false} isThread={false}
onClose={stopEditing} onClose={stopEditing}
/>} />}
{loadingMedia && <div className="composer-media"><ScaleLoader/></div>} {loadingMedia && <div className="composer-media"><ScaleLoader color="var(--primary-color)"/></div>}
{state.media && <ComposerMedia content={state.media} clearMedia={!disableClearMedia && clearMedia}/>} {state.media && <ComposerMedia content={state.media} clearMedia={!disableClearMedia && clearMedia}/>}
{state.location && <ComposerLocation {state.location && <ComposerLocation
room={room} client={client} room={room} client={client}

4
web/src/ui/timeline/TimelineView.tsx
View file

@ -119,7 +119,9 @@ const TimelineView = () => {
return <div className="timeline-view" onScroll={handleScroll} ref={timelineViewRef}> return <div className="timeline-view" onScroll={handleScroll} ref={timelineViewRef}>
<div className="timeline-beginning"> <div className="timeline-beginning">
{room.hasMoreHistory ? <button onClick={loadHistory} disabled={isLoadingHistory}> {room.hasMoreHistory ? <button onClick={loadHistory} disabled={isLoadingHistory}>
{isLoadingHistory ? <><ScaleLoader /> Loading history...</> : "Load more history"} {isLoadingHistory
? <><ScaleLoader color="var(--primary-color)"/> Loading history...</>
: "Load more history"}
</button> : "No more history available in this room"} </button> : "No more history available in this room"}
</div> </div>
<div className="timeline-list"> <div className="timeline-list">