Removing 'Editor' router-link. Updating scrolling-container div, to correctly…

Removing 'Editor' router-link. Updating scrolling-container div, to correctly size to vertical height of screen. Switching from overflow scroll to auto. Replacing favicon with OpenShot branding.

Removing 'Editor' router-link. Updating scrolling-container div, to correctly…
Removing 'Editor' router-link. Updating scrolling-container div, to correctly size to vertical height of screen. Switching from overflow scroll to auto. Replacing favicon with OpenShot branding.
96339582 · Jonathan Thomas · f2338909 · f2338909 · 96339582 · 96339582
Commit 96339582 authored Jan 16, 2022 by Jonathan Thomas
6 changed files
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/favicon.png
+++ b/public/favicon.png
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>favicon.png">
    <title><%= htmlWebpackPlugin.options.title %></title>
  </head>
  <body>

--- a/src/App.vue
+++ b/src/App.vue
@@ -17,12 +17,6 @@
            <li v-show="isAuthenticated" class="nav-item">
              <router-link to="/" class="nav-link" aria-current="page" exact>Projects</router-link>
            </li>
-            <li v-if="project" v-show="isAuthenticated" class="nav-item">
-              <router-link :to="{'name': 'Editor', 'id': project.id}" class="nav-link" aria-current="page">Editor</router-link>
-            </li>
-            <li v-if="!project" v-show="isAuthenticated" class="nav-item">
-              <router-link to="/projects/none" class="nav-link" aria-current="page" :class="{ disabled: !project }">Editor</router-link>
-            </li>
            <li v-show="isAuthenticated" class="nav-item">
              <router-link to="/about" class="nav-link" aria-current="page">About</router-link>
            </li>

--- a/src/components/Clips.vue
+++ b/src/components/Clips.vue
@@ -11,7 +11,8 @@
    </div>

    <!-- Scrolling container for clips -->
-    <div class="col-12 scrolling-container">
+    <div class="container p-2 scrolling-container">
+      <div class="col-12">
        <div class="row gy-2 gx-2 mb-2" v-for="(clip, index) in thumbnailedClips" :key="clip.id">
          <div class="col-12 text-center img-parent">

@@ -58,6 +59,7 @@
        </div>
      </div>
    </div>
+  </div>

  <!-- Export Video Modal -->
  <div class="modal fade" ref="exportModal" tabindex="-1" aria-labelledby="exportModalLabel" aria-hidden="true">
@@ -263,8 +265,8 @@ export default {

 <style scoped>
  .scrolling-container {
-    max-height: 300px;
-    overflow: scroll;
+    max-height: 45vh;
+    overflow: auto;
  }
  .img-parent {
    position: relative;

--- a/src/components/Files.vue
+++ b/src/components/Files.vue
@@ -18,7 +18,8 @@
  </div>

  <!-- Scrolling container for files -->
-  <div class="row mb-3 gx-2 p-2 scrolling-container">
+  <div class="container p-2 scrolling-container">
+    <div class="row mb-3 gx-2">
      <div v-for="file in searchedFiles" :key="file.id" class="col-sm-12 col-md-6 col-lg-4" style="position: relative;">
        <!-- Context Menu -->
        <div class="btn-group dropstart context-menu" title="File Menu">
@@ -46,6 +47,7 @@
        </div>
      </div>
    </div>
+  </div>

  <!-- Actual file input used for upload -->
  <input ref="fileUpload" type="file" @change="fileChanged" multiple hidden>
@@ -142,8 +144,8 @@ export default {

 <style scoped>
  .scrolling-container {
-    height: 135px;
-    overflow: scroll;
+    height: 18vh;
+    overflow: auto;
  }
  .upload-btn {
    float: right;