moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DetailedStatus: fix rounded corners

This commit is contained in:
Alex Gleason 2021-09-27 15:03:20 -05:00
parent b5041602e6
commit 997375a927
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/soapbox/features/status/index.js
View File

@ -548,11 +548,11 @@ class Status extends ImmutablePureComponent {
} }
if (ancestorsIds && ancestorsIds.size > 0) { if (ancestorsIds && ancestorsIds.size > 0) {
ancestors = <div>{this.renderChildren(ancestorsIds)}</div>; ancestors = this.renderChildren(ancestorsIds);
} }
if (descendantsIds && descendantsIds.size > 0) { if (descendantsIds && descendantsIds.size > 0) {
descendants = <div>{this.renderChildren(descendantsIds)}</div>; descendants = this.renderChildren(descendantsIds);
} }
const handlers = { const handlers = {
@ -596,7 +596,9 @@ class Status extends ImmutablePureComponent {
*/} */}
<div ref={this.setRef} className='detailed-status-container'> <div ref={this.setRef} className='detailed-status-container'>
{ancestors} {ancestors && (
<div className='detailed-status__ancestors'>{ancestors}</div>
)}
<HotKeys handlers={handlers}> <HotKeys handlers={handlers}>
<div ref={this.setStatusRef} className={classNames('focusable', 'detailed-status__wrapper')} tabIndex='0' aria-label={textForScreenReader(intl, status, false)}> <div ref={this.setStatusRef} className={classNames('focusable', 'detailed-status__wrapper')} tabIndex='0' aria-label={textForScreenReader(intl, status, false)}>
@ -638,7 +640,9 @@ class Status extends ImmutablePureComponent {
</div> </div>
</HotKeys> </HotKeys>
{descendants} {descendants && (
<div className='detailed-status__descendants'>{descendants}</div>
)}
</div> </div>
</Column> </Column>
); );

13
app/styles/components/detailed-status.scss
View File

@ -160,12 +160,9 @@
margin-right: 5px; margin-right: 5px;
} }
.detailed-status-container { /* Connect the first status to the SubNavigation */
> div:first-child { .detailed-status__ancestors .status-container:first-child .status__wrapper,
.status-container .status__wrapper, .detailed-status-container > div:first-child .detailed-status__wrapper {
.detailed-status__wrapper { border-top-left-radius: 0;
border-top-left-radius: 0; border-top-right-radius: 0;
border-top-right-radius: 0;
}
}
} }