css changes (navbar, settings page, contacts page)

This commit is contained in:
Beatrice Olivera
2018-09-01 17:36:46 +01:00
parent 2e8dd92f39
commit 80646d4d33
11 changed files with 294 additions and 204 deletions

View File

@@ -1,26 +1,28 @@
<!-- CONTACTS PAGE -->
<div class="container">
<div class="contacts-container text-color">
<div class="contacts half">
<div class="contacts-header">
<h2>Contacts</h2>
<%= link_to new_connection_path do %>
<i class="fas fa-plus-square"></i>
<% end %>
</div>
<% current_user.contacts.each do |contact| %>
<%= render "pages/contact", contact: contact %>
<% end %>
<div class="contacts-list">
<% current_user.contacts.each do |contact| %>
<%= render "pages/contact", contact: contact %>
<% end %>
</div>
</div>
<div class="video-feed half">
<div class="video-feed half hidden-xs hidden-sm">
<div class="video-content">
<video id="contacts-video" autoplay=""></video>
<video id="contacts-video" class="flex-video" autoplay=""></video>
</div>
</div>
</div>
</div>
<!-- INFORMATION TO BE PASSED TO NOTIFICATIONS.JS -->
<div id="my-user-id" data-user-id="<%= current_user.id %>"></div>
<form action="/accept_call" method="post">
@@ -28,6 +30,8 @@
<input type="submit" id="accept-button" class="btn btn-primary" id="accept-button" style="display: none;" value="ACCEPT CALL"/>
</form>
<div id="contacts-page"></div>
<%= javascript_pack_tag 'notifications' %>
<%= javascript_pack_tag 'local_video' %>