Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics

1 files changed, 24 insertions, 3 deletions

diff --git a/src/App.scss b/src/App.scss
index dd43c5ca..056a235e 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -248,6 +248,7 @@ nav {
     justify-content: center;
     flex: 0 0 auto;
     z-index: -1;
+
     .mask {
       mask-repeat: no-repeat;
       mask-position: center;
@@ -260,7 +261,10 @@ nav {
       left: 0;
       right: 0;
     }
+
     img {
+      height: 100%;
+      object-fit: contain;
       display: block;
       flex: 0;
     }
@@ -325,18 +329,35 @@ main-router {
   background-size: cover;
   padding: .6em .6em;
   text-align: left;
-  font-size: 1.3em;
-  line-height: 24px;
+  line-height: 28px;
   background-color: $fallback--btn;
   background-color: var(--btn, $fallback--btn);
   align-items: baseline;
 
   .title {
     flex: 1 0 auto;
+    font-size: 1.3em;
+  }
+
+  .alert {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow-x: hidden;
   }
 
   button {
-    height: 100%;
+    flex-shrink: 0;
+  }
+
+  button, .alert {
+    // height: 100%;
+    line-height: 21px;
+    min-height: 0;
+    box-sizing: border-box;
+    margin: 0;
+    margin-left: .25em;
+    min-width: 1px;
+    align-self: stretch;
   }
 }