grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'dev'

Browse source
This commit is contained in:
Dessalines 2019-08-20 14:48:48 -07:00
commit dcef1bbd7c
3 changed files with 59 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -147,7 +147,7 @@ export class Community extends Component<any, State> {
paginator() { paginator() {
return ( return (
<div class="mt-2"> <div class="my-2">
{this.state.page > 1 && {this.state.page > 1 &&
<button class="btn btn-sm btn-secondary mr-1" onClick={linkEvent(this, this.prevPage)}><T i18nKey="prev">#</T></button> <button class="btn btn-sm btn-secondary mr-1" onClick={linkEvent(this, this.prevPage)}><T i18nKey="prev">#</T></button>
} }

17
ui/src/components/main.tsx
View file

@ -180,8 +180,7 @@ export class Main extends Component<any, MainState> {
sidebar() { sidebar() {
return ( return (
<div class="card border-secondary mb-3"> <div>
<div class="card-body">
{!this.state.showEditSite ? {!this.state.showEditSite ?
this.siteInfo() : this.siteInfo() :
<SiteForm <SiteForm
@ -190,7 +189,6 @@ export class Main extends Component<any, MainState> {
/> />
} }
</div> </div>
</div>
) )
} }
@ -203,6 +201,8 @@ export class Main extends Component<any, MainState> {
siteInfo() { siteInfo() {
return ( return (
<div> <div>
<div class="card border-secondary mb-3">
<div class="card-body">
<h5 class="mb-0">{`${this.state.site.site.name}`}</h5> <h5 class="mb-0">{`${this.state.site.site.name}`}</h5>
{this.canAdmin && {this.canAdmin &&
<ul class="list-inline mb-1 text-muted small font-weight-bold"> <ul class="list-inline mb-1 text-muted small font-weight-bold">
@ -229,7 +229,7 @@ export class Main extends Component<any, MainState> {
</Link> </Link>
</li> </li>
</ul> </ul>
<ul class="my-1 list-inline small"> <ul class="mt-1 list-inline small mb-0">
<li class="list-inline-item"> <li class="list-inline-item">
<T i18nKey="admins" class="d-inline">#</T>: <T i18nKey="admins" class="d-inline">#</T>:
</li> </li>
@ -237,11 +237,14 @@ export class Main extends Component<any, MainState> {
<li class="list-inline-item"><Link class="text-info" to={`/u/${admin.name}`}>{admin.name}</Link></li> <li class="list-inline-item"><Link class="text-info" to={`/u/${admin.name}`}>{admin.name}</Link></li>
)} )}
</ul> </ul>
</div>
</div>
{this.state.site.site.description && {this.state.site.site.description &&
<div> <div class="card border-secondary mb-3">
<hr /> <div class="card-body">
<div className="md-div" dangerouslySetInnerHTML={mdToHtml(this.state.site.site.description)} /> <div className="md-div" dangerouslySetInnerHTML={mdToHtml(this.state.site.site.description)} />
</div> </div>
</div>
} }
</div> </div>
) )
@ -256,7 +259,7 @@ export class Main extends Component<any, MainState> {
<svg class="icon mx-2"><use xlinkHref="#icon-mouse">#</use></svg> <svg class="icon mx-2"><use xlinkHref="#icon-mouse">#</use></svg>
<a href={repoUrl}>Lemmy<sup>beta</sup></a> <a href={repoUrl}>Lemmy<sup>beta</sup></a>
</h5> </h5>
<p> <p class="mb-0">
<T i18nKey="landing_0">#<a href="https://en.wikipedia.org/wiki/Link_aggregation">#</a><a href="https://en.wikipedia.org/wiki/Fediverse">#</a><br></br><code>#</code><br></br><b>#</b><br></br><a href={repoUrl}>#</a><br></br><a href="https://www.rust-lang.org">#</a><a href="https://actix.rs/">#</a><a href="https://www.infernojs.org">#</a><a href="https://www.typescriptlang.org/">#</a> <T i18nKey="landing_0">#<a href="https://en.wikipedia.org/wiki/Link_aggregation">#</a><a href="https://en.wikipedia.org/wiki/Fediverse">#</a><br></br><code>#</code><br></br><b>#</b><br></br><a href={repoUrl}>#</a><br></br><a href="https://www.rust-lang.org">#</a><a href="https://actix.rs/">#</a><a href="https://www.infernojs.org">#</a><a href="https://www.typescriptlang.org/">#</a>
</T> </T>
</p> </p>

4
ui/src/css/main.css
View file

@ -2,6 +2,10 @@ body, .text-white, .navbar-brand, .badge-light, .btn-secondary {
color: #dedede !important; color: #dedede !important;
} }
.navbar-toggler {
border: 0px;
}
.pointer { .pointer {
cursor: pointer; cursor: pointer;
} }