LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-26 14:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Axighi-master' into front_end_prettying

Browse source
This commit is contained in:
Dessalines 2020-07-29 00:24:49 -04:00
commit ff7e0c72f9
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -16,3 +16,5 @@ ui/src/translations
# ide config
.idea/
target

2
ui/src/components/community.tsx vendored
View file

@ -177,7 +177,7 @@ export class Community extends Component<any, State> {
get documentTitle(): string {
if (this.state.community.name) {
return `/c/${this.state.community.name} - ${this.state.site.name}`;
return `!${this.state.community.name} - ${this.state.site.name}`;
} else {
return 'Lemmy';
}

10
ui/src/components/inbox.tsx vendored
View file

@ -112,7 +112,7 @@ export class Inbox extends Component<any, InboxState> {
get documentTitle(): string {
if (this.state.site.name) {
return `/u/${UserService.Instance.user.name} ${i18n.t('inbox')} - ${
return `@${UserService.Instance.user.name} ${i18n.t('inbox')} - ${
this.state.site.name
}`;
} else {
@ -206,7 +206,7 @@ export class Inbox extends Component<any, InboxState> {
return (
<div class="btn-group btn-group-toggle flex-wrap mb-2">
<label
className={`btn btn-outline-secondary pointer
className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.All && 'active'}
`}
>
@ -219,7 +219,7 @@ export class Inbox extends Component<any, InboxState> {
{i18n.t('all')}
</label>
<label
className={`btn btn-outline-secondary pointer
className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.Replies && 'active'}
`}
>
@ -232,7 +232,7 @@ export class Inbox extends Component<any, InboxState> {
{i18n.t('replies')}
</label>
<label
className={`btn btn-outline-secondary pointer
className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.Mentions && 'active'}
`}
>
@ -245,7 +245,7 @@ export class Inbox extends Component<any, InboxState> {
{i18n.t('mentions')}
</label>
<label
className={`btn btn-outline-secondary pointer
className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.Messages && 'active'}
`}
>

16
ui/src/components/user.tsx vendored
View file

@ -213,7 +213,7 @@ export class User extends Component<any, UserState> {
get documentTitle(): string {
if (this.state.siteRes.site.name) {
return `/u/${this.state.username} - ${this.state.siteRes.site.name}`;
return `@${this.state.username} - ${this.state.siteRes.site.name}`;
} else {
return 'Lemmy';
}
@ -234,7 +234,7 @@ export class User extends Component<any, UserState> {
class="rounded-circle mr-2"
/>
)}
<span>/u/{this.state.username}</span>
<span>@{this.state.username}</span>
</h5>
{this.state.loading ? (
<h5>
@ -276,7 +276,7 @@ export class User extends Component<any, UserState> {
return (
<div class="btn-group btn-group-toggle flex-wrap mb-2">
<label
className={`btn btn-outline-secondary pointer
className={`btn btn-outline-secondary pointer
${this.state.view == UserDetailsView.Overview && 'active'}
`}
>
@ -289,7 +289,7 @@ export class User extends Component<any, UserState> {
{i18n.t('overview')}
</label>
<label
className={`btn btn-outline-secondary pointer
className={`btn btn-outline-secondary pointer
${this.state.view == UserDetailsView.Comments && 'active'}
`}
>
@ -302,7 +302,7 @@ export class User extends Component<any, UserState> {
{i18n.t('comments')}
</label>
<label
className={`btn btn-outline-secondary pointer
className={`btn btn-outline-secondary pointer
${this.state.view == UserDetailsView.Posts && 'active'}
`}
>
@ -315,7 +315,7 @@ export class User extends Component<any, UserState> {
{i18n.t('posts')}
</label>
<label
className={`btn btn-outline-secondary pointer
className={`btn btn-outline-secondary pointer
${this.state.view == UserDetailsView.Saved && 'active'}
`}
>
@ -398,7 +398,7 @@ export class User extends Component<any, UserState> {
</tr>
*/}
<tr>
{/*
{/*
<td>
{i18n.t('number_of_points', { count: user.post_score })}
</td>
@ -406,7 +406,7 @@ export class User extends Component<any, UserState> {
<td>
{i18n.t('number_of_posts', { count: user.number_of_posts })}
</td>
{/*
{/*
</tr>
<tr>
<td>