Merge branch 'front_end_prettying' into main

ansible/VERSION

@@ -1 +1 @@
-v0.7.44
+v0.7.45

docker/prod/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     restart: always
 
   lemmy:
-    image: dessalines/lemmy:v0.7.44
+    image: dessalines/lemmy:v0.7.45
     ports:
       - "127.0.0.1:8536:8536"
     restart: always

docker/travis/docker_push.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 docker tag dessalines/lemmy:travis \
-  dessalines/lemmy:v0.7.44
+  dessalines/lemmy:v0.7.45
-docker push dessalines/lemmy:v0.7.44
+docker push dessalines/lemmy:v0.7.45

server/src/version.rs

@@ -1 +1 @@
-pub const VERSION: &str = "v0.7.44";
+pub const VERSION: &str = "v0.7.45";

ui/assets/css/main.css

@@ -32,6 +32,10 @@
   margin-top: -10px;
 }
 
+.custom-select {
+  -moz-appearance: none;
+}
+
 .md-div p {
   overflow: hidden;
   text-overflow: ellipsis;

ui/src/components/navbar.tsx

@@ -369,7 +369,7 @@ export class Navbar extends Component<any, NavbarState> {
                 </>
               ) : (
                 <ul class="navbar-nav my-2">
-                  <li className="nav-item">
+                  <li className="ml-2 nav-item">
                     <Link
                       class="btn btn-success"
                       to="/login"

ui/src/components/post-listing.tsx

@@ -515,9 +515,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
         </li>
         {(showVotes || this.state.upvotes !== this.state.score) && (
           <>
-            <li className="list-inline-item">•</li>
             <span
-              class="unselectable pointer mr-2"
+              class="unselectable pointer ml-3"
               data-tippy-content={this.pointsTippy}
             >
               <li className="list-inline-item">
@@ -527,8 +526,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
                   }`}
                   onClick={linkEvent(this, this.handlePostLike)}
                 >
-                  <svg class="small icon icon-inline mr-1">
+                  <svg class="small icon icon-inline mx-1">
-                    <use xlinkHref="#icon-arrow-up"></use>
+                    <use xlinkHref="#icon-arrow-up1"></use>
                   </svg>
                   {this.state.upvotes}
                 </a>
@@ -540,8 +539,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
                   }`}
                   onClick={linkEvent(this, this.handlePostDisLike)}
                 >
-                  <svg class="small icon icon-inline mr-1">
+                  <svg class="small icon icon-inline mx-1">
-                    <use xlinkHref="#icon-arrow-down"></use>
+                    <use xlinkHref="#icon-arrow-down1"></use>
                   </svg>
                   {this.state.downvotes}
                 </a>

ui/src/utils.ts

@@ -980,12 +980,17 @@ function randomHsl() {
   return `hsla(${Math.random() * 360}, 100%, 50%, 1)`;
 }
 
-export function previewLines(text: string, lines: number = 3): string {
+export function previewLines(
-  // Use lines * 2 because markdown requires 2 lines
+  text: string,
+  maxChars: number = 300,
+  maxLines: number = 1
+): string {
   return (
     text
+      .slice(0, maxChars)
       .split('\n')
-      .slice(0, lines * 2)
+      // Use lines * 2 because markdown requires 2 lines
+      .slice(0, maxLines * 2)
       .join('\n') + '...'
   );
 }