Merge branch 'dev'

ui/src/components/community.tsx

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

ui/src/components/main.tsx

@@ -180,8 +180,7 @@ export class Main extends Component<any, MainState> {
 
   sidebar() {
     return (
-      <div class="card border-secondary mb-3">
+      <div>
-        <div class="card-body">
         {!this.state.showEditSite ?
           this.siteInfo() :
           <SiteForm
@@ -190,7 +189,6 @@ export class Main extends Component<any, MainState> {
           />
         }
       </div>
-      </div>
     )
   }
 
@@ -203,6 +201,8 @@ export class Main extends Component<any, MainState> {
   siteInfo() {
     return (
       <div>
+        <div class="card border-secondary mb-3">
+          <div class="card-body">
             <h5 class="mb-0">{`${this.state.site.site.name}`}</h5>
             {this.canAdmin && 
               <ul class="list-inline mb-1 text-muted small font-weight-bold"> 
@@ -229,7 +229,7 @@ export class Main extends Component<any, MainState> {
                 </Link>
               </li>
             </ul>
-        <ul class="my-1 list-inline small"> 
+            <ul class="mt-1 list-inline small mb-0"> 
               <li class="list-inline-item">
                 <T i18nKey="admins" class="d-inline">#</T>:
                 </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>
                 )}
               </ul>
+            </div>
+          </div>
           {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>
+            </div>
           }
         </div>
     )
@@ -256,7 +259,7 @@ export class Main extends Component<any, MainState> {
             <svg class="icon mx-2"><use xlinkHref="#icon-mouse">#</use></svg>
             <a href={repoUrl}>Lemmy<sup>beta</sup></a>
           </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>
         </p>

ui/src/css/main.css

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