Skip to content

N
noVNC
Commit 608e0f52 authored by Joel Martin's avatar Joel Martin
Browse files
Options

Some CSS style and DOM id/class cleanup.

parent 7e5f81f2
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 22 deletions
include/base.css
View file @ 608e0f52
......@@ -66,17 +66,20 @@ html {
}
#noVNC_mobile_buttons {
display: none;
}
.noVNC-buttons-left {
position:fixed;
padding-left:10px;
padding-top:9px;
display: none;
}
#noVNC_buttons_right {
position:fixed;
.noVNC-buttons-right {
float:right;
right: 0px;
padding-right:10px;
padding-top:9px;
right:0;
}
#noVNC_status_bar {
......@@ -90,7 +93,7 @@ html {
width:100%;
}
.VNC_status_button, #clipboardbutton, #connectbutton {
.noVNC_status_button, #clipboardbutton, #connectbutton {
font-size: 14px;
}
......@@ -112,12 +115,6 @@ html {
float:right;
}
.VNC_buttons_right {
text-align: right;
}
.VNC_buttons_left {
text-align: left;
}
.noVNC_status_normal {
background: #eee;
}
......
include/display.js
View file @ 608e0f52
......@@ -304,10 +304,10 @@ that.viewportChange = function(deltaX, deltaY, width, height) {
}
if ((deltaX === 0) && (deltaY === 0)) {
//message("skipping");
//Util.Debug("skipping viewport change");
return;
}
message("deltaX: " + deltaX + ", deltaY: " + deltaY);
Util.Debug("viewportChange deltaX: " + deltaX + ", deltaY: " + deltaY);
v.x += deltaX;
vx2 += deltaX;
......@@ -363,7 +363,7 @@ that.viewportChange = function(deltaX, deltaY, width, height) {
c_ctx.fillRect(0, y1, v.w, h);
}
c_ctx.fillStyle = saveStyle;
}
};
that.getCleanDirtyReset = function() {
var v = viewport, c = cleanRect, cleanBox, dirtyBoxes = [],
......
include/ui.js
View file @ 608e0f52
......@@ -302,7 +302,7 @@ updateState: function(rfb, state, oldstate, msg) {
c.value = "Disconnect";
c.onclick = UI.disconnect;
c.disabled = false;
cad.style.display = "block";
cad.style.display = "";
UI.settingsDisabled(true, rfb);
klass = "noVNC_status_normal";
break;
......@@ -497,7 +497,6 @@ addOption: function(selectbox,text,value )
setBarPosition: function() {
$D('noVNC-control-bar').style.top = (window.pageYOffset) + 'px';
$D('noVNC_mobile_buttons').style.left = (window.pageXOffset) + 'px';
$D('noVNC_buttons_right').style.right = 0 + 'px';
var vncwidth = $D('noVNC_screen').style.offsetWidth;
$D('noVNC-control-bar').style.width = vncwidth + 'px';
......
tests/viewport.html
View file @ 608e0f52
......@@ -86,7 +86,7 @@
}
function mouseMove(x, y) {
var deltaX, deltaY, x1, y1;
var deltaX, deltaY;
if (inMove) {
//deltaX = x - lastPos.x; // drag viewport
......
vnc.html
View file @ 608e0f52
......@@ -48,7 +48,7 @@
<body>
<div id="noVNC-control-bar">
<!--noVNC Mobile Device only Buttons-->
<div id="noVNC_mobile_buttons">
<div id="noVNC_mobile_buttons" class="noVNC-buttons-left">
<nobr>
<span class="noVNC_mouse_buttons">
<input type="button" class="noVNC_status_button"
......@@ -68,17 +68,17 @@
</div>
<!--noVNC Buttons-->
<div id="noVNC_buttons_right">
<div class="noVNC-buttons-right">
<input type="button" class="noVNC_status_button"
style="float:left;" value="CtrlAltDel" id="sendCtrlAltDelButton"
value="CtrlAltDel" id="sendCtrlAltDelButton"
onclick="UI.sendCtrlAltDel();">
<input type="button" id="clipboardbutton" value="Clipboard"
onclick="UI.showClipboard();"/>
<input type="button" class="VNC_status_button"
<input type="button" class="noVNC_status_button"
value="Settings" id="menuButton"
onclick="UI.clickSettingsMenu();">
<input type="button" id="connectPanelbutton"
value="Connection" class="VNC_status_button"
value="Connection" class="noVNC_status_button"
onclick="UI.connectPanelbutton()" />
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment