cinco/glitch-images
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bugfixes'

Browse Source
This commit is contained in:
Georg Fischer 2016-08-09 21:50:54 +02:00
commit 4828465c96
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/views/webcamview.js
View File

@ -73,7 +73,10 @@ define(
if ( itWorked ) { if ( itWorked ) {
dialog.show(); dialog.show();
videoEl.play(); try {
videoEl.play();
} catch ( err ) { }
updateVideoSize(); updateVideoSize();
isRecording = true; isRecording = true;

10
styles/modules/dialog.css
View File

@ -132,10 +132,10 @@
width: 100%; width: 100%;
background-color: #000; background-color: #000;
overflow: hidden; overflow: hidden;
object-fit: cover;
display: block; display: block;
cursor: pointer; cursor: pointer;
opacity: 0.8; opacity: 0.8;
object-fit: contain;
} }
.dialog-item video:hover { .dialog-item video:hover {
@ -162,12 +162,14 @@
} }
.dialog-list { .dialog-list {
overflow: scroll;
margin-left: -20px; margin-left: -20px;
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;
width: calc(100% + 40px); width: calc(100% + 40px);
max-height: calc(100vh - 355px); max-height: calc(100vh - 355px);
overflow: auto;
overflow-x: none;
overflow-y: auto;
} }
.has-touch .dialog-list { .has-touch .dialog-list {
@ -386,3 +388,7 @@ html:not(.has-touch) .shared-list .item-offline-button {
.setting-checkbox { .setting-checkbox {
margin-top: 3px; margin-top: 3px;
} }
.setting-select {
max-width: 100px;
}