djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Make visibility icon clickable as part of the time of a toot 

Port 1d07f51039 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
This commit is contained in:
Mélanie Chauvel 2020-10-27 03:00:47 +01:00 committed by Thibaut Girka
parent 578e757d09
commit 078744f210
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/flavours/glitch/features/ui/components/boost_modal.js
View File

@ -78,9 +78,10 @@ class BoostModal extends ImmutablePureComponent {
<div className={classNames('status', `status-${status.get('visibility')}`, 'light')}> <div className={classNames('status', `status-${status.get('visibility')}`, 'light')}>
<div className='boost-modal__status-header'> <div className='boost-modal__status-header'>
<div className='boost-modal__status-time'> <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> <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
</div>
<span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span> <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'> <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} className='status__display-name'>
<div className='status__avatar'> <div className='status__avatar'>

4
app/javascript/flavours/glitch/styles/components/modal.scss
View File

@ -427,10 +427,8 @@
.status__visibility-icon { .status__visibility-icon {
color: $dark-text-color; color: $dark-text-color;
float: right;
font-size: 14px; font-size: 14px;
margin-left: 4px; padding: 0 4px;
margin-right: 4px;
} }
.status__display-name { .status__display-name {

7
app/javascript/flavours/glitch/styles/statuses.scss
View File

@ -201,19 +201,18 @@
display: initial; display: initial;
} }
.status__relative-time, .status__relative-time {
.status__visibility-icon {
color: $dark-text-color; color: $dark-text-color;
float: right; float: right;
font-size: 14px; font-size: 14px;
width: auto; width: auto;
margin: initial; margin: initial;
padding: initial; padding: initial;
padding-bottom: 1px;
} }
.status__visibility-icon { .status__visibility-icon {
margin-left: 4px; padding: 0 4px;
margin-right: 4px;
} }
.status__info .status__display-name { .status__info .status__display-name {