Skip to content

Commit

Permalink
minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Lex-Ai committed Nov 18, 2022
1 parent a3070a6 commit f062d34
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 26 deletions.
1 change: 0 additions & 1 deletion app/client_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ export const CATEGORIES = [
'трейдинг',
'философия',
'фотография',
'хобби',
'экономика',
'юмор',
'прочее',
Expand Down
2 changes: 1 addition & 1 deletion app/components/cards/Comment.scss
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
.Comment__negative_group {
color: $medium-gray;
border-top: 1px solid $light-gray;
padding-top: 1rem;
padding-top: 3rem;
clear: none;
button {
opacity: 0.35;
Expand Down
8 changes: 8 additions & 0 deletions app/components/pages/Post.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
> span {
margin-left: 5px;
}
> .fill-red {
color: #fc544e;
fill: #fc544e;
}
> .fill-green {
color: green;
fill: green;
}
}

.Post__comments_sort_order {
Expand Down
2 changes: 1 addition & 1 deletion app/components/pages/Services.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Services extends React.Component {
<div className='column large-3 medium-3 small-6'>
<a target="_blank" href="https://wiki.golos.id"><Icon name='blockchain' size='10x'/>
<h5>Golos Blogs</h5></a>
<p className='landing-services-block-icon-text'>Основные веб-клиенты блогов <a target="_blank" href="https://golos.id">golos.id</a> и <a target="_blank" href="https://golos.in">golos.in</a>, альтернативные <a target="_blank" href="https://wiki.golos.id">клиенты</a>, а также Desktop (для <a target="_blank" href="https://files.golos.app/blogs-win/latest.exe">Windows</a> и <a target="_blank" href="https://files.golos.app/blogs-linux/latest.deb">Linux</a>)</p>
<p className='landing-services-block-icon-text'>Основные веб-клиенты блогов <a target="_blank" href="https://golos.id">golos.id</a> и <a target="_blank" href="https://golos.in">golos.in</a>, альтернативные <a target="_blank" href="https://wiki.golos.id">клиенты</a>, а также Desktop (для <a target="_blank" href="https://files.golos.app/desktop-windows/latest.exe">Windows</a> и <a target="_blank" href="https://files.golos.app/desktop-linux/latest.deb">Linux</a>)</p>
</div>
<div className='column large-3 medium-3 small-6'>
<a target="_blank" href="https://dex.golos.app"><Icon name='money' size='10x'/>
Expand Down
35 changes: 16 additions & 19 deletions app/components/pages/UserProfile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -418,17 +418,21 @@ export default class UserProfile extends React.Component {
const top_menu = <div className='row UserProfile__top-menu'>
<div className='columns'>
<div className='UserProfile__menu menu' style={{flexWrap: 'wrap'}}>
<Link className='UserProfile__menu-item' to={`/@${accountname}`} activeClassName='active'>{tt('g.blog')}</Link>
<Link className='UserProfile__menu-item' to={`/@${accountname}/comments`} activeClassName='active'>{tt('g.comments')}</Link>
<Link className='UserProfile__menu-item' to={`/@${accountname}`} activeClassName='active'>
{tt('g.blog')}
</Link>
<Link className='UserProfile__menu-item' to={`/@${accountname}/comments`} activeClassName='active'>
{tt('g.comments')}
</Link>
<Link className='UserProfile__menu-item' to={`/@${accountname}/recent-replies`} activeClassName='active'>
{tt('g.replies')} {isMyAccount && <NotifiCounter fields='comment_reply' />}
</Link>
{isMyAccount ? <Link className='UserProfile__menu-item' to={`/@${accountname}/discussions`} activeClassName='active'>
{tt('g.discussions')} <NotifiCounter fields='subscriptions' />
</Link> : null}
{isMyAccount ? <Link className='UserProfile__menu-item' to={`/@${accountname}/mentions`} activeClassName='active'>
{tt('g.mentions')} <NotifiCounter fields='mention' />
</Link> : null}
<Link className='UserProfile__menu-item' to={`/@${accountname}/mentions`} activeClassName='active'>
{tt('g.mentions')} {isMyAccount && <NotifiCounter fields='mention' />}
</Link>
<div className='UserProfile__filler' />
<div>
<a href={walletUrl(`/@${accountname}/transfers`)} target={walletTarget()} className={`${walletClass} UserProfile__menu-item`}>
Expand All @@ -438,25 +442,18 @@ export default class UserProfile extends React.Component {
closeOnClickOutside
dropdownPosition='bottom'
dropdownAlignment={this.state.linksAlign}
dropdownContent={
<VerticalMenu items={rewardsMenu} />
}
>
<a
className={`${rewardsClass} UserProfile__menu-item`}
ref={this._onLinkRef}
>
{tt('g.rewards')}
{isMyAccount && <NotifiCounter fields='donate,donate_msgs' />}
dropdownContent={<VerticalMenu items={rewardsMenu} />}
>
<a className={`${rewardsClass} UserProfile__menu-item`} ref={this._onLinkRef}>
{tt('g.rewards')} {isMyAccount && <NotifiCounter fields='donate,donate_msgs' />}
<Icon name='dropdown-center' />
</a>
</LinkWithDropdown>
</LinkWithDropdown>
{isMyAccount && msgsHost() ? <a target='_blank' rel='noopener noreferrer' className='UserProfile__menu-item' href={msgsLink()} title={tt('g.messages')}>
<Icon name='new/envelope' /> <NotifiCounter fields='message' />
</a> : null}
{isMyAccount ?
<Link className='UserProfile__menu-item' to={`/@${accountname}/settings`} activeClassName='active' title={tt('g.settings')}>
<Icon name='new/setting' />
{isMyAccount ? <Link className='UserProfile__menu-item' to={`/@${accountname}/settings`} activeClassName='active' title={tt('g.settings')}>
<Icon name='new/setting' />
</Link> : null}
</div>
</div>
Expand Down
4 changes: 0 additions & 4 deletions app/locales/ru-RU.json
Original file line number Diff line number Diff line change
Expand Up @@ -760,10 +760,6 @@
"rev": "ред.",
"version_NUM": "(версия %(NUM)s)"
},
"time_versions_jsx": {
"rev": "ред.",
"version_NUM": "(версия %(NUM)s)"
},
"transfer_jsx": {
"amount_is_in_form": "Сумма должна быть в формате 99999.999",
"insufficient_funds": "Недостаточно средств",
Expand Down

0 comments on commit f062d34

Please sign in to comment.