Merge branch 'development' into path_mappings

# Conflicts:
#	views/_main.html

views/_main.html

@@ -78,6 +78,12 @@
                 margin-left: 1em;
             }
 
+            .custom-file {
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+
             .filetree {
                 border: 1px solid #ced4da;
                 border-radius: .25rem;
@@ -146,7 +152,7 @@
                         <!-- ============================================================== -->
                         <!-- Search -->
                         <!-- ============================================================== -->
-                        <li class="nav-item search-box">
+                        <li class="nav-item search-box mt-2 mt-xl-0">
                             <form class="form-material">
                                 <div class="typeahead__container">
                                     <div class="typeahead__field">