diff --git a/js/src/forum/components/DiscussionListItem.js b/js/src/forum/components/DiscussionListItem.js index 52c095811..3bc680582 100644 --- a/js/src/forum/components/DiscussionListItem.js +++ b/js/src/forum/components/DiscussionListItem.js @@ -106,9 +106,13 @@ export default class DiscussionListItem extends Component { text={app.translator.trans('core.forum.discussion_list.started_text', { user, ago: humanTime(discussion.createdAt()) })} position="right" > - - {avatar(user, { title: '' })} - + {user ? ( + + {avatar(user, { title: '' })} + + ) : ( + {avatar(user, { title: '' })} + )}
- {app.translator.trans('core.forum.log_in.forgot_password_link')} +
, app.forum.attribute('allowSignUp') ? ( -{app.translator.trans('core.forum.log_in.sign_up_text', { a: })}
++ {app.translator.trans('core.forum.log_in.sign_up_text', { + a: , + })} +
) : ( '' ), diff --git a/js/src/forum/components/PostMeta.js b/js/src/forum/components/PostMeta.js index ed5e2958d..2f49fd041 100644 --- a/js/src/forum/components/PostMeta.js +++ b/js/src/forum/components/PostMeta.js @@ -1,6 +1,7 @@ import Component from '../../common/Component'; import humanTime from '../../common/helpers/humanTime'; import fullTime from '../../common/helpers/fullTime'; +import Button from '../../common/components/Button'; /** * The `PostMeta` component displays the time of a post, and when clicked, shows @@ -28,9 +29,9 @@ export default class PostMeta extends Component { return ({app.translator.trans('core.forum.sign_up.log_in_text', { a: })}
, ++ {app.translator.trans('core.forum.sign_up.log_in_text', { a: })} +
, ]; } diff --git a/less/common/Button.less b/less/common/Button.less index 852d18ff8..f0fea6f22 100644 --- a/less/common/Button.less +++ b/less/common/Button.less @@ -121,7 +121,6 @@ } } - .Button--square { padding-left: 9px; padding-right: 9px; @@ -134,20 +133,37 @@ border-radius: 18px; } .Button--link { - background: transparent !important; + color: @control-color; + background: none; - &:hover { - background: transparent !important; - color: @link-color; - } &:active, - &.active, - &:focus, - &.focus, - .open > &.Dropdown-toggle { - background: transparent !important; - .box-shadow(none); + &:hover, + &:focus { color: @link-color; + box-shadow: none; + background: none; + } +} +.Button--reset { + padding: 0; + margin: 0; + display: inline; + text-align: unset; + color: @link-color; + background: none; + vertical-align: unset; + white-space: unset; + line-height: unset; + .user-select(auto); + width: auto !important; + + &:active, + &:hover, + &:focus, + .open > &.Dropdown-toggle { + color: @link-color; + box-shadow: none; + background: none; } } .Button--text { diff --git a/less/forum/Scrubber.less b/less/forum/Scrubber.less index 50cd880f1..63830df59 100644 --- a/less/forum/Scrubber.less +++ b/less/forum/Scrubber.less @@ -7,11 +7,17 @@ font-size: 14px; margin-right: 2px; } - &:hover, &:focus { + &:hover, + &:focus { text-decoration: none; color: @link-color; } } + + &-first, + &-last { + color: @control-color; + } } .Scrubber-scrollbar { margin: 8px 0 8px 3px; @@ -21,14 +27,20 @@ cursor: pointer; .user-select(none); } -.Scrubber-before, .Scrubber-after { +.Scrubber-before, +.Scrubber-after { border-left: 1px solid @control-bg; } .Scrubber-unread { position: absolute; border-left: 1px solid lighten(@muted-color, 10%); width: 100%; - background-image: linear-gradient(to right, @control-bg, fade(@control-bg, 0) 10px, fade(@control-bg, 0)); + background-image: linear-gradient( + to right, + @control-bg, + fade(@control-bg, 0) 10px, + fade(@control-bg, 0) + ); display: flex; align-items: center; color: @muted-color;