update bootstrap and add robot id tooltip

This commit is contained in:
Silver Kuusik
2018-08-17 18:34:52 +02:00
parent 0842926b35
commit a80cc89403
7 changed files with 41 additions and 16 deletions

View File

@@ -4,8 +4,8 @@
<meta charset="utf-8">
<title>Sumorobot</title>
<!-- css -->
<link rel="stylesheet" href="assets/css/styles.css">
<link rel="stylesheet" href="assets/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="assets/css/styles.css">
<link rel="stylesheet" type="text/css" href="assets/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="assets/css/cookieconsent.min.css">
<!-- favicon -->
<link rel="icon" type="image/png" sizes="32x32" href="assets/img/favicon-32x32.png">
@@ -14,13 +14,15 @@
<script src="assets/js/cookie.js" type="text/javascript" charset="utf-8"></script>
<!-- other -->
<script src="assets/js/min/jquery.min.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/utils.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/min/popper.min.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/min/bootstrap.min.js" type="text/javascript" charset="utf-8"></script>
<!-- Google Blockly -->
<script src="assets/blockly/blockly_compressed.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/blockly/blocks_compressed.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/blockly/python_compressed.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/blockly/msg/js/en.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/sumorobot.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/utils.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/main.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/blockly.js" type="text/javascript" charset="utf-8"></script>
@@ -34,8 +36,10 @@
<div id="panel">
<img class="logo" src="assets/img/logo.png" alt="logo">
<div class="input-group">
<span class="input-group-addon" id="robot-label">robot ID</span>
<input type="text" class="form-control" id="robot-id" placeholder="xxxxxx" />
<div class="input-group-prepend">
<span class="input-group-text" id="robot-label">Robot ID</span>
</div>
<input type="text" class="form-control" id="robot-id" placeholder="xxxxxx" data-toggle="tooltip" title="<img width='100%' src='assets/img/robot_id.jpg' />" />
</div>
<div class="btn-group btn-group-robot" role="group" aria-label="robots">
<a href="#" class="btn btn-lg btn-robot-go">GO!</a>