paoda
/
polyglot
mirror of https://github.com/beatriceo/polyglot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #69 from beatriceo/scrollbar 

edited scrollbar and removed navbar from call page
This commit is contained in:
Beatrice Olivera 2018-09-06 11:50:33 +01:00 committed by GitHub
parent 87728fc459 ec6cc273de
commit b41512eba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/assets/stylesheets/pages/_contacts.scss
View File

@ -9,6 +9,7 @@ a:hover {
align-self: center; align-self: center;
margin-top: 19px; margin-top: 19px;
} }
margin-bottom: 20px;
} }
.card { .card {
@ -18,6 +19,7 @@ a:hover {
background: $card-background; background: $card-background;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
margin-right: 10px;
border-radius: 5px; border-radius: 5px;
box-shadow: 1px 1px 15px 1px rgba(0, 0, 0, 0.2); box-shadow: 1px 1px 15px 1px rgba(0, 0, 0, 0.2);
@ -186,10 +188,23 @@ a:hover {
overflow-x: hidden; overflow-x: hidden;
} }
::-webkit-scrollbar {
width: 10px;
}
/* Track */
::-webkit-scrollbar-track {
// background: rgba(0, 0, 0, 0.2);
// border-radius: 10px;
padding-left: 4px;
}
/* Handle */
::-webkit-scrollbar-thumb {
background: $primary;
border-radius: 15px;
}
body {
overflow: hidden;
}

2
app/views/chat_rooms/show.html.erb
View File

@ -1,5 +1,5 @@
<!-- <button id="test-btn" class="btn btn-primary">Test Connection</button> --> <!-- <button id="test-btn" class="btn btn-primary">Test Connection</button> -->
<% params["action"] = "call" %>
<div id="join-btn" data-room="<%= @chat_room.id %>"></div> <div id="join-btn" data-room="<%= @chat_room.id %>"></div>
<div id="chatroom-hook" data-chatroom-id='<%= @chat_room.id %>'></div> <div id="chatroom-hook" data-chatroom-id='<%= @chat_room.id %>'></div>