Skip to content

Commit ff9bef2

Browse files
committed
Move image and above-image description to after preview (fix #627)
1 parent 661cfc9 commit ff9bef2

File tree

3 files changed

+30
-25
lines changed

3 files changed

+30
-25
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ instead of version numbers.
1010
## 2025-01-15
1111

1212
* Prevent repeating password in full-name field when signing up for account
13+
* Fix clipping of Rotate and File dropdowns above image
14+
[[#627](https://github.com/edemaine/coauthor/issues/627)]
15+
by moving them after description preview
16+
(also improving side-by-side preview)
1317

1418
## 2024-08-12
1519

client/message.coffee

+22-23
Original file line numberDiff line numberDiff line change
@@ -2839,39 +2839,38 @@ export WrappedSubmessage = React.memo ({message, read}) ->
28392839
}
28402840
</div>
28412841
{if preview.on
2842-
<>
28432842
<div className="bodyContainer" style={{height: if previewSideBySide then preview.height else 'auto'}}>
2844-
{if historified.file and editing
2845-
<MessageFileDescription message={message} history={history}
2846-
messageFileType={messageFileType}
2847-
description={formattedFile.description}
2848-
menu={can.edit} tabindex={tabindex0+9}/>
2849-
}
28502843
<div className="panel-body">
28512844
<div className="message-body" ref={messageBodyRef}
28522845
dangerouslySetInnerHTML={__html: formattedBody}/>
28532846
</div>
28542847
</div>
2855-
<div className="bodyFile">
2856-
{if messageFileType == 'pdf'
2857-
<MessagePDF file={historified.file}/>
2858-
}
2859-
{if historified.file
2860-
<>
2861-
<div className="message-file" ref={messageFileRef}
2862-
dangerouslySetInnerHTML={__html: formattedFile.file}/>
2863-
<MessageFileDescription message={message} history={history}
2864-
messageFileType={messageFileType}
2865-
description={formattedFile.description}
2866-
menu={can.edit} tabindex={tabindex0+9}/>
2867-
</>
2868-
}
2869-
</div>
2870-
</>}
2848+
}
28712849
</div>
28722850
{if previewSideBySide
28732851
<BelowEditor message={message} preview={preview} safeToStopEditing={safeToStopEditing} editStopping={editStopping}/>
28742852
}
2853+
{if historified.file and editing
2854+
<MessageFileDescription message={message} history={history}
2855+
messageFileType={messageFileType}
2856+
description={formattedFile.description}
2857+
menu={can.edit} tabindex={tabindex0+9}/>
2858+
}
2859+
<div className="bodyFile">
2860+
{if messageFileType == 'pdf'
2861+
<MessagePDF file={historified.file}/>
2862+
}
2863+
{if historified.file
2864+
<>
2865+
<div className="message-file" ref={messageFileRef}
2866+
dangerouslySetInnerHTML={__html: formattedFile.file}/>
2867+
<MessageFileDescription message={message} history={history}
2868+
messageFileType={messageFileType}
2869+
description={formattedFile.description}
2870+
menu={can.edit} tabindex={tabindex0+9}/>
2871+
</>
2872+
}
2873+
</div>
28752874
<div className="message-footer">
28762875
<MessageAuthor message={historified} also={history?}/>
28772876
<div className="message-response-buttons clearfix hidden-print">

client/message.styl

+4-2
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,11 @@ bootstrap-3-button(bg-color) // based on mixins/buttons.less
194194
justify-content: space-between
195195
align-items: center
196196
padding-block: 0.5ex
197-
.bodyContainer > .fileDescription:first-child
197+
.editorAndBody + .fileDescription
198+
border-top: 1px solid #337ab7
199+
.editorAndBody + .fileDescription, .resizer + .fileDescription
198200
padding-inline: 15px
199-
border-bottom: 1px solid #337ab7
201+
padding-top: 0.5em
200202
.fileDescriptionText
201203
flex-grow: 1
202204
.file-right-buttons

0 commit comments

Comments
 (0)