Merge https://github.com/stanford-oval/almond-server into skill-grid

stanford-oval · May 20, 2021 · 67b25a5 · 67b25a5
2 parents 9f22ea2 + 4102fb9
commit 67b25a5
Show file tree

Hide file tree

Showing 28 changed files with 872 additions and 308 deletions.
diff --git a/public/images/almond.png b/public/images/almond.png
diff --git a/public/images/almond_error.png b/public/images/almond_error.png
diff --git a/public/images/almond_mic_round_grey.svg b/public/images/almond_mic_round_grey.svg
diff --git a/public/images/almond_mic_round_white.svg b/public/images/almond_mic_round_white.svg
diff --git a/public/images/almond_mic_white_round.svg b/public/images/almond_mic_white_round.svg
diff --git a/public/images/bubble_green.png b/public/images/bubble_green.png
diff --git a/public/javascripts/apps.js b/public/javascripts/apps.js
@@ -2,4 +2,13 @@ $(function() {
     $('.form-delete-app').on('submit', function() {
         return confirm("Are you sure?");
     });
-});
+    $(window).scroll(function() {
+        if ($(window).scrollTop() > 100) {
+            $('#back-top').removeClass('hidden');
+            console.log("hidden")
+        } else {
+            console.log("not hidden")
+            $('#back-top').addClass('hidden')
+        }
+    });
+});