Skip to content

Commit

Permalink
Merge pull request #189 from stanford-oval/wip/mic-icon
Browse files Browse the repository at this point in the history
attempted a restyle on the chat interface + mic button
  • Loading branch information
gcampax committed May 20, 2021
2 parents 982f85e + 844a81f commit 4102fb9
Show file tree
Hide file tree
Showing 26 changed files with 875 additions and 297 deletions.
Binary file added public/images/almond.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/almond_error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions public/images/almond_mic_round_grey.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions public/images/almond_mic_round_white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions public/images/almond_mic_white_round.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/bubble_green.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion public/javascripts/apps.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
});
});
Loading

0 comments on commit 4102fb9

Please sign in to comment.