Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

dev_hss
杨树明 6 years ago
commit f30ebb439c

@ -131,19 +131,19 @@ class VNCDisplay extends Component {
return ( return (
<div className="" style={{height: '100%'}}> <div className="vncDisply" style={{height: '100%'}}>
<style>{` <style>{`
#top_bar { .vncDisply #top_bar {
background-color: #6e84a3; background-color: #6e84a3;
color: white; color: white;
font: bold 12px Helvetica; font: bold 12px Helvetica;
padding: 6px 5px 4px 5px; padding: 6px 5px 4px 5px;
border-bottom: 1px outset; border-bottom: 1px outset;
} }
#status { .vncDisply #status {
text-align: center; text-align: center;
} }
#sendCtrlAltDelButton { .vncDisply #sendCtrlAltDelButton {
position: fixed; position: fixed;
top: 0px; top: 0px;
right: 0px; right: 0px;
@ -151,10 +151,14 @@ class VNCDisplay extends Component {
padding: 5px 5px 4px 5px; padding: 5px 5px 4px 5px;
cursor: pointer; cursor: pointer;
} }
#screen { .vncDisply #screen {
height: 100%; height: 100%;
flex: 1; /* fill remaining space */ flex: 1; /* fill remaining space */
overflow: hidden; overflow: hidden;
background: #666;
}
.vncDisply #screen > div {
background: #666;
} }
`}</style> `}</style>
<div id="top_bar"> <div id="top_bar">

Loading…
Cancel
Save