]> cat aescling's git repositories - mastodon.git/commitdiff
Make detailed-status__wrapper actually wrap detailed status (#8547)
authortrwnh <a@trwnh.com>
Tue, 30 Oct 2018 05:33:02 +0000 (00:33 -0500)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 30 Oct 2018 05:33:02 +0000 (06:33 +0100)
* Remove class from scrollable div

.detailed-status__wrapper does not actually wrap the detailed status here

* Re-add class to focusable div

.detailed-status__wrapper now wraps the detailed status instead of the entire scrollable area

app/javascript/mastodon/features/status/index.js

index b36d828650646c3d0c8f3fc7a281b8a98def9052..a092f7bb146894384a2d6a80a0ff58ab86d91f99 100644 (file)
@@ -428,11 +428,11 @@ class Status extends ImmutablePureComponent {
         />
 
         <ScrollContainer scrollKey='thread' shouldUpdateScroll={shouldUpdateScroll}>
-          <div className={classNames('scrollable', 'detailed-status__wrapper', { fullscreen })} ref={this.setRef}>
+          <div className={classNames('scrollable', { fullscreen })} ref={this.setRef}>
             {ancestors}
 
             <HotKeys handlers={handlers}>
-              <div className='focusable' tabIndex='0' aria-label={textForScreenReader(intl, status, false, !status.get('hidden'))}>
+              <div className={classNames('focusable', 'detailed-status__wrapper')} tabIndex='0' aria-label={textForScreenReader(intl, status, false, !status.get('hidden'))}>
                 <DetailedStatus
                   status={status}
                   onOpenVideo={this.handleOpenVideo}