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 +15 -11
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 286c0eec4c - Show all commits

16
app/www/index.html
View File

@ -5,8 +5,8 @@
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width = 320, initial-scale = 1.0, user-scalable = no, minimal-ui, viewport-fit=cover"> <meta name="viewport" content="width = 320, initial-scale = 1.0, user-scalable = no, minimal-ui, viewport-fit=cover">
<link rel="stylesheet" href="static/css/codemirror.css" /> <!--<link rel="stylesheet" href="static/css/codemirror.css" />
<link rel="stylesheet" href="static/css/monokai.css" /> <link rel="stylesheet" href="static/css/monokai.css" />-->
<link rel="stylesheet" href="static/css/index.css" /> <link rel="stylesheet" href="static/css/index.css" />
</head> </head>
<body> <body>
@ -94,12 +94,12 @@
<button id="wifiRefresh" class="" onclick="mobile.getWifi();">REFRESH WIFI</button> <button id="wifiRefresh" class="" onclick="mobile.getWifi();">REFRESH WIFI</button>
</div> </div>
</div> </div>
<div id="mscript" class="page"> <!--<div id="mscript" class="page">
<h2>MSCRIPT</h2> <h2>MSCRIPT</h2>
<textarea id="mscript_editor"></textarea> <textarea id="mscript_editor"></textarea>
<button id="compile">COMPILE</button> <button id="compile">COMPILE</button>
<button id="mscript_seq">START SEQUENCE</button> <button id="mscript_seq">START SEQUENCE</button>
</div> </div>-->
<div id="camera" class="page"> <div id="camera" class="page">
<h2>CAMERA EXPOSURE</h2> <h2>CAMERA EXPOSURE</h2>
<div class="label">ISO</div> <div class="label">ISO</div>
@ -115,20 +115,20 @@
<div id="appIcon" onclick="appPage();" class="icon selected"> <div id="appIcon" onclick="appPage();" class="icon selected">
<div></div> <div></div>
</div> </div>
<div id="mscriptIcon" onclick="mscriptPage();" class="icon"> <!--<div id="mscriptIcon" onclick="mscriptPage();" class="icon">
<div></div> <div></div>
</div> </div>-->
<div id="cameraIcon" onclick="cameraPage();" class="icon"> <div id="cameraIcon" onclick="cameraPage();" class="icon">
<div class="cameraIcon"></div> <div class="cameraIcon"></div>
</div> </div>
</footer> </footer>
<script src="cordova.js"></script> <script src="cordova.js"></script>
<script src="static/js/spin.min.js"></script> <script src="static/js/spin.min.js"></script>
<script src="static/js/codemirror.js"></script> <!--<script src="static/js/codemirror.js"></script>-->
<script src="static/js/intval.core.js"></script> <script src="static/js/intval.core.js"></script>
<script src="static/js/intval.web.js"></script> <script src="static/js/intval.web.js"></script>
<script src="static/js/intval.mobile.js"></script> <script src="static/js/intval.mobile.js"></script>
<script src="static/js/intval.mscript.js"></script> <!--<script src="static/js/intval.mscript.js"></script>-->
<script src="static/js/index.js"></script> <script src="static/js/index.js"></script>
</body> </body>
</html> </html>

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

@ -245,7 +245,8 @@ footer{
} }
footer .icon { footer .icon {
width: 33.33%; /*width: 33.33%;*/
width: 50%;
height: 50px; height: 50px;
float: left; float: left;
box-sizing: border-box; box-sizing: border-box;
@ -253,7 +254,8 @@ footer .icon {
} }
body.mobile footer .icon{ body.mobile footer .icon{
width: 25%; /*width: 25%;*/
width: 33.33%;
} }
footer .icon:last-child{ footer .icon:last-child{
@ -329,7 +331,9 @@ footer > div.selected{
#password,#wifi,#ip{ #password,#wifi,#ip{
display: none; display: none;
} }
#password.active,#ip.active,#wifi.active{ #password.active,
#ip.active,
#wifi.active{
display: block; display: block;
} }