Merge branch 'windowResize' of github.com:jumpserver/jumpserver into windowResize

pull/207/head
ibuler 2016-04-06 13:04:47 +08:00
commit eeef4a2f95
1 changed files with 6 additions and 8 deletions

View File

@ -25,7 +25,7 @@
background: #f0f0f0; background: #f0f0f0;
} }
.clock { .termChangBar {
line-height: 1; line-height: 1;
margin: 0 auto; margin: 0 auto;
border: 1px solid #ffffff; border: 1px solid #ffffff;
@ -43,15 +43,13 @@
<div id="term"> <div id="term">
</div> </div>
</div> </div>
<div class="clock"> <div class="termChangBar">
<input type="number" min="80" placeholder="col" id="term-col"/> <input type="number" min="100" value="100" placeholder="col" id="term-col"/>
<input type="number" min="24" placeholder="row" id="term-row"/> <input type="number" min="35" value="35" placeholder="row" id="term-row"/>
<button id="col-row">修改窗口大小</button> <button id="col-row">修改窗口大小</button>
</div> </div>
<script type="application/javascript" src="/static/js/jquery-2.1.1.js"> <script type="application/javascript" src="/static/js/jquery-2.1.1.js"></script>
</script> <script type="application/javascript" src="/static/js/term.js"></script>
<script type="application/javascript" src="/static/js/term.js">
</script>
<script type="application/javascript" src="/static/js/webterminal.js"></script> <script type="application/javascript" src="/static/js/webterminal.js"></script>
</body> </body>
</html> </html>