Make visibility icon clickable as part of the time of a toot (#15053)
- Makes permalink to a toot more easily clickable - Fix clicking between icon and time in fact clicking the display name - Fix clicking slightly under time in fact clicking the display name
This commit is contained in:
		
					parent
					
						
							
								0a8ab822e2
							
						
					
				
			
			
				commit
				
					
						1d07f51039
					
				
			
		
					 4 changed files with 11 additions and 9 deletions
				
			
		|  | @ -460,8 +460,10 @@ class Status extends ImmutablePureComponent { | |||
|           <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted })} data-id={status.get('id')}> | ||||
|             <div className='status__expand' onClick={this.handleExpandClick} role='presentation' /> | ||||
|             <div className='status__info'> | ||||
|               <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'><RelativeTimestamp timestamp={status.get('created_at')} /></a> | ||||
|               <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'> | ||||
|                 <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span> | ||||
|                 <RelativeTimestamp timestamp={status.get('created_at')} /> | ||||
|               </a> | ||||
| 
 | ||||
|               <a onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'> | ||||
|                 <div className='status__avatar'> | ||||
|  |  | |||
|  | @ -75,9 +75,10 @@ class BoostModal extends ImmutablePureComponent { | |||
|           <div className={classNames('status', `status-${status.get('visibility')}`, 'light')}> | ||||
|             <div className='boost-modal__status-header'> | ||||
|               <div className='boost-modal__status-time'> | ||||
|                 <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'><RelativeTimestamp timestamp={status.get('created_at')} /></a> | ||||
|               </div> | ||||
|                 <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'> | ||||
|                   <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span> | ||||
|                   <RelativeTimestamp timestamp={status.get('created_at')} /></a> | ||||
|               </div> | ||||
| 
 | ||||
|               <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} className='status__display-name'> | ||||
|                 <div className='status__avatar'> | ||||
|  |  | |||
|  | @ -1067,16 +1067,15 @@ | |||
| } | ||||
| 
 | ||||
| .status__relative-time, | ||||
| .status__visibility-icon, | ||||
| .notification__relative_time { | ||||
|   color: $dark-text-color; | ||||
|   float: right; | ||||
|   font-size: 14px; | ||||
|   padding-bottom: 1px; | ||||
| } | ||||
| 
 | ||||
| .status__visibility-icon { | ||||
|   margin-left: 4px; | ||||
|   margin-right: 4px; | ||||
|   padding: 0 4px; | ||||
| } | ||||
| 
 | ||||
| .status__display-name { | ||||
|  |  | |||
|  | @ -1,10 +1,10 @@ | |||
| .status{ class: "status-#{status.visibility}" } | ||||
|   .status__info | ||||
|     = link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', target: stream_link_target, rel: 'noopener noreferrer' do | ||||
|       %span.status__visibility-icon>< | ||||
|         = visibility_icon status | ||||
|       %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) | ||||
|     %data.dt-published{ value: status.created_at.to_time.iso8601 } | ||||
|     %span.status__visibility-icon | ||||
|       = visibility_icon status | ||||
| 
 | ||||
|     .p-author.h-card | ||||
|       = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener noreferrer' do | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue