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

Fix display name and date alignment #14304

Merged
merged 15 commits into from
Jan 30, 2023
Merged

Fix display name and date alignment #14304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
53bcc26
align baseline
luacmartins Jan 13, 2023
f79aa03
use correct height and padding for date
luacmartins Jan 13, 2023
1ce1fdf
Merge branch 'main' into cmartins-alignBaseline
luacmartins Jan 19, 2023
e55a447
rm height
luacmartins Jan 19, 2023
fe68b02
add lineheight
luacmartins Jan 20, 2023
95f0fe2
Merge branch 'main' into cmartins-alignBaseline
luacmartins Jan 23, 2023
a2246fe
update styles
luacmartins Jan 23, 2023
c2620ae
rm negative margin from messages
luacmartins Jan 23, 2023
fd35c68
add padding to single images
luacmartins Jan 23, 2023
50e1ed5
fix console error
luacmartins Jan 23, 2023
0d6b102
use margin
luacmartins Jan 23, 2023
1746629
get isAttachment from server
luacmartins Jan 23, 2023
75842b7
move logic to conditional
luacmartins Jan 23, 2023
276d598
Merge branch 'main' into cmartins-alignBaseline
luacmartins Jan 27, 2023
ac94ca3
adjust margins
luacmartins Jan 27, 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
9 changes: 8 additions & 1 deletion src/pages/home/report/ReportActionItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ class ReportActionItem extends Component {
/>
);
} else {
const message = _.last(lodashGet(this.props.action, 'message', [{}]));
const isAttachment = _.has(this.props.action, 'isAttachment')
? this.props.action.isAttachment
: ReportUtils.isReportMessageAttachment(message);
children = (
<ShowContextMenuContext.Provider
value={{
Expand All @@ -168,7 +172,10 @@ class ReportActionItem extends Component {
>
{!this.props.draftMessage
? (
<ReportActionItemMessage action={this.props.action} />
<ReportActionItemMessage
action={this.props.action}
style={(!this.props.displayAsGroup && isAttachment) ? [styles.mt2] : undefined}
/>
) : (
<ReportActionItemMessageEdit
action={this.props.action}
Expand Down
6 changes: 1 addition & 5 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,25 +1316,21 @@ const styles = {
fontSize: variables.fontSizeNormal,
fontWeight: fontWeightBold,
lineHeight: variables.lineHeightXLarge,
paddingBottom: 4,
...wordBreak.breakWord,
},

chatItemMessageHeaderTimestamp: {
flexShrink: 0,
color: themeColors.textSupporting,
fontSize: variables.fontSizeSmall,
height: 24,
lineHeight: variables.lineHeightXLarge,
paddingTop: 2,
},

chatItemMessage: {
color: themeColors.text,
fontSize: variables.fontSizeNormal,
fontFamily: fontFamily.EXP_NEUE,
lineHeight: variables.lineHeightXLarge,
marginTop: -2,
marginBottom: -2,
maxWidth: '100%',
cursor: 'auto',
...whiteSpace.preWrap,
Expand Down