1 files changed, 34 insertions, 14 deletions

diff --git a/src/App.scss b/src/App.scss
index 5355d899..0a303b15 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -228,24 +228,23 @@ i[class*=icon-] {
   padding: 0 10px 0 10px;
 }
 
-.gaps {
-  margin: -1em 0 0 -1em;
-}
-
 .item {
   flex: 1;
   line-height: 50px;
   height: 50px;
   overflow: hidden;
+  display: flex;
+  flex-wrap: wrap;
 
   .nav-icon {
     font-size: 1.1em;
     margin-left: 0.4em;
   }
-}
 
-.gaps > .item {
-  padding: 1em 0 0 1em;
+  &.right {
+    justify-content: flex-end;
+    padding-right: 20px;
+  }
 }
 
 .auto-size {
@@ -293,8 +292,6 @@ nav {
   }
 
   .inner-nav {
-    padding-left: 20px;
-    padding-right: 20px;
     display: flex;
     align-items: center;
     flex-basis: 970px;
@@ -452,6 +449,23 @@ nav {
   color: var(--faint, $fallback--faint);
   box-shadow: 0px 0px 4px rgba(0,0,0,.6);
   box-shadow: var(--topBarShadow);
+
+  .back-button {
+    display: block;
+    max-width: 99px;
+    transition-property: opacity, max-width;
+    transition-duration: 300ms;
+    transition-timing-function: ease-out;
+
+    i {
+      margin: 0 1em;
+    }
+
+    &.hidden {
+      opacity: 0;
+      max-width: 20px;
+    }
+  }
 }
 
 .fade-enter-active, .fade-leave-active {
@@ -486,6 +500,7 @@ nav {
   display: none;
   width: 100%;
   height: 46px;
+
   button {
     display: block;
     flex: 1;
@@ -499,6 +514,16 @@ nav {
   body {
     overflow-y: scroll;
   }
+
+  nav {
+    .back-button {
+      display: none;
+    }
+    .site-name {
+      padding-left: 20px;
+    }
+  }
+
   .sidebar-bounds {
     overflow: hidden;
     max-height: 100vh;
@@ -591,11 +616,6 @@ nav {
   }
 }
 
-.item.right {
-  text-align: right;
-  padding-right: 20px;
-}
-
 .visibility-tray {
   font-size: 1.2em;
   padding: 3px;