mirror of
https://github.com/eliasstepanik/vdo.ninja.git
synced 2026-01-17 00:28:33 +00:00
Merge branch 'develop' into Mobile-fix
This commit is contained in:
Steve Seguin
GitHub
commit
28d2e74064
@ -56,7 +56,7 @@
|
||||
<meta property="twitter:image" content="./media/vdoNinja_logo_full.png" />
|
||||
<meta name="msapplication-TileColor" content="#da532c" />
|
||||
<meta name="theme-color" content="#ffffff" />
|
||||
<link rel="stylesheet" href="./main.css?ver=288" />
|
||||
<link rel="stylesheet" href="./main.css?ver=290" />
|
||||
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/adapter.js"></script>
|
||||
<style id="lightbox-animations" type="text/css"></style>
|
||||
<!-- <link rel="manifest" href="manifest.json" /> -->
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/CodecsHandler.js?ver=47"></script>
|
||||
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/aes.js"></script>
|
||||
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=607"></script>
|
||||
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=612"></script>
|
||||
<input id="zoomSlider" type="range" style="display: none;" />
|
||||
<span id="electronDragZone" style="pointer-events: none; z-index:-10; position:absolute;top:0;left:0;width:100%;height:2%;-webkit-app-region: drag;min-height:20px;"></span>
|
||||
<div id="header">
|
||||
@ -2494,11 +2494,11 @@
|
||||
// session.hidehome = true; // If used, 'hide home' will make the landing page inaccessible, along with hiding a few go-home elements.
|
||||
// session.record = false; // uncomment to block users from being able to record via vdo.ninja's built in recording function
|
||||
</script>
|
||||
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=729"></script>
|
||||
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=733"></script>
|
||||
<!--
|
||||
// If you wish to change branding, blank offers a good clean start.
|
||||
<script type="text/javascript" id="main-js" src="./main.js" data-translation="blank"></script>
|
||||
-->
|
||||
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=587"></script>
|
||||
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=589"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
23
lib.js
23
lib.js
@ -3310,6 +3310,10 @@ function createRichVideoElement(UUID){ // this function is used to check and gen
|
||||
session.rpcs[UUID].videoElement.dataset.sid = session.rpcs[UUID].streamID;
|
||||
}
|
||||
|
||||
if (session.rpcs[UUID].rotate !== false){
|
||||
session.rpcs[UUID].videoElement.rotated = session.rpcs[UUID].rotate;
|
||||
}
|
||||
|
||||
session.rpcs[UUID].videoElement.addEventListener("playing", (e)=>{
|
||||
|
||||
try {
|
||||
@ -5134,8 +5138,8 @@ function updateMixerRun(e=false){ // this is the main auto-mixing code. It's a
|
||||
|
||||
vid.style.objectFit = "cover"; //contain;
|
||||
vid.style.overflow = "unset"; //contain;
|
||||
vid.style.maxWidth = "unset";
|
||||
vid.style.maxHeight = "unset";
|
||||
//vid.style.maxWidth = "unset";
|
||||
//vid.style.maxHeight = "unset";
|
||||
} else {
|
||||
if (vw && vh){
|
||||
var vvw = parseInt(vw);
|
||||
@ -5176,6 +5180,9 @@ function updateMixerRun(e=false){ // this is the main auto-mixing code. It's a
|
||||
vid.style.height = Math.ceil(hsw - borderOffset*2) + "px";
|
||||
vid.style.left = 0;
|
||||
|
||||
vid.style.maxWidth = "100vh";
|
||||
vid.style.maxHeight = "100vw";
|
||||
|
||||
if (ChromeVersion && ChromeVersion<77){
|
||||
if (!animated && (parseInt(container.style.width)>parseInt(holder.style.height))){
|
||||
vid.style.position = "relative";
|
||||
@ -12867,17 +12874,9 @@ function updateForceRotate(){
|
||||
|
||||
function updateForceRotatedCSS(){
|
||||
if (session.forceRotate==270){
|
||||
document.body.setAttribute( "style", "transform: rotate(270deg);position: absolute;top: "+(getWidth()/4)+"px;left: -"+ (getHeight()/4) + "px;height: 95vw;width: 95vh;");
|
||||
document.body.setAttribute( "style", "transform: rotate(270deg);position: absolute;top: 100vh;left: 0;height: 100vw;width: 100vh;transform-origin: 0 0;");
|
||||
} else if (session.forceRotate==90){
|
||||
document.body.setAttribute( "style", "transform: rotate(90deg);position: absolute;top: "+(getWidth()/4)+"px;left: -"+ (getHeight()/4) + "px;height: 95vw;width: 95vh;");
|
||||
} else {
|
||||
document.body.setAttribute( "style", "");
|
||||
}
|
||||
|
||||
if (session.forceRotate==270){
|
||||
document.body.setAttribute( "style", "transform: rotate(270deg);position: absolute;top: "+(getWidth()/4)+"px;left: -"+ (getHeight()/4) + "px;height: 95vw;width: 95vh;");
|
||||
} else if (session.forceRotate==90){
|
||||
document.body.setAttribute( "style", "transform: rotate(90deg);position: absolute;top: "+(getWidth()/4)+"px;left: -"+ (getHeight()/4) + "px;height: 95vw;width: 95vh;");
|
||||
document.body.setAttribute( "style", "transform: rotate(90deg);position: absolute;top: 0;left: 100vw;height: 100vw;width: 100vh;transform-origin: 0 0;");
|
||||
} else {
|
||||
document.body.setAttribute( "style", "");
|
||||
}
|
||||
|
||||
6
main.css
6
main.css
@ -2,6 +2,7 @@
|
||||
/* Discord Greys - Dark to Lighter */
|
||||
--discord-grey-0: #121212;
|
||||
--discord-grey-1: #1e1f22;
|
||||
--discord-grey-1a: #1e1f22;
|
||||
--discord-grey-2: #232428;
|
||||
--discord-grey-3: #2b2d31;
|
||||
--discord-grey-4: #2e3035;
|
||||
@ -1296,7 +1297,6 @@ button.glyphicon-button.active.focus {
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 640px){
|
||||
|
||||
.labelSmall {
|
||||
display:inherit;
|
||||
padding:5px;
|
||||
@ -1990,8 +1990,6 @@ input[type=range]:focus::-ms-fill-upper {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
#popupSelector_user_settings label{
|
||||
color:white;
|
||||
text-shadow: 0px 0px 6px #000000FF;
|
||||
@ -3898,7 +3896,7 @@ div#roomnotes2 {
|
||||
}
|
||||
|
||||
.darktheme div#guestFeeds {
|
||||
background-color: var(--discord-grey-1)
|
||||
background-color: var(--discord-grey-1a)
|
||||
}
|
||||
|
||||
div#guestFeeds {
|
||||
|
||||
1
main.js
1
main.js
@ -1471,6 +1471,7 @@ async function main(){ // main asyncronous thread; mostly initializes the user s
|
||||
document.documentElement.style.setProperty('--background-color', '#0000');
|
||||
document.documentElement.style.setProperty('--regular-margin', '0');
|
||||
document.documentElement.style.setProperty('--director-margin', '0 25px 0 0');
|
||||
document.documentElement.style.setProperty('--discord-grey-1a', '#0000');
|
||||
getById("directorLinksButton").style.color = "black";
|
||||
getById("main").style.overflow = "hidden";
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user