16mm
/
intval3
1
0
Fork 0
Code Issues 1 Pull Requests 9 Projects Releases Wiki Activity

Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
Conversation 0 Commits 416 Files Changed 85 +4 -5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 65cdf44105 - Show all commits

7
app/www/index.html
View File

@ -80,8 +80,7 @@
<button id="wifi" class="" onclick="mobile.setWifi();">CONNECT</button> <button id="wifi" class="" onclick="mobile.setWifi();">CONNECT</button>
<button id="wifiRefresh" class="" onclick="mobile.getWifi();">REFRESH WIFI</button> <button id="wifiRefresh" class="" onclick="mobile.getWifi();">REFRESH WIFI</button>
</div> </div>
<div class="ble"> <div>
<br />
<button id="reset" onclick="mobile.reset();">RESET</button> <button id="reset" onclick="mobile.reset();">RESET</button>
<button id="restart" onclick="mobile.restart();">RESTART</button> <button id="restart" onclick="mobile.restart();">RESTART</button>
<button id="update" onclick="mobile.update();">UPDATE</button> <button id="update" onclick="mobile.update();">UPDATE</button>
@ -113,10 +112,10 @@
</select> </select>
</div> </div>
</div> </div>
<button id="cameraBtn" onclick="mobile.getCamera();"> <button id="cameraBtn" class="ble" onclick="mobile.getCamera();">
<i class="cameraIcon"></i> <i class="cameraIcon"></i>
</button> </button>
<div class="clearfix"> <div class="clearfix ble">
<div id="camera_exposure"> <div id="camera_exposure">
<h3>PHONE</h3> <h3>PHONE</h3>
<div> <div>

2
app/www/static/css/index.css
View File

@ -254,7 +254,7 @@ button i {
} }
footer{ footer{
display: none; /*display: none;*/
width: 100%; width: 100%;
height: 50px; height: 50px;
position: fixed; position: fixed;